Website bin/obj cleanup
Fixed Pet Rename problem. Fixed Extra Pet tag problem. Added ServerStatus for dedicated servers.
This commit is contained in:
parent
4bd4943bd8
commit
be7ea65033
@ -308,4 +308,19 @@
|
|||||||
</jar>
|
</jar>
|
||||||
<copy file="../bin/ServerMonitor.jar" todir="../../Testing/ServerMonitor/"/>
|
<copy file="../bin/ServerMonitor.jar" todir="../../Testing/ServerMonitor/"/>
|
||||||
</target>
|
</target>
|
||||||
|
<target name ="ServerStatus" description="ServerStatus">
|
||||||
|
<jar jarfile="../bin/ServerStatus.jar">
|
||||||
|
<fileset dir="../Mineplex.ServerStatus/bin">
|
||||||
|
<include name="**/*.class"/>
|
||||||
|
</fileset>
|
||||||
|
|
||||||
|
<zipfileset src="../Libraries/mysql.zip" />
|
||||||
|
|
||||||
|
<manifest>
|
||||||
|
<attribute name="Main-Class"
|
||||||
|
value="mineplex.serverstatus.ServerStatus"/>
|
||||||
|
</manifest>
|
||||||
|
</jar>
|
||||||
|
<copy file="../bin/ServerStatus.jar" todir="../../Testing/ServerStatus/"/>
|
||||||
|
</target>
|
||||||
</project>
|
</project>
|
@ -25,6 +25,7 @@ import net.minecraft.server.v1_6_R3.PathfinderGoalRandomLookaround;
|
|||||||
import net.minecraft.server.v1_6_R3.PathfinderGoalSelector;
|
import net.minecraft.server.v1_6_R3.PathfinderGoalSelector;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@ -53,6 +54,7 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|||||||
public class PetManager extends MiniClientPlugin<PetClient>
|
public class PetManager extends MiniClientPlugin<PetClient>
|
||||||
{
|
{
|
||||||
private static Object _petOwnerSynch = new Object();
|
private static Object _petOwnerSynch = new Object();
|
||||||
|
private static Object _petRenameSynch = new Object();
|
||||||
|
|
||||||
private mineplex.core.creature.Creature _creatureModule;
|
private mineplex.core.creature.Creature _creatureModule;
|
||||||
private PetRepository _repository;
|
private PetRepository _repository;
|
||||||
@ -67,6 +69,7 @@ public class PetManager extends MiniClientPlugin<PetClient>
|
|||||||
private Field _targetSelector;
|
private Field _targetSelector;
|
||||||
|
|
||||||
private NautHashMap<String, EntityType> _petOwnerQueue = new NautHashMap<String, EntityType>();
|
private NautHashMap<String, EntityType> _petOwnerQueue = new NautHashMap<String, EntityType>();
|
||||||
|
private NautHashMap<String, String> _petRenameQueue = new NautHashMap<String, String>();
|
||||||
|
|
||||||
public PetManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, mineplex.core.creature.Creature creatureModule, String webAddress)
|
public PetManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, mineplex.core.creature.Creature creatureModule, String webAddress)
|
||||||
{
|
{
|
||||||
@ -89,8 +92,16 @@ public class PetManager extends MiniClientPlugin<PetClient>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void addRenamePetToQueue(String playerName, String petName)
|
||||||
|
{
|
||||||
|
synchronized (_petRenameSynch)
|
||||||
|
{
|
||||||
|
_petRenameQueue.put(playerName, petName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void processPetOwnerQueue(UpdateEvent event)
|
public void processQueues(UpdateEvent event)
|
||||||
{
|
{
|
||||||
if (event.getType() != UpdateType.TICK)
|
if (event.getType() != UpdateType.TICK)
|
||||||
return;
|
return;
|
||||||
@ -109,6 +120,22 @@ public class PetManager extends MiniClientPlugin<PetClient>
|
|||||||
|
|
||||||
_petOwnerQueue.clear();
|
_petOwnerQueue.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
synchronized (_petRenameQueue)
|
||||||
|
{
|
||||||
|
for (String playerName : _petRenameQueue.keySet())
|
||||||
|
{
|
||||||
|
Player player = Bukkit.getPlayerExact(playerName);
|
||||||
|
|
||||||
|
if (player != null && player.isOnline())
|
||||||
|
{
|
||||||
|
getActivePet(playerName).setCustomNameVisible(true);
|
||||||
|
getActivePet(playerName).setCustomName(_petRenameQueue.get(playerName));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_petRenameQueue.clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddPetOwner(Player player, EntityType entityType, Location location)
|
public void AddPetOwner(Player player, EntityType entityType, Location location)
|
||||||
|
@ -91,6 +91,7 @@ public class PetTagPage extends ShopPageBase<PetManager, PetShop>
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
Plugin.GetRepository().UpdatePet(token);
|
Plugin.GetRepository().UpdatePet(token);
|
||||||
|
Plugin.addRenamePetToQueue(Player.getName(), token.PetName);
|
||||||
}
|
}
|
||||||
|
|
||||||
Plugin.Get(Player).GetPets().put(_pet.GetPetType(), token.PetName);
|
Plugin.Get(Player).GetPets().put(_pet.GetPetType(), token.PetName);
|
||||||
|
@ -185,9 +185,6 @@ public class ConfirmationPage<PluginType extends MiniPlugin, ShopType extends Sh
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_runnable != null)
|
|
||||||
_runnable.run();
|
|
||||||
|
|
||||||
_progressCount = 0;
|
_progressCount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
|
||||||
|
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="ServerMonitor,"/>
|
||||||
|
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="ServerMonitor,"/>
|
||||||
|
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="ServerMonitor,"/>
|
||||||
|
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
|
||||||
|
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
|
||||||
|
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
|
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
|
||||||
|
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${BUILD_FILES}/common.xml"/>
|
||||||
|
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
|
||||||
|
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Mineplex.ServerMonitor}"/>
|
||||||
|
</launchConfiguration>
|
6
Plugins/Mineplex.ServerStatus/.classpath
Normal file
6
Plugins/Mineplex.ServerStatus/.classpath
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<classpath>
|
||||||
|
<classpathentry kind="src" path="src"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||||
|
<classpathentry kind="output" path="bin"/>
|
||||||
|
</classpath>
|
@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
|
||||||
|
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="ServerStatus,"/>
|
||||||
|
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="ServerStatus,"/>
|
||||||
|
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="ServerStatus,"/>
|
||||||
|
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
|
||||||
|
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
|
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
|
||||||
|
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${BUILD_FILES}/common.xml"/>
|
||||||
|
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
|
||||||
|
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Mineplex.ServerStatus}"/>
|
||||||
|
</launchConfiguration>
|
27
Plugins/Mineplex.ServerStatus/.project
Normal file
27
Plugins/Mineplex.ServerStatus/.project
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<projectDescription>
|
||||||
|
<name>Mineplex.ServerStatus</name>
|
||||||
|
<comment></comment>
|
||||||
|
<projects>
|
||||||
|
</projects>
|
||||||
|
<buildSpec>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
|
||||||
|
<triggers>auto,full,incremental,</triggers>
|
||||||
|
<arguments>
|
||||||
|
<dictionary>
|
||||||
|
<key>LaunchConfigHandle</key>
|
||||||
|
<value><project>/.externalToolBuilders/ServerStatus.launch</value>
|
||||||
|
</dictionary>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
</buildSpec>
|
||||||
|
<natures>
|
||||||
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||||
|
</natures>
|
||||||
|
</projectDescription>
|
@ -0,0 +1,201 @@
|
|||||||
|
package mineplex.serverstatus;
|
||||||
|
|
||||||
|
import java.sql.Connection;
|
||||||
|
import java.sql.DriverManager;
|
||||||
|
import java.sql.PreparedStatement;
|
||||||
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.sql.Statement;
|
||||||
|
|
||||||
|
public class Repository
|
||||||
|
{
|
||||||
|
private String _connectionString = "jdbc:mysql://localhost:3306/ServerStatus";
|
||||||
|
private String _userName = "root";
|
||||||
|
private String _password = "y2D4atu3Pene2asw";
|
||||||
|
|
||||||
|
private static String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS DynamicServers (id INT NOT NULL AUTO_INCREMENT, serverName VARCHAR(256), address VARCHAR(256), US BOOLEAN NOT NULL DEFAULT 'true', updated LONG, PRIMARY KEY (id));";
|
||||||
|
private static String RETRIEVE_ID = "SELECT id FROM DynamicServers WHERE serverName = ? AND address = ?;";
|
||||||
|
private static String CREATE_SERVER = "INSERT INTO DynamicServers (serverName, address, US, availableRAM, availableCpu, updated) values(?, ?, ?, ?, ?, now());";
|
||||||
|
private static String UPDATE_SERVER = "UPDATE DynamicServers SET updated = now();";
|
||||||
|
|
||||||
|
private int _id = -1;
|
||||||
|
|
||||||
|
public void initialize(String serverName, String address, boolean us, int ram, int cpu)
|
||||||
|
{
|
||||||
|
Connection connection = null;
|
||||||
|
ResultSet resultSet = null;
|
||||||
|
PreparedStatement preparedStatement = null;
|
||||||
|
PreparedStatement preparedStatementRetrieve = null;
|
||||||
|
PreparedStatement preparedStatementInsert = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Class.forName("com.mysql.jdbc.Driver");
|
||||||
|
|
||||||
|
connection = DriverManager.getConnection(_connectionString, _userName, _password);
|
||||||
|
|
||||||
|
// Create table
|
||||||
|
preparedStatement = connection.prepareStatement(CREATE_TABLE);
|
||||||
|
preparedStatement.execute();
|
||||||
|
|
||||||
|
|
||||||
|
// Retrieve id
|
||||||
|
preparedStatementRetrieve = connection.prepareStatement(RETRIEVE_ID);
|
||||||
|
preparedStatementRetrieve.setString(1, serverName);
|
||||||
|
preparedStatementRetrieve.setString(2, address);
|
||||||
|
resultSet = preparedStatementRetrieve.executeQuery();
|
||||||
|
|
||||||
|
while (resultSet.next())
|
||||||
|
{
|
||||||
|
_id = resultSet.getInt("id");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Insert if not there
|
||||||
|
if (_id == -1)
|
||||||
|
{
|
||||||
|
preparedStatementInsert = connection.prepareStatement(CREATE_SERVER, Statement.RETURN_GENERATED_KEYS);
|
||||||
|
|
||||||
|
preparedStatementInsert.setString(1, serverName);
|
||||||
|
preparedStatementInsert.setString(2, address);
|
||||||
|
preparedStatementInsert.setBoolean(3, us);
|
||||||
|
preparedStatementInsert.setInt(4, ram);
|
||||||
|
preparedStatementInsert.setInt(5, cpu);
|
||||||
|
|
||||||
|
int affectedRows = preparedStatementInsert.executeUpdate();
|
||||||
|
|
||||||
|
if (affectedRows == 0)
|
||||||
|
{
|
||||||
|
throw new SQLException("Creating dynamic server failed, no rows affected.");
|
||||||
|
}
|
||||||
|
|
||||||
|
resultSet.close();
|
||||||
|
|
||||||
|
resultSet = preparedStatementInsert.getGeneratedKeys();
|
||||||
|
|
||||||
|
if (resultSet.next())
|
||||||
|
{
|
||||||
|
_id = resultSet.getInt(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception exception)
|
||||||
|
{
|
||||||
|
exception.printStackTrace();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (preparedStatement != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
preparedStatement.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preparedStatementRetrieve != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
preparedStatementRetrieve.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preparedStatementInsert != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
preparedStatementInsert.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resultSet != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
resultSet.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (connection != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
connection.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean updateServer()
|
||||||
|
{
|
||||||
|
Connection connection = null;
|
||||||
|
PreparedStatement preparedStatement = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
connection = DriverManager.getConnection(_connectionString, _userName, _password);
|
||||||
|
|
||||||
|
preparedStatement = connection.prepareStatement(UPDATE_SERVER, Statement.RETURN_GENERATED_KEYS);
|
||||||
|
|
||||||
|
int affectedRows = preparedStatement.executeUpdate();
|
||||||
|
|
||||||
|
if (affectedRows == 0)
|
||||||
|
{
|
||||||
|
throw new SQLException("Updating dynamic server failed, no rows affected.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception exception)
|
||||||
|
{
|
||||||
|
exception.printStackTrace();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (preparedStatement != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
preparedStatement.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (connection != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
connection.close();
|
||||||
|
}
|
||||||
|
catch (SQLException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,245 @@
|
|||||||
|
package mineplex.serverstatus;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
public class ServerStatus
|
||||||
|
{
|
||||||
|
private static Repository _repository = new Repository();
|
||||||
|
private static int _count = 0;
|
||||||
|
|
||||||
|
private static String _serverName = "bam";
|
||||||
|
private static String _address = "asdf";
|
||||||
|
private static boolean _us = true;
|
||||||
|
|
||||||
|
public static void main (String args[])
|
||||||
|
{
|
||||||
|
//loadConfiguration();
|
||||||
|
//_repository.initialize(_serverName, _address, _us, 30000, 32);
|
||||||
|
|
||||||
|
/*
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
_repository.updateServer();
|
||||||
|
|
||||||
|
if (_count % 2 == 0)
|
||||||
|
{
|
||||||
|
for (ServerStatusData statusData : _repository.retrieveOldServerStatuses())
|
||||||
|
{
|
||||||
|
System.out.println("----Old Server Status----> " + statusData.Address + ", " + statusData.Name);
|
||||||
|
killServer(statusData);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<DynamicServerData> dynamicServers = new ArrayList<DynamicServerData>(_repository.retrieveDynamicServers());
|
||||||
|
Collection<ServerGroupData> serverGroups = _repository.retrieveServerGroups();
|
||||||
|
HashMap<String, GroupStatusData> groupStatusList = _repository.retrieveGroupStatusData();
|
||||||
|
|
||||||
|
for (ServerGroupData serverGroup : serverGroups)
|
||||||
|
{
|
||||||
|
if (!groupStatusList.containsKey(serverGroup.Name))
|
||||||
|
{
|
||||||
|
groupStatusList.put(serverGroup.Name, new GroupStatusData());
|
||||||
|
}
|
||||||
|
|
||||||
|
GroupStatusData groupStatus = groupStatusList.get(serverGroup.Name);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
int serversToAdd = Math.max(serverGroup.RequiredTotalServers - groupStatus.getTotalServers(), serverGroup.RequiredJoinableServers - groupStatus.getJoinableCount());
|
||||||
|
int serversToKill = (groupStatus.getTotalServers() > serverGroup.RequiredTotalServers && groupStatus.getJoinableCount() > serverGroup.RequiredJoinableServers) ? Math.min(groupStatus.getJoinableCount() - serverGroup.RequiredJoinableServers, groupStatus.EmptyServers.size()) : 0;
|
||||||
|
|
||||||
|
while (serversToAdd > 0)
|
||||||
|
{
|
||||||
|
int serverNum = groupStatus.getNextServerNumber();
|
||||||
|
Collections.sort(dynamicServers, new DynamicServerSorter());
|
||||||
|
DynamicServerData bestServer = getBestDynamicServer(dynamicServers, serverGroup);
|
||||||
|
|
||||||
|
if (bestServer == null)
|
||||||
|
{
|
||||||
|
System.out.println("No best dynamic server available for group " + serverGroup.Name);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("Adding server for Server Group " + serverGroup.Name + " Req Total: " + serverGroup.RequiredTotalServers + " Req Joinable: " + serverGroup.RequiredJoinableServers + " | Actual Total: " + groupStatus.getTotalServers() + " Actual Joinable: " + groupStatus.getJoinableCount());
|
||||||
|
startServer(bestServer, serverGroup, serverNum);
|
||||||
|
|
||||||
|
serversToAdd--;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (serversToKill > 0)
|
||||||
|
{
|
||||||
|
System.out.println("Killing excess server for Server Group " + serverGroup.Name + " Req Total: " + serverGroup.RequiredTotalServers + " Req Joinable: " + serverGroup.RequiredJoinableServers + " | Actual Total: " + groupStatus.getTotalServers() + " Actual Joinable: " + groupStatus.getJoinableCount());
|
||||||
|
killServer(groupStatus.EmptyServers.get(0));
|
||||||
|
serversToKill--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Thread.sleep(2000);
|
||||||
|
}
|
||||||
|
catch (InterruptedException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
List<String> screenNames = getScreenNames();
|
||||||
|
|
||||||
|
//removeExcessFolders(screenNames);
|
||||||
|
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void removeExcessFolders(List<String> screenNames)
|
||||||
|
{
|
||||||
|
Process process = null;
|
||||||
|
|
||||||
|
for (String screen : screenNames)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
process = new ProcessBuilder(new String[] { "cd", "/home/mineplex/servers/", "rm", "-Rf", screen }).start();
|
||||||
|
process.waitFor();
|
||||||
|
BufferedReader reader=new BufferedReader(new InputStreamReader(process.getInputStream()));
|
||||||
|
String line = reader.readLine();
|
||||||
|
|
||||||
|
while(line != null)
|
||||||
|
{
|
||||||
|
int stopIndex = line.contains("(Detached)") ? line.indexOf("(Detached)") : line.contains("(Detached)") ? line.indexOf("(Attached)") : -1;
|
||||||
|
|
||||||
|
if (stopIndex != -1)
|
||||||
|
{
|
||||||
|
//screens.add(line.substring(line.indexOf(".") + 1, stopIndex).trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
line=reader.readLine();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (process != null)
|
||||||
|
{
|
||||||
|
process.destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//return screens;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadConfiguration()
|
||||||
|
{
|
||||||
|
FileInputStream fstream = null;
|
||||||
|
BufferedReader br = null;
|
||||||
|
|
||||||
|
/*
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File npcFile = new File("npcs.dat");
|
||||||
|
|
||||||
|
if (npcFile.exists())
|
||||||
|
{
|
||||||
|
fstream = new FileInputStream(npcFile);
|
||||||
|
br = new BufferedReader(new InputStreamReader(fstream));
|
||||||
|
|
||||||
|
String line = br.readLine();
|
||||||
|
|
||||||
|
while (line != null)
|
||||||
|
{
|
||||||
|
UUID uuid = UUID.fromString(line.split(" ")[0]);
|
||||||
|
String location = line.split(" ")[1];
|
||||||
|
Integer radius = Integer.parseInt(line.split(" ")[2]);
|
||||||
|
|
||||||
|
_npcs.put(uuid.toString(), new NpcEntry(null, null, radius, UtilWorld.strToLoc(location)));
|
||||||
|
|
||||||
|
line = br.readLine();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
System.out.println("Error parsing configuration.");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (br != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
br.close();
|
||||||
|
}
|
||||||
|
catch (IOException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fstream != null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
fstream.close();
|
||||||
|
}
|
||||||
|
catch (IOException e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<String> getScreenNames()
|
||||||
|
{
|
||||||
|
Process process = null;
|
||||||
|
List<String> screens = new ArrayList<String>();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
process = new ProcessBuilder(new String[] { "cd", "/home/mineplex/servers/", "ls", "screen", "-list" }).start();
|
||||||
|
process.waitFor();
|
||||||
|
BufferedReader reader=new BufferedReader(new InputStreamReader(process.getInputStream()));
|
||||||
|
String line = reader.readLine();
|
||||||
|
|
||||||
|
while(line != null)
|
||||||
|
{
|
||||||
|
int stopIndex = line.contains("(Detached)") ? line.indexOf("(Detached)") : line.contains("(Detached)") ? line.indexOf("(Attached)") : -1;
|
||||||
|
|
||||||
|
if (stopIndex != -1)
|
||||||
|
{
|
||||||
|
screens.add(line.substring(line.indexOf(".") + 1, stopIndex).trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
line=reader.readLine();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (process != null)
|
||||||
|
{
|
||||||
|
process.destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return screens;
|
||||||
|
}
|
||||||
|
}
|
@ -1,49 +0,0 @@
|
|||||||
using LOC.Core.Tokens.Client;
|
|
||||||
|
|
||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
using System;
|
|
||||||
using LOC.Core.Data;
|
|
||||||
using LOC.Core.Model.Account;
|
|
||||||
using LOC.Core.Model.GameServer;
|
|
||||||
using LOC.Core.Tokens;
|
|
||||||
|
|
||||||
public class AccountRepo
|
|
||||||
{
|
|
||||||
private readonly IRestCallJsonWrapper _restCallWrapper;
|
|
||||||
|
|
||||||
public AccountRepo(IRestCallJsonWrapper restCallWrapper)
|
|
||||||
{
|
|
||||||
_restCallWrapper = restCallWrapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Test(string server)
|
|
||||||
{
|
|
||||||
_restCallWrapper.MakeCall("test", new Uri(server), RestCallType.Post, 300);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void TestNoArg(string server)
|
|
||||||
{
|
|
||||||
_restCallWrapper.MakeCall("", new Uri(server), RestCallType.Post, 300);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void TestNoArgNoResult(string server)
|
|
||||||
{
|
|
||||||
_restCallWrapper.MakeCall("", new Uri(server), RestCallType.Post, 300);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientToken GetAccountByName(string name, string server)
|
|
||||||
{
|
|
||||||
var loginToken = new LoginRequestToken { IpAddress = "127.0.0.1", Name = name, Server = new Server { ConnectionAddress = "localhost:25565" } };
|
|
||||||
var uri = new Uri(server + "/PlayerAccount/Login");
|
|
||||||
var result = _restCallWrapper.MakeCall<ClientToken>(loginToken, uri, RestCallType.Post, 300);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BanAccount(Punishment ban)
|
|
||||||
{
|
|
||||||
var uri = new Uri("http://localhost:53885" + "/PlayerAccount/Ban");
|
|
||||||
var result = _restCallWrapper.MakeCall<Punishment>(ban, uri, RestCallType.Post, 300);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
using System.Configuration;
|
|
||||||
|
|
||||||
class AdminClientConfigurationSection : ConfigurationSection
|
|
||||||
{
|
|
||||||
private const string BASE_SERVICE_URI_PROPERTY_NAME = "baseServiceUri";
|
|
||||||
|
|
||||||
[ConfigurationProperty(BASE_SERVICE_URI_PROPERTY_NAME, IsRequired = false, DefaultValue = "http://localhost:6969")]
|
|
||||||
public string BaseServiceUri
|
|
||||||
{
|
|
||||||
get { return (string)this[BASE_SERVICE_URI_PROPERTY_NAME]; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,33 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
using System.Configuration;
|
|
||||||
|
|
||||||
public class CurrentConfig : ICurrentConfig
|
|
||||||
{
|
|
||||||
private readonly Configuration _configuration;
|
|
||||||
|
|
||||||
public CurrentConfig()
|
|
||||||
{
|
|
||||||
_configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
|
|
||||||
|
|
||||||
var section = (AdminClientConfigurationSection)_configuration.GetSection("adminClientConfigurationSection");
|
|
||||||
if (section == null)
|
|
||||||
throw new ConfigurationErrorsException("Can't find the adminClientConfigurationSection in the configuration file.");
|
|
||||||
|
|
||||||
BaseServiceUri = section.BaseServiceUri;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string BaseServiceUri { get; private set; }
|
|
||||||
|
|
||||||
public int MachineNumber { get; private set; }
|
|
||||||
|
|
||||||
public string MachineSerial { get; private set; }
|
|
||||||
|
|
||||||
public string DomainName { get; private set; }
|
|
||||||
}
|
|
||||||
}
|
|
390
TestApps/LOCTester/Form1.Designer.cs
generated
390
TestApps/LOCTester/Form1.Designer.cs
generated
@ -1,390 +0,0 @@
|
|||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
partial class Form1
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Required designer variable.
|
|
||||||
/// </summary>
|
|
||||||
private System.ComponentModel.IContainer components = null;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Clean up any resources being used.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
|
||||||
protected override void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (disposing && (components != null))
|
|
||||||
{
|
|
||||||
components.Dispose();
|
|
||||||
}
|
|
||||||
base.Dispose(disposing);
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Windows Form Designer generated code
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Required method for Designer support - do not modify
|
|
||||||
/// the contents of this method with the code editor.
|
|
||||||
/// </summary>
|
|
||||||
private void InitializeComponent()
|
|
||||||
{
|
|
||||||
this.button1 = new System.Windows.Forms.Button();
|
|
||||||
this.txtAdmin = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtUser = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtDetails = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtReason = new System.Windows.Forms.TextBox();
|
|
||||||
this.button2 = new System.Windows.Forms.Button();
|
|
||||||
this.txtAccountLookup = new System.Windows.Forms.TextBox();
|
|
||||||
this.lblBanned = new System.Windows.Forms.Label();
|
|
||||||
this.lblBanMessage = new System.Windows.Forms.Label();
|
|
||||||
this.txtKillerName = new System.Windows.Forms.TextBox();
|
|
||||||
this.btnSubmitStats = new System.Windows.Forms.Button();
|
|
||||||
this.txtVictimName = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtGamePlayerCount = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtGameLength = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtGameStarted = new System.Windows.Forms.TextBox();
|
|
||||||
this.label1 = new System.Windows.Forms.Label();
|
|
||||||
this.label2 = new System.Windows.Forms.Label();
|
|
||||||
this.label3 = new System.Windows.Forms.Label();
|
|
||||||
this.label4 = new System.Windows.Forms.Label();
|
|
||||||
this.label5 = new System.Windows.Forms.Label();
|
|
||||||
this.label6 = new System.Windows.Forms.Label();
|
|
||||||
this.label7 = new System.Windows.Forms.Label();
|
|
||||||
this.cmbVictimClass = new System.Windows.Forms.ComboBox();
|
|
||||||
this.cmbKillerClass = new System.Windows.Forms.ComboBox();
|
|
||||||
this.lblTimeToRetrieve = new System.Windows.Forms.Label();
|
|
||||||
this.txtCount = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtServer = new System.Windows.Forms.TextBox();
|
|
||||||
this.button3 = new System.Windows.Forms.Button();
|
|
||||||
this.button4 = new System.Windows.Forms.Button();
|
|
||||||
this.button5 = new System.Windows.Forms.Button();
|
|
||||||
this.SuspendLayout();
|
|
||||||
//
|
|
||||||
// button1
|
|
||||||
//
|
|
||||||
this.button1.Location = new System.Drawing.Point(12, 120);
|
|
||||||
this.button1.Name = "button1";
|
|
||||||
this.button1.Size = new System.Drawing.Size(75, 23);
|
|
||||||
this.button1.TabIndex = 0;
|
|
||||||
this.button1.Text = "Ban";
|
|
||||||
this.button1.UseVisualStyleBackColor = true;
|
|
||||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
|
||||||
//
|
|
||||||
// txtAdmin
|
|
||||||
//
|
|
||||||
this.txtAdmin.Location = new System.Drawing.Point(12, 12);
|
|
||||||
this.txtAdmin.Name = "txtAdmin";
|
|
||||||
this.txtAdmin.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtAdmin.TabIndex = 1;
|
|
||||||
//
|
|
||||||
// txtUser
|
|
||||||
//
|
|
||||||
this.txtUser.Location = new System.Drawing.Point(12, 38);
|
|
||||||
this.txtUser.Name = "txtUser";
|
|
||||||
this.txtUser.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtUser.TabIndex = 3;
|
|
||||||
//
|
|
||||||
// txtDetails
|
|
||||||
//
|
|
||||||
this.txtDetails.Location = new System.Drawing.Point(12, 90);
|
|
||||||
this.txtDetails.Name = "txtDetails";
|
|
||||||
this.txtDetails.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtDetails.TabIndex = 4;
|
|
||||||
//
|
|
||||||
// txtReason
|
|
||||||
//
|
|
||||||
this.txtReason.Location = new System.Drawing.Point(12, 64);
|
|
||||||
this.txtReason.Name = "txtReason";
|
|
||||||
this.txtReason.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtReason.TabIndex = 5;
|
|
||||||
//
|
|
||||||
// button2
|
|
||||||
//
|
|
||||||
this.button2.Location = new System.Drawing.Point(218, 121);
|
|
||||||
this.button2.Name = "button2";
|
|
||||||
this.button2.Size = new System.Drawing.Size(75, 23);
|
|
||||||
this.button2.TabIndex = 6;
|
|
||||||
this.button2.Text = "GetInfo";
|
|
||||||
this.button2.UseVisualStyleBackColor = true;
|
|
||||||
this.button2.Click += new System.EventHandler(this.button2_Click);
|
|
||||||
//
|
|
||||||
// txtAccountLookup
|
|
||||||
//
|
|
||||||
this.txtAccountLookup.Location = new System.Drawing.Point(137, 123);
|
|
||||||
this.txtAccountLookup.Name = "txtAccountLookup";
|
|
||||||
this.txtAccountLookup.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtAccountLookup.TabIndex = 7;
|
|
||||||
//
|
|
||||||
// lblBanned
|
|
||||||
//
|
|
||||||
this.lblBanned.AutoSize = true;
|
|
||||||
this.lblBanned.Location = new System.Drawing.Point(133, 38);
|
|
||||||
this.lblBanned.Name = "lblBanned";
|
|
||||||
this.lblBanned.Size = new System.Drawing.Size(54, 13);
|
|
||||||
this.lblBanned.TabIndex = 8;
|
|
||||||
this.lblBanned.Text = "lblBanned";
|
|
||||||
//
|
|
||||||
// lblBanMessage
|
|
||||||
//
|
|
||||||
this.lblBanMessage.AutoSize = true;
|
|
||||||
this.lblBanMessage.Location = new System.Drawing.Point(133, 57);
|
|
||||||
this.lblBanMessage.Name = "lblBanMessage";
|
|
||||||
this.lblBanMessage.Size = new System.Drawing.Size(79, 13);
|
|
||||||
this.lblBanMessage.TabIndex = 9;
|
|
||||||
this.lblBanMessage.Text = "lblBanMessage";
|
|
||||||
//
|
|
||||||
// txtKillerName
|
|
||||||
//
|
|
||||||
this.txtKillerName.Location = new System.Drawing.Point(540, 90);
|
|
||||||
this.txtKillerName.Name = "txtKillerName";
|
|
||||||
this.txtKillerName.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtKillerName.TabIndex = 10;
|
|
||||||
//
|
|
||||||
// btnSubmitStats
|
|
||||||
//
|
|
||||||
this.btnSubmitStats.Location = new System.Drawing.Point(540, 194);
|
|
||||||
this.btnSubmitStats.Name = "btnSubmitStats";
|
|
||||||
this.btnSubmitStats.Size = new System.Drawing.Size(75, 23);
|
|
||||||
this.btnSubmitStats.TabIndex = 11;
|
|
||||||
this.btnSubmitStats.Text = "Submit Stats";
|
|
||||||
this.btnSubmitStats.UseVisualStyleBackColor = true;
|
|
||||||
//
|
|
||||||
// txtVictimName
|
|
||||||
//
|
|
||||||
this.txtVictimName.Location = new System.Drawing.Point(540, 142);
|
|
||||||
this.txtVictimName.Name = "txtVictimName";
|
|
||||||
this.txtVictimName.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtVictimName.TabIndex = 13;
|
|
||||||
//
|
|
||||||
// txtGamePlayerCount
|
|
||||||
//
|
|
||||||
this.txtGamePlayerCount.Location = new System.Drawing.Point(540, 64);
|
|
||||||
this.txtGamePlayerCount.Name = "txtGamePlayerCount";
|
|
||||||
this.txtGamePlayerCount.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtGamePlayerCount.TabIndex = 15;
|
|
||||||
//
|
|
||||||
// txtGameLength
|
|
||||||
//
|
|
||||||
this.txtGameLength.Location = new System.Drawing.Point(540, 38);
|
|
||||||
this.txtGameLength.Name = "txtGameLength";
|
|
||||||
this.txtGameLength.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtGameLength.TabIndex = 16;
|
|
||||||
//
|
|
||||||
// txtGameStarted
|
|
||||||
//
|
|
||||||
this.txtGameStarted.Location = new System.Drawing.Point(540, 12);
|
|
||||||
this.txtGameStarted.Name = "txtGameStarted";
|
|
||||||
this.txtGameStarted.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtGameStarted.TabIndex = 17;
|
|
||||||
//
|
|
||||||
// label1
|
|
||||||
//
|
|
||||||
this.label1.AutoSize = true;
|
|
||||||
this.label1.Location = new System.Drawing.Point(488, 15);
|
|
||||||
this.label1.Name = "label1";
|
|
||||||
this.label1.Size = new System.Drawing.Size(41, 13);
|
|
||||||
this.label1.TabIndex = 18;
|
|
||||||
this.label1.Text = "Started";
|
|
||||||
//
|
|
||||||
// label2
|
|
||||||
//
|
|
||||||
this.label2.AutoSize = true;
|
|
||||||
this.label2.Location = new System.Drawing.Point(488, 41);
|
|
||||||
this.label2.Name = "label2";
|
|
||||||
this.label2.Size = new System.Drawing.Size(40, 13);
|
|
||||||
this.label2.TabIndex = 19;
|
|
||||||
this.label2.Text = "Length";
|
|
||||||
//
|
|
||||||
// label3
|
|
||||||
//
|
|
||||||
this.label3.AutoSize = true;
|
|
||||||
this.label3.Location = new System.Drawing.Point(461, 67);
|
|
||||||
this.label3.Name = "label3";
|
|
||||||
this.label3.Size = new System.Drawing.Size(67, 13);
|
|
||||||
this.label3.TabIndex = 20;
|
|
||||||
this.label3.Text = "Player Count";
|
|
||||||
//
|
|
||||||
// label4
|
|
||||||
//
|
|
||||||
this.label4.AutoSize = true;
|
|
||||||
this.label4.Location = new System.Drawing.Point(488, 93);
|
|
||||||
this.label4.Name = "label4";
|
|
||||||
this.label4.Size = new System.Drawing.Size(29, 13);
|
|
||||||
this.label4.TabIndex = 21;
|
|
||||||
this.label4.Text = "Killer";
|
|
||||||
//
|
|
||||||
// label5
|
|
||||||
//
|
|
||||||
this.label5.AutoSize = true;
|
|
||||||
this.label5.Location = new System.Drawing.Point(488, 123);
|
|
||||||
this.label5.Name = "label5";
|
|
||||||
this.label5.Size = new System.Drawing.Size(32, 13);
|
|
||||||
this.label5.TabIndex = 22;
|
|
||||||
this.label5.Text = "Class";
|
|
||||||
//
|
|
||||||
// label6
|
|
||||||
//
|
|
||||||
this.label6.AutoSize = true;
|
|
||||||
this.label6.Location = new System.Drawing.Point(488, 149);
|
|
||||||
this.label6.Name = "label6";
|
|
||||||
this.label6.Size = new System.Drawing.Size(35, 13);
|
|
||||||
this.label6.TabIndex = 23;
|
|
||||||
this.label6.Text = "Victim";
|
|
||||||
//
|
|
||||||
// label7
|
|
||||||
//
|
|
||||||
this.label7.AutoSize = true;
|
|
||||||
this.label7.Location = new System.Drawing.Point(488, 175);
|
|
||||||
this.label7.Name = "label7";
|
|
||||||
this.label7.Size = new System.Drawing.Size(32, 13);
|
|
||||||
this.label7.TabIndex = 24;
|
|
||||||
this.label7.Text = "Class";
|
|
||||||
//
|
|
||||||
// cmbVictimClass
|
|
||||||
//
|
|
||||||
this.cmbVictimClass.FormattingEnabled = true;
|
|
||||||
this.cmbVictimClass.Location = new System.Drawing.Point(540, 167);
|
|
||||||
this.cmbVictimClass.Name = "cmbVictimClass";
|
|
||||||
this.cmbVictimClass.Size = new System.Drawing.Size(75, 21);
|
|
||||||
this.cmbVictimClass.TabIndex = 25;
|
|
||||||
//
|
|
||||||
// cmbKillerClass
|
|
||||||
//
|
|
||||||
this.cmbKillerClass.FormattingEnabled = true;
|
|
||||||
this.cmbKillerClass.Location = new System.Drawing.Point(540, 116);
|
|
||||||
this.cmbKillerClass.Name = "cmbKillerClass";
|
|
||||||
this.cmbKillerClass.Size = new System.Drawing.Size(75, 21);
|
|
||||||
this.cmbKillerClass.TabIndex = 26;
|
|
||||||
//
|
|
||||||
// lblTimeToRetrieve
|
|
||||||
//
|
|
||||||
this.lblTimeToRetrieve.AutoSize = true;
|
|
||||||
this.lblTimeToRetrieve.Location = new System.Drawing.Point(133, 204);
|
|
||||||
this.lblTimeToRetrieve.Name = "lblTimeToRetrieve";
|
|
||||||
this.lblTimeToRetrieve.Size = new System.Drawing.Size(95, 13);
|
|
||||||
this.lblTimeToRetrieve.TabIndex = 27;
|
|
||||||
this.lblTimeToRetrieve.Text = "Time To Retrieve :";
|
|
||||||
this.lblTimeToRetrieve.Click += new System.EventHandler(this.label8_Click);
|
|
||||||
//
|
|
||||||
// txtCount
|
|
||||||
//
|
|
||||||
this.txtCount.Location = new System.Drawing.Point(136, 172);
|
|
||||||
this.txtCount.Name = "txtCount";
|
|
||||||
this.txtCount.Size = new System.Drawing.Size(30, 20);
|
|
||||||
this.txtCount.TabIndex = 28;
|
|
||||||
//
|
|
||||||
// txtServer
|
|
||||||
//
|
|
||||||
this.txtServer.Location = new System.Drawing.Point(137, 148);
|
|
||||||
this.txtServer.Name = "txtServer";
|
|
||||||
this.txtServer.Size = new System.Drawing.Size(75, 20);
|
|
||||||
this.txtServer.TabIndex = 29;
|
|
||||||
this.txtServer.Text = "http://";
|
|
||||||
//
|
|
||||||
// button3
|
|
||||||
//
|
|
||||||
this.button3.Location = new System.Drawing.Point(172, 170);
|
|
||||||
this.button3.Name = "button3";
|
|
||||||
this.button3.Size = new System.Drawing.Size(40, 23);
|
|
||||||
this.button3.TabIndex = 30;
|
|
||||||
this.button3.Text = "Test";
|
|
||||||
this.button3.UseVisualStyleBackColor = true;
|
|
||||||
this.button3.Click += new System.EventHandler(this.button3_Click);
|
|
||||||
//
|
|
||||||
// button4
|
|
||||||
//
|
|
||||||
this.button4.Location = new System.Drawing.Point(218, 170);
|
|
||||||
this.button4.Name = "button4";
|
|
||||||
this.button4.Size = new System.Drawing.Size(74, 23);
|
|
||||||
this.button4.TabIndex = 31;
|
|
||||||
this.button4.Text = "TestNoArg";
|
|
||||||
this.button4.UseVisualStyleBackColor = true;
|
|
||||||
this.button4.Click += new System.EventHandler(this.button4_Click);
|
|
||||||
//
|
|
||||||
// button5
|
|
||||||
//
|
|
||||||
this.button5.Location = new System.Drawing.Point(298, 170);
|
|
||||||
this.button5.Name = "button5";
|
|
||||||
this.button5.Size = new System.Drawing.Size(111, 23);
|
|
||||||
this.button5.TabIndex = 32;
|
|
||||||
this.button5.Text = "TestNoArgNoResult";
|
|
||||||
this.button5.UseVisualStyleBackColor = true;
|
|
||||||
this.button5.Click += new System.EventHandler(this.button5_Click);
|
|
||||||
//
|
|
||||||
// Form1
|
|
||||||
//
|
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
|
||||||
this.ClientSize = new System.Drawing.Size(756, 262);
|
|
||||||
this.Controls.Add(this.button5);
|
|
||||||
this.Controls.Add(this.button4);
|
|
||||||
this.Controls.Add(this.button3);
|
|
||||||
this.Controls.Add(this.txtServer);
|
|
||||||
this.Controls.Add(this.txtCount);
|
|
||||||
this.Controls.Add(this.lblTimeToRetrieve);
|
|
||||||
this.Controls.Add(this.cmbKillerClass);
|
|
||||||
this.Controls.Add(this.cmbVictimClass);
|
|
||||||
this.Controls.Add(this.label7);
|
|
||||||
this.Controls.Add(this.label6);
|
|
||||||
this.Controls.Add(this.label5);
|
|
||||||
this.Controls.Add(this.label4);
|
|
||||||
this.Controls.Add(this.label3);
|
|
||||||
this.Controls.Add(this.label2);
|
|
||||||
this.Controls.Add(this.label1);
|
|
||||||
this.Controls.Add(this.txtGameStarted);
|
|
||||||
this.Controls.Add(this.txtGameLength);
|
|
||||||
this.Controls.Add(this.txtGamePlayerCount);
|
|
||||||
this.Controls.Add(this.txtVictimName);
|
|
||||||
this.Controls.Add(this.btnSubmitStats);
|
|
||||||
this.Controls.Add(this.txtKillerName);
|
|
||||||
this.Controls.Add(this.lblBanMessage);
|
|
||||||
this.Controls.Add(this.lblBanned);
|
|
||||||
this.Controls.Add(this.txtAccountLookup);
|
|
||||||
this.Controls.Add(this.button2);
|
|
||||||
this.Controls.Add(this.txtReason);
|
|
||||||
this.Controls.Add(this.txtDetails);
|
|
||||||
this.Controls.Add(this.txtUser);
|
|
||||||
this.Controls.Add(this.txtAdmin);
|
|
||||||
this.Controls.Add(this.button1);
|
|
||||||
this.Name = "Form1";
|
|
||||||
this.Text = "Form1";
|
|
||||||
this.ResumeLayout(false);
|
|
||||||
this.PerformLayout();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private System.Windows.Forms.Button button1;
|
|
||||||
private System.Windows.Forms.TextBox txtAdmin;
|
|
||||||
private System.Windows.Forms.TextBox txtUser;
|
|
||||||
private System.Windows.Forms.TextBox txtDetails;
|
|
||||||
private System.Windows.Forms.TextBox txtReason;
|
|
||||||
private System.Windows.Forms.Button button2;
|
|
||||||
private System.Windows.Forms.TextBox txtAccountLookup;
|
|
||||||
private System.Windows.Forms.Label lblBanned;
|
|
||||||
private System.Windows.Forms.Label lblBanMessage;
|
|
||||||
private System.Windows.Forms.TextBox txtKillerName;
|
|
||||||
private System.Windows.Forms.Button btnSubmitStats;
|
|
||||||
private System.Windows.Forms.TextBox txtVictimName;
|
|
||||||
private System.Windows.Forms.TextBox txtGamePlayerCount;
|
|
||||||
private System.Windows.Forms.TextBox txtGameLength;
|
|
||||||
private System.Windows.Forms.TextBox txtGameStarted;
|
|
||||||
private System.Windows.Forms.Label label1;
|
|
||||||
private System.Windows.Forms.Label label2;
|
|
||||||
private System.Windows.Forms.Label label3;
|
|
||||||
private System.Windows.Forms.Label label4;
|
|
||||||
private System.Windows.Forms.Label label5;
|
|
||||||
private System.Windows.Forms.Label label6;
|
|
||||||
private System.Windows.Forms.Label label7;
|
|
||||||
private System.Windows.Forms.ComboBox cmbVictimClass;
|
|
||||||
private System.Windows.Forms.ComboBox cmbKillerClass;
|
|
||||||
private System.Windows.Forms.Label lblTimeToRetrieve;
|
|
||||||
private System.Windows.Forms.TextBox txtCount;
|
|
||||||
private System.Windows.Forms.TextBox txtServer;
|
|
||||||
private System.Windows.Forms.Button button3;
|
|
||||||
private System.Windows.Forms.Button button4;
|
|
||||||
private System.Windows.Forms.Button button5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,156 +0,0 @@
|
|||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Windows.Forms;
|
|
||||||
using LOC.Core;
|
|
||||||
using LOC.Core.DependencyResolution;
|
|
||||||
using LOC.Core.Model.Account;
|
|
||||||
using LOC.Core.Tokens;
|
|
||||||
|
|
||||||
public partial class Form1 : Form
|
|
||||||
{
|
|
||||||
private AccountRepo _accountRepo;
|
|
||||||
private int _totalLoadTime;
|
|
||||||
private int _maxThreadCount;
|
|
||||||
private int _threadCount;
|
|
||||||
|
|
||||||
public Form1()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
_accountRepo = Resolver.Current.GetService<AccountRepo>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
var ban = new Punishment();
|
|
||||||
ban.PunishmentId = -1;
|
|
||||||
ban.Reason = txtReason.Text;
|
|
||||||
|
|
||||||
_accountRepo.BanAccount(ban);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button2_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
_totalLoadTime = 0;
|
|
||||||
_threadCount = 0;
|
|
||||||
ThreadStart work = Login;
|
|
||||||
_maxThreadCount = int.Parse(txtCount.Text);
|
|
||||||
|
|
||||||
for (int i = 0; i < _maxThreadCount; i++)
|
|
||||||
{
|
|
||||||
Thread thread = new Thread(work);
|
|
||||||
thread.Start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Login()
|
|
||||||
{
|
|
||||||
int time = Environment.TickCount;
|
|
||||||
var account = _accountRepo.GetAccountByName(txtAccountLookup.Text, txtServer.Text);
|
|
||||||
|
|
||||||
_totalLoadTime += Environment.TickCount - time;
|
|
||||||
_threadCount++;
|
|
||||||
|
|
||||||
CheckCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Test()
|
|
||||||
{
|
|
||||||
int time = Environment.TickCount;
|
|
||||||
_accountRepo.Test(txtServer.Text + "/PlayerAccount/Test");
|
|
||||||
|
|
||||||
_totalLoadTime += Environment.TickCount - time;
|
|
||||||
_threadCount++;
|
|
||||||
|
|
||||||
CheckCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void TestNoArg()
|
|
||||||
{
|
|
||||||
int time = Environment.TickCount;
|
|
||||||
_accountRepo.TestNoArg(txtServer.Text + "/PlayerAccount/TestNoArg");
|
|
||||||
|
|
||||||
_totalLoadTime += Environment.TickCount - time;
|
|
||||||
_threadCount++;
|
|
||||||
|
|
||||||
CheckCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void TestNoArgNoResult()
|
|
||||||
{
|
|
||||||
int time = Environment.TickCount;
|
|
||||||
_accountRepo.TestNoArgNoResult(txtServer.Text + "/PlayerAccount/TestNoArgNoReturn");
|
|
||||||
|
|
||||||
_totalLoadTime += Environment.TickCount - time;
|
|
||||||
_threadCount++;
|
|
||||||
|
|
||||||
CheckCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void CheckCount()
|
|
||||||
{
|
|
||||||
if (_threadCount == _maxThreadCount)
|
|
||||||
{
|
|
||||||
if (lblTimeToRetrieve.InvokeRequired)
|
|
||||||
lblTimeToRetrieve.Invoke(new Action(() =>
|
|
||||||
{ lblTimeToRetrieve.Text = (_totalLoadTime/_threadCount) + "ms on average for each call"; }));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void label8_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button3_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
lblTimeToRetrieve.Text = "Testing...";
|
|
||||||
|
|
||||||
_totalLoadTime = 0;
|
|
||||||
_threadCount = 0;
|
|
||||||
ThreadStart work = Test;
|
|
||||||
_maxThreadCount = int.Parse(txtCount.Text);
|
|
||||||
|
|
||||||
for (int i = 0; i < _maxThreadCount; i++)
|
|
||||||
{
|
|
||||||
Thread thread = new Thread(work);
|
|
||||||
thread.Start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button4_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
lblTimeToRetrieve.Text = "Testing...";
|
|
||||||
|
|
||||||
_totalLoadTime = 0;
|
|
||||||
_threadCount = 0;
|
|
||||||
ThreadStart work = TestNoArg;
|
|
||||||
_maxThreadCount = int.Parse(txtCount.Text);
|
|
||||||
|
|
||||||
for (int i = 0; i < _maxThreadCount; i++)
|
|
||||||
{
|
|
||||||
Thread thread = new Thread(work);
|
|
||||||
thread.Start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button5_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
lblTimeToRetrieve.Text = "Testing...";
|
|
||||||
|
|
||||||
_totalLoadTime = 0;
|
|
||||||
_threadCount = 0;
|
|
||||||
ThreadStart work = TestNoArgNoResult;
|
|
||||||
_maxThreadCount = int.Parse(txtCount.Text);
|
|
||||||
|
|
||||||
for (int i = 0; i < _maxThreadCount; i++)
|
|
||||||
{
|
|
||||||
Thread thread = new Thread(work);
|
|
||||||
thread.Start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,120 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<root>
|
|
||||||
<!--
|
|
||||||
Microsoft ResX Schema
|
|
||||||
|
|
||||||
Version 2.0
|
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
|
||||||
that is mostly human readable. The generation and parsing of the
|
|
||||||
various data types are done through the TypeConverter classes
|
|
||||||
associated with the data types.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
|
||||||
<resheader name="version">2.0</resheader>
|
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
|
||||||
</data>
|
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:choice maxOccurs="unbounded">
|
|
||||||
<xsd:element name="metadata">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="assembly">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:attribute name="alias" type="xsd:string" />
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="data">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="resheader">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:choice>
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:schema>
|
|
||||||
<resheader name="resmimetype">
|
|
||||||
<value>text/microsoft-resx</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="version">
|
|
||||||
<value>2.0</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="reader">
|
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="writer">
|
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
</root>
|
|
@ -1,7 +0,0 @@
|
|||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
public interface ICurrentConfig
|
|
||||||
{
|
|
||||||
string BaseServiceUri { get; }
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,101 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
|
||||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
|
||||||
<ProductVersion>8.0.30703</ProductVersion>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
<ProjectGuid>{418496EF-36D6-4AE0-B48F-393D45E124CA}</ProjectGuid>
|
|
||||||
<OutputType>WinExe</OutputType>
|
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
|
||||||
<RootNamespace>LOCTester</RootNamespace>
|
|
||||||
<AssemblyName>LOCTester</AssemblyName>
|
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
|
||||||
<TargetFrameworkProfile>
|
|
||||||
</TargetFrameworkProfile>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Reference Include="System" />
|
|
||||||
<Reference Include="System.configuration" />
|
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.Drawing" />
|
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="AccountRepo.cs" />
|
|
||||||
<Compile Include="AdminClientConfigurationSection.cs" />
|
|
||||||
<Compile Include="CurrentConfig.cs" />
|
|
||||||
<Compile Include="Form1.cs">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Form1.Designer.cs">
|
|
||||||
<DependentUpon>Form1.cs</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="ICurrentConfig.cs" />
|
|
||||||
<Compile Include="Program.cs" />
|
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
||||||
<EmbeddedResource Include="Form1.resx">
|
|
||||||
<DependentUpon>Form1.cs</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="Properties\Resources.resx">
|
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<Compile Include="Properties\Resources.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
</Compile>
|
|
||||||
<None Include="app.config" />
|
|
||||||
<None Include="Properties\Settings.settings">
|
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<Compile Include="Properties\Settings.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Settings.settings</DependentUpon>
|
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\Website\LOC.Core\LOC.Core.csproj">
|
|
||||||
<Project>{A994B28E-8AAA-4A53-BDFE-0E72F1B0F4AD}</Project>
|
|
||||||
<Name>LOC.Core</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
|
||||||
<Target Name="BeforeBuild">
|
|
||||||
</Target>
|
|
||||||
<Target Name="AfterBuild">
|
|
||||||
</Target>
|
|
||||||
-->
|
|
||||||
</Project>
|
|
@ -1,21 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Windows.Forms;
|
|
||||||
|
|
||||||
namespace LOCTester
|
|
||||||
{
|
|
||||||
static class Program
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The main entry point for the application.
|
|
||||||
/// </summary>
|
|
||||||
[STAThread]
|
|
||||||
static void Main()
|
|
||||||
{
|
|
||||||
Application.EnableVisualStyles();
|
|
||||||
Application.SetCompatibleTextRenderingDefault(false);
|
|
||||||
Application.Run(new Form1());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,36 +0,0 @@
|
|||||||
using System.Reflection;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
|
||||||
// set of attributes. Change these attribute values to modify the information
|
|
||||||
// associated with an assembly.
|
|
||||||
[assembly: AssemblyTitle("LOCTester")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("Windows User")]
|
|
||||||
[assembly: AssemblyProduct("LOCTester")]
|
|
||||||
[assembly: AssemblyCopyright("Copyright © Windows User 2012")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||||
// to COM components. If you need to access a type in this assembly from
|
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
|
||||||
[assembly: Guid("ec5c36aa-8a7e-4c77-9b05-30c6094ea9ee")]
|
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
|
||||||
//
|
|
||||||
// Major Version
|
|
||||||
// Minor Version
|
|
||||||
// Build Number
|
|
||||||
// Revision
|
|
||||||
//
|
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
|
||||||
// by using the '*' as shown below:
|
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
|
||||||
[assembly: AssemblyVersion("1.0.0.0")]
|
|
||||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
63
TestApps/LOCTester/Properties/Resources.Designer.cs
generated
63
TestApps/LOCTester/Properties/Resources.Designer.cs
generated
@ -1,63 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
// Runtime Version:4.0.30319.269
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
namespace LOCTester.Properties {
|
|
||||||
using System;
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
|
||||||
/// </summary>
|
|
||||||
// This class was auto-generated by the StronglyTypedResourceBuilder
|
|
||||||
// class via a tool like ResGen or Visual Studio.
|
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
|
||||||
// with the /str option, or rebuild your VS project.
|
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
|
||||||
internal class Resources {
|
|
||||||
|
|
||||||
private static global::System.Resources.ResourceManager resourceMan;
|
|
||||||
|
|
||||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
|
||||||
|
|
||||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
|
||||||
internal Resources() {
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns the cached ResourceManager instance used by this class.
|
|
||||||
/// </summary>
|
|
||||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
|
||||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
|
||||||
get {
|
|
||||||
if (object.ReferenceEquals(resourceMan, null)) {
|
|
||||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LOCTester.Properties.Resources", typeof(Resources).Assembly);
|
|
||||||
resourceMan = temp;
|
|
||||||
}
|
|
||||||
return resourceMan;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Overrides the current thread's CurrentUICulture property for all
|
|
||||||
/// resource lookups using this strongly typed resource class.
|
|
||||||
/// </summary>
|
|
||||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
|
||||||
internal static global::System.Globalization.CultureInfo Culture {
|
|
||||||
get {
|
|
||||||
return resourceCulture;
|
|
||||||
}
|
|
||||||
set {
|
|
||||||
resourceCulture = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,117 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<root>
|
|
||||||
<!--
|
|
||||||
Microsoft ResX Schema
|
|
||||||
|
|
||||||
Version 2.0
|
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
|
||||||
that is mostly human readable. The generation and parsing of the
|
|
||||||
various data types are done through the TypeConverter classes
|
|
||||||
associated with the data types.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
|
||||||
<resheader name="version">2.0</resheader>
|
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
|
||||||
</data>
|
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:choice maxOccurs="unbounded">
|
|
||||||
<xsd:element name="metadata">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="assembly">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:attribute name="alias" type="xsd:string" />
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="data">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="resheader">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:choice>
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:schema>
|
|
||||||
<resheader name="resmimetype">
|
|
||||||
<value>text/microsoft-resx</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="version">
|
|
||||||
<value>2.0</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="reader">
|
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="writer">
|
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
</root>
|
|
26
TestApps/LOCTester/Properties/Settings.Designer.cs
generated
26
TestApps/LOCTester/Properties/Settings.Designer.cs
generated
@ -1,26 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
// Runtime Version:4.0.30319.269
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
namespace LOCTester.Properties {
|
|
||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
|
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
|
||||||
|
|
||||||
public static Settings Default {
|
|
||||||
get {
|
|
||||||
return defaultInstance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,7 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
|
|
||||||
<Profiles>
|
|
||||||
<Profile Name="(Default)" />
|
|
||||||
</Profiles>
|
|
||||||
<Settings />
|
|
||||||
</SettingsFile>
|
|
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
|
|
||||||
<configuration>
|
|
||||||
<configSections>
|
|
||||||
<section name="adminClientConfigurationSection"
|
|
||||||
type="LOCTester.AdminClientConfigurationSection,LOC.Website.COmmon"
|
|
||||||
allowLocation="true"
|
|
||||||
allowDefinition="Everywhere" />
|
|
||||||
</configSections>
|
|
||||||
<adminClientConfigurationSection machineNumber="101"
|
|
||||||
baseServiceUri="http://localhost:6969"
|
|
||||||
machineSerial="101"
|
|
||||||
domainName="arrow.local" />
|
|
||||||
<startup>
|
|
||||||
<supportedRuntime version="v4.0"
|
|
||||||
sku=".NETFramework,Version=v4.0" />
|
|
||||||
</startup>
|
|
||||||
</configuration>
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
|
|
||||||
<configuration>
|
|
||||||
<configSections>
|
|
||||||
<section name="adminClientConfigurationSection"
|
|
||||||
type="LOCTester.AdminClientConfigurationSection,LOC.Website.COmmon"
|
|
||||||
allowLocation="true"
|
|
||||||
allowDefinition="Everywhere" />
|
|
||||||
</configSections>
|
|
||||||
<adminClientConfigurationSection machineNumber="101"
|
|
||||||
baseServiceUri="http://localhost:6969"
|
|
||||||
machineSerial="101"
|
|
||||||
domainName="arrow.local" />
|
|
||||||
<startup>
|
|
||||||
<supportedRuntime version="v4.0"
|
|
||||||
sku=".NETFramework,Version=v4.0" />
|
|
||||||
</startup>
|
|
||||||
</configuration>
|
|
Binary file not shown.
Binary file not shown.
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
|
|
||||||
<configuration>
|
|
||||||
<configSections>
|
|
||||||
<section name="adminClientConfigurationSection"
|
|
||||||
type="LOCTester.AdminClientConfigurationSection,LOC.Website.COmmon"
|
|
||||||
allowLocation="true"
|
|
||||||
allowDefinition="Everywhere" />
|
|
||||||
</configSections>
|
|
||||||
<adminClientConfigurationSection machineNumber="101"
|
|
||||||
baseServiceUri="http://localhost:6969"
|
|
||||||
machineSerial="101"
|
|
||||||
domainName="arrow.local" />
|
|
||||||
<startup>
|
|
||||||
<supportedRuntime version="v4.0"
|
|
||||||
sku=".NETFramework,Version=v4.0" />
|
|
||||||
</startup>
|
|
||||||
</configuration>
|
|
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
|
||||||
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
|
|
||||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
|
||||||
<security>
|
|
||||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
|
||||||
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
|
||||||
</requestedPrivileges>
|
|
||||||
</security>
|
|
||||||
</trustInfo>
|
|
||||||
</assembly>
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
|
|
||||||
<configuration>
|
|
||||||
<configSections>
|
|
||||||
<section name="adminClientConfigurationSection"
|
|
||||||
type="LOCTester.AdminClientConfigurationSection,LOC.Website.COmmon"
|
|
||||||
allowLocation="true"
|
|
||||||
allowDefinition="Everywhere" />
|
|
||||||
</configSections>
|
|
||||||
<adminClientConfigurationSection machineNumber="101"
|
|
||||||
baseServiceUri="http://localhost:6969"
|
|
||||||
machineSerial="101"
|
|
||||||
domainName="arrow.local" />
|
|
||||||
<startup>
|
|
||||||
<supportedRuntime version="v4.0"
|
|
||||||
sku=".NETFramework,Version=v4.0" />
|
|
||||||
</startup>
|
|
||||||
</configuration>
|
|
Binary file not shown.
Binary file not shown.
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" ?>
|
|
||||||
|
|
||||||
<configuration>
|
|
||||||
<configSections>
|
|
||||||
<section name="adminClientConfigurationSection"
|
|
||||||
type="LOCTester.AdminClientConfigurationSection,LOC.Website.COmmon"
|
|
||||||
allowLocation="true"
|
|
||||||
allowDefinition="Everywhere" />
|
|
||||||
</configSections>
|
|
||||||
<adminClientConfigurationSection machineNumber="101"
|
|
||||||
baseServiceUri="http://localhost:6969"
|
|
||||||
machineSerial="101"
|
|
||||||
domainName="arrow.local" />
|
|
||||||
<startup>
|
|
||||||
<supportedRuntime version="v4.0"
|
|
||||||
sku=".NETFramework,Version=v4.0" />
|
|
||||||
</startup>
|
|
||||||
</configuration>
|
|
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
|
||||||
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
|
|
||||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
|
||||||
<security>
|
|
||||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
|
||||||
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
|
||||||
</requestedPrivileges>
|
|
||||||
</security>
|
|
||||||
</trustInfo>
|
|
||||||
</assembly>
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,18 +0,0 @@
|
|||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\LOCTester.exe.config
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\LOCTester.exe
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\LOCTester.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\LOC.Core.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\EntityFramework.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\StructureMap.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\Newtonsoft.Json.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\LOC.Core.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\EntityFramework.xml
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\StructureMap.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\StructureMap.xml
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Debug\Newtonsoft.Json.xml
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Debug\LOCTester.csprojResolveAssemblyReference.cache
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Debug\LOCTester.Form1.resources
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Debug\LOCTester.Properties.Resources.resources
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Debug\LOCTester.csproj.GenerateResource.Cache
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Debug\LOCTester.exe
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Debug\LOCTester.pdb
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,18 +0,0 @@
|
|||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Release\LOCTester.Form1.resources
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Release\LOCTester.Properties.Resources.resources
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\LOCTester.exe.config
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\LOCTester.exe
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\LOCTester.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\LOC.Core.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\EntityFramework.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\StructureMap.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\Newtonsoft.Json.dll
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\LOC.Core.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\EntityFramework.xml
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\StructureMap.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\StructureMap.xml
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\bin\Release\Newtonsoft.Json.xml
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Release\LOCTester.exe
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Release\LOCTester.pdb
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Release\LOCTester.csprojResolveAssemblyReference.cache
|
|
||||||
C:\Work\Nautilus\Minecraft\TestApps\LOCTester\obj\x86\Release\LOCTester.csproj.GenerateResource.Cache
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -79,6 +79,7 @@
|
|||||||
pet.PetName = token.PetName;
|
pet.PetName = token.PetName;
|
||||||
|
|
||||||
repository.Edit(pet);
|
repository.Edit(pet);
|
||||||
|
repository.Edit(account);
|
||||||
|
|
||||||
repository.CommitChanges();
|
repository.CommitChanges();
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user