loke/texttwist
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

up

Browse source
This commit is contained in:
Lorenzo Iovino 2017-07-16 00:25:19 +02:00
parent 697d96b322
commit bcf684bdf6
2 changed files with 56 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

115
.idea/workspace.xml generated
View file

@ -9,20 +9,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment=""> <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/Client_jar.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/Server_jar.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/META-INF/MANIFEST.MF" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/META-INF/MANIFEST.MF" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/MessageDispatcher.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendScores.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendFinalScores.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/GenerateLetters.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/GenerateLetters.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TimeoutMatch.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TimeoutMatch.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TokenInvalid.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TokenInvalid.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -96,21 +83,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="App.java" pinned="false" current-in-tab="true"> <file leaf-file-name="App.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209"> <state relative-caret-position="293">
<caret line="57" column="67" lean-forward="true" selection-start-line="57" selection-start-column="67" selection-end-line="57" selection-end-column="67" /> <caret line="61" column="22" lean-forward="true" selection-start-line="61" selection-start-column="22" selection-end-line="61" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GameService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/services/GameService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="356">
<caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -128,6 +105,26 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Server.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="28" column="32" lean-forward="true" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Logger.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Commons/src/utilities/Logger.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="14" column="35" lean-forward="true" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ComputeScore.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ComputeScore.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java"> <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -149,13 +146,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>messagedis</find>
<find>d</find>
<find>dict</find>
<find>multicas</find>
<find>multicastI</find>
<find>multicastId</find>
<find>multic</find>
<find>multicast</find> <find>multicast</find>
<find>multicastID</find> <find>multicastID</find>
<find>us</find> <find>us</find>
@ -179,6 +169,13 @@
<find>APP:</find> <find>APP:</find>
<find>APP: A</find> <find>APP: A</find>
<find>APP:</find> <find>APP:</find>
<find>no</find>
<find>notifica</find>
<find>notificationS</find>
<find>notificationSEr</find>
<find>notificationSErv</find>
<find>notificationSErver</find>
<find>notificationSErver.</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>C:\Users\loke\TextTwist\out\production</dir> <dir>C:\Users\loke\TextTwist\out\production</dir>
@ -359,7 +356,6 @@
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Sessions.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Sessions.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/dispatchers/MessageDispatcher.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/GenerateLetters.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/GenerateLetters.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/MessageDispatcher.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/MessageDispatcher.java" />
@ -368,6 +364,7 @@
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeScore.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TokenInvalid.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/TokenInvalid.java" />
<option value="$PROJECT_DIR$/run.sh" /> <option value="$PROJECT_DIR$/run.sh" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
</list> </list>
</option> </option>
</component> </component>
@ -1351,12 +1348,12 @@
<workItem from="1500035694861" duration="13413000" /> <workItem from="1500035694861" duration="13413000" />
<workItem from="1500123856495" duration="2205000" /> <workItem from="1500123856495" duration="2205000" />
<workItem from="1500128026940" duration="3724000" /> <workItem from="1500128026940" duration="3724000" />
<workItem from="1500148160799" duration="8712000" /> <workItem from="1500148160799" duration="8819000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="477989000" /> <option name="totallyTimeSpent" value="478096000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1048" extended-state="6" /> <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
@ -1411,14 +1408,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/RegisterController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/InvitePlayers.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/InvitePlayers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="357">
@ -1468,8 +1457,8 @@
<state relative-caret-position="315"> <state relative-caret-position="315">
<caret line="26" column="19" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" /> <caret line="26" column="19" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
<folding> <folding>
<element signature="e#936#937#0" expanded="true" /> <element signature="e#936#937#0" expanded="false" />
<element signature="e#987#988#0" expanded="true" /> <element signature="e#987#988#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1503,8 +1492,8 @@
<state relative-caret-position="252"> <state relative-caret-position="252">
<caret line="18" column="43" lean-forward="false" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" /> <caret line="18" column="43" lean-forward="false" selection-start-line="18" selection-start-column="43" selection-end-line="18" selection-end-column="43" />
<folding> <folding>
<element signature="e#438#439#0" expanded="true" /> <element signature="e#438#439#0" expanded="false" />
<element signature="e#488#489#0" expanded="true" /> <element signature="e#488#489#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1601,16 +1590,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="26" column="31" lean-forward="false" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java"> <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1323"> <state relative-caret-position="1323">
@ -1839,8 +1818,24 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209"> <state relative-caret-position="293">
<caret line="57" column="67" lean-forward="true" selection-start-line="57" selection-start-column="67" selection-end-line="57" selection-end-column="67" /> <caret line="61" column="22" lean-forward="true" selection-start-line="61" selection-start-column="22" selection-end-line="61" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Commons/src/utilities/Logger.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="14" column="35" lean-forward="true" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="28" column="32" lean-forward="true" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
<folding /> <folding />
</state> </state>
</provider> </provider>

2
Server/src/com/texttwist/server/Server.java
View file

@ -33,7 +33,7 @@ public class Server {
public static Integer multicastId = Config.NotificationServiceStubPort; public static Integer multicastId = Config.NotificationServiceStubPort;
public Server() throws IOException { public Server() throws IOException {
logger = new Logger(new File("./notificationServer.log"), "Server", true); logger = new Logger(new File("./server.log"), "Server", true);
Server.logger.write("Services starting ..."); Server.logger.write("Services starting ...");
startAuthService(); startAuthService();
startJedisService(); startJedisService();