コミット: 507bd4fefe368953fd5e236bd9237847a9a61d41 - HotshotWebServer (hg)

コミットメタ情報

• リビジョン: 507bd4fefe368953fd5e236bd9237847a9a61d41 (tree)
• 日時: 2018-10-09 05:01:27
• 作者: sebastian_bugiu <sebastian_ <bugiu@head...>
• コミッター: sebastian_bugiu <sebastian_

ログメッセージ

Restarted work on the server side. This time with bad intentions.

変更サマリ

• modified: .idea/dataSources.xml
• modified: .idea/misc.xml
• modified: HotshotWebServer5.iml
• add: .idea/libraries/junit_junit_4_12.xml
• add: db_dump/Dump20181008.sql

差分

diff -r 17ba040af043 -r 507bd4fefe36 .idea/dataSources.xml
--- a/.idea/dataSources.xml	Sat Apr 22 21:27:38 2017 +0300
+++ b/.idea/dataSources.xml	Mon Oct 08 23:01:27 2018 +0300
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DataSourceManagerImpl" format="xml" hash="3141263267">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
     <data-source source="LOCAL" name="MySQL - hotshot_user_stats@localhost" uuid="f575cc8a-3110-42b4-8bae-b44f8aa70b2d">
       <driver-ref>mysql</driver-ref>
       <synchronize>true</synchronize>
@@ -13,7 +13,6 @@
         <property name="characterSetResults" value="utf8" />
         <property name="yearIsDateType" value="false" />
       </driver-properties>
-      <libraries />
     </data-source>
   </component>
 </project>
\ No newline at end of file

diff -r 17ba040af043 -r 507bd4fefe36 .idea/libraries/junit_junit_4_12.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/libraries/junit_junit_4_12.xml	Mon Oct 08 23:01:27 2018 +0300
@@ -0,0 +1,17 @@
+<component name="libraryTable">
+  <library name="junit:junit:4.12" type="repository">
+    <properties maven-id="junit:junit:4.12" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff -r 17ba040af043 -r 507bd4fefe36 .idea/misc.xml
--- a/.idea/misc.xml	Sat Apr 22 21:27:38 2017 +0300
+++ b/.idea/misc.xml	Mon Oct 08 23:01:27 2018 +0300
@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="IdProvider" IDEtalkID="F2D20D2238C73BF437DE1CFBC0856F10" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

diff -r 17ba040af043 -r 507bd4fefe36 HotshotWebServer5.iml
--- a/HotshotWebServer5.iml	Sat Apr 22 21:27:38 2017 +0300
+++ b/HotshotWebServer5.iml	Mon Oct 08 23:01:27 2018 +0300
@@ -34,20 +34,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Mojarra-2.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="GlassFish 4.1.0" level="application_server_libraries" />
-    <orderEntry type="module-library" scope="TEST">
-      <library name="JUnit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="JPA 2.1-JPA 2.1" level="project" />
     <orderEntry type="library" name="gson-2.3.1-javadoc" level="project" />
     <orderEntry type="library" name="aopalliance-repackaged-2.4.0-b09" level="project" />
+    <orderEntry type="library" scope="TEST" name="junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="GlassFish 5.0.0" level="application_server_libraries" />
   </component>
 </module>
\ No newline at end of file

diff -r 17ba040af043 -r 507bd4fefe36 db_dump/Dump20181008.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db_dump/Dump20181008.sql	Mon Oct 08 23:01:27 2018 +0300
@@ -0,0 +1,277 @@
+-- MySQL dump 10.13  Distrib 5.7.17, for Win64 (x86_64)
+--
+-- Host: localhost    Database: hotshot_user_stats
+-- ------------------------------------------------------
+-- Server version	5.7.14
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `auth_tokens`
+--
+
+DROP TABLE IF EXISTS `auth_tokens`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `auth_tokens` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) DEFAULT NULL,
+  `token` varchar(45) DEFAULT NULL,
+  `creation_date` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `auth_tokens_user_id_idx` (`user_id`),
+  CONSTRAINT `auth_tokens_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `auth_tokens`
+--
+
+LOCK TABLES `auth_tokens` WRITE;
+/*!40000 ALTER TABLE `auth_tokens` DISABLE KEYS */;
+INSERT INTO `auth_tokens` VALUES (65,76,'d4k6o400d1vf076kc3cebl472d','2015-04-21 00:49:33'),(66,77,'n7l21kcrk1prp4a1osuhj1l451','2015-04-21 00:49:33'),(67,78,'bc4l2uosrbo52dj2t5eno1kmfc','2015-04-21 00:49:33');
+/*!40000 ALTER TABLE `auth_tokens` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `maps`
+--
+
+DROP TABLE IF EXISTS `maps`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `maps` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `local_id` int(11) DEFAULT NULL,
+  `map_name` varchar(45) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `maps`
+--
+
+LOCK TABLES `maps` WRITE;
+/*!40000 ALTER TABLE `maps` DISABLE KEYS */;
+INSERT INTO `maps` VALUES (1,NULL,'map0');
+/*!40000 ALTER TABLE `maps` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `server_sessions`
+--
+
+DROP TABLE IF EXISTS `server_sessions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `server_sessions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `server_id` int(11) DEFAULT NULL,
+  `session_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `server_id_idx` (`server_id`),
+  KEY `session_id_idx` (`session_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `server_sessions`
+--
+
+LOCK TABLES `server_sessions` WRITE;
+/*!40000 ALTER TABLE `server_sessions` DISABLE KEYS */;
+INSERT INTO `server_sessions` VALUES (20,1,20);
+/*!40000 ALTER TABLE `server_sessions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `servers`
+--
+
+DROP TABLE IF EXISTS `servers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `servers` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `server_name` varchar(45) DEFAULT NULL,
+  `ip` varchar(45) DEFAULT NULL,
+  `tcp_port` varchar(45) DEFAULT NULL,
+  `udp_port` varchar(45) DEFAULT NULL,
+  `server_load` int(11) DEFAULT NULL,
+  `session_num` int(11) DEFAULT NULL,
+  `user_num` int(11) DEFAULT NULL,
+  `online` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `servers`
+--
+
+LOCK TABLES `servers` WRITE;
+/*!40000 ALTER TABLE `servers` DISABLE KEYS */;
+INSERT INTO `servers` VALUES (1,'mainServer','127.0.0.1',NULL,NULL,10,1,1,1),(2,'My_server','127.0.0.1','30003','30004',0,0,0,0),(3,'My_server','127.0.0.1','30003','30004',0,0,0,0);
+/*!40000 ALTER TABLE `servers` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `session_users`
+--
+
+DROP TABLE IF EXISTS `session_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `session_users` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `session_id` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `id_idx` (`user_id`),
+  KEY `session_users_session_id` (`session_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `session_users`
+--
+
+LOCK TABLES `session_users` WRITE;
+/*!40000 ALTER TABLE `session_users` DISABLE KEYS */;
+INSERT INTO `session_users` VALUES (50,20,76),(51,20,77),(52,20,78);
+/*!40000 ALTER TABLE `session_users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `sessions`
+--
+
+DROP TABLE IF EXISTS `sessions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sessions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `session_name` varchar(45) CHARACTER SET latin1 DEFAULT NULL,
+  `start_time` datetime DEFAULT NULL,
+  `end_time` datetime DEFAULT NULL,
+  `map_id` int(11) DEFAULT NULL,
+  `user_num` int(11) DEFAULT NULL,
+  `active` int(11) DEFAULT NULL,
+  `latency` int(11) DEFAULT NULL,
+  `max_player_num` int(11) DEFAULT NULL,
+  `game_type` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sessions`
+--
+
+LOCK TABLES `sessions` WRITE;
+/*!40000 ALTER TABLE `sessions` DISABLE KEYS */;
+INSERT INTO `sessions` VALUES (20,'first_session','2015-04-21 00:49:33','2015-04-21 00:49:33',1,2,0,0,NULL,NULL);
+/*!40000 ALTER TABLE `sessions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user_weapon_use_stats`
+--
+
+DROP TABLE IF EXISTS `user_weapon_use_stats`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_weapon_use_stats` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) DEFAULT NULL,
+  `weapon_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `user_weapon_use_stats_weapon_id_idx` (`weapon_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `user_weapon_use_stats`
+--
+
+LOCK TABLES `user_weapon_use_stats` WRITE;
+/*!40000 ALTER TABLE `user_weapon_use_stats` DISABLE KEYS */;
+/*!40000 ALTER TABLE `user_weapon_use_stats` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `users`
+--
+
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `username` varchar(45) CHARACTER SET latin1 DEFAULT NULL,
+  `password` varchar(45) CHARACTER SET latin1 DEFAULT NULL,
+  `sessions_played` int(11) DEFAULT NULL,
+  `sessions_won` int(11) DEFAULT NULL,
+  `sessions_lost` int(11) DEFAULT NULL,
+  `kills` int(11) DEFAULT NULL,
+  `deaths` int(11) DEFAULT NULL,
+  `online` int(11) DEFAULT NULL,
+  `in_session` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `users`
+--
+
+LOCK TABLES `users` WRITE;
+/*!40000 ALTER TABLE `users` DISABLE KEYS */;
+INSERT INTO `users` VALUES (76,'Sebi','eu',0,0,0,0,0,0,1),(77,'tu','el',0,0,0,0,0,0,1),(78,'John','Doe',0,0,0,0,0,0,0);
+/*!40000 ALTER TABLE `users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weapons`
+--
+
+DROP TABLE IF EXISTS `weapons`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `weapons` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `weapon_name` varchar(45) CHARACTER SET latin1 DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `weapons`
+--
+
+LOCK TABLES `weapons` WRITE;
+/*!40000 ALTER TABLE `weapons` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weapons` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2018-10-08 22:55:58