From e6eacf4ea873d5075118ec6ea2e3b5a6af4d2dbe Mon Sep 17 00:00:00 2001
From: Notmoo <skraig.boeuf@gmail.com>
Date: Wed, 26 Jul 2017 15:28:15 +0200
Subject: [PATCH] Refactor module "server" -> structure de webapp

---
 Workspace/.idea/artifacts/server_war.xml         |  8 ++++++++
 .../.idea/artifacts/server_war_exploded.xml      | 16 ++++++++++++++++
 Workspace/.idea/misc.xml                         |  9 ++++-----
 Workspace/.idea/modules.xml                      |  1 +
 Workspace/pom.xml                                |  2 +-
 Workspace/server/pom.xml                         |  1 +
 .../classes}/com/pqt/server/Server.java          |  0
 .../server/module/account/AccountService.java    |  0
 .../pqt/server/module/account/IAccountDao.java   |  0
 .../pqt/server/module/client/ClientService.java  |  0
 .../com/pqt/server/module/sale/ISaleDao.java     |  0
 .../com/pqt/server/module/sale/SaleService.java  |  0
 .../com/pqt/server/module/state/ServerState.java |  0
 .../server/module/state/ServerStateService.java  |  2 +-
 .../module/statistics/StatisticsService.java     |  0
 .../server/module/stock/HibernateStockDao.java   |  0
 .../com/pqt/server/module/stock/IStockDao.java   |  0
 .../pqt/server/module/stock/StockService.java    |  0
 Workspace/server/src/main/WEB-INF/web.xml        |  0
 19 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 Workspace/.idea/artifacts/server_war.xml
 create mode 100644 Workspace/.idea/artifacts/server_war_exploded.xml
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/Server.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/account/AccountService.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/account/IAccountDao.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/client/ClientService.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/sale/ISaleDao.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/sale/SaleService.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/state/ServerState.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/state/ServerStateService.java (94%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/statistics/StatisticsService.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/stock/HibernateStockDao.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/stock/IStockDao.java (100%)
 rename Workspace/server/src/main/{java => WEB-INF/classes}/com/pqt/server/module/stock/StockService.java (100%)
 create mode 100644 Workspace/server/src/main/WEB-INF/web.xml

diff --git a/Workspace/.idea/artifacts/server_war.xml b/Workspace/.idea/artifacts/server_war.xml
new file mode 100644
index 00000000..0f04e2c1
--- /dev/null
+++ b/Workspace/.idea/artifacts/server_war.xml
@@ -0,0 +1,8 @@
+<component name="ArtifactManager">
+  <artifact type="war" name="server:war">
+    <output-path>$PROJECT_DIR$/server/target</output-path>
+    <root id="archive" name="server-1.0-SNAPSHOT.war">
+      <element id="artifact" artifact-name="server:war exploded" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/Workspace/.idea/artifacts/server_war_exploded.xml b/Workspace/.idea/artifacts/server_war_exploded.xml
new file mode 100644
index 00000000..25d49d27
--- /dev/null
+++ b/Workspace/.idea/artifacts/server_war_exploded.xml
@@ -0,0 +1,16 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="server:war exploded">
+    <output-path>$PROJECT_DIR$/server/target/server-1.0-SNAPSHOT</output-path>
+    <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="server" />
+        </element>
+      </element>
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/server/target/server-1.0-SNAPSHOT/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="javaee-facet-resources" facet="server/web/Web" />
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/Workspace/.idea/misc.xml b/Workspace/.idea/misc.xml
index 82ba6c90..769b4698 100644
--- a/Workspace/.idea/misc.xml
+++ b/Workspace/.idea/misc.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$/server" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-    <option name="ignoredFiles">
-      <set>
         <option value="$PROJECT_DIR$/server/pom.xml" />
-      </set>
+      </list>
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
diff --git a/Workspace/.idea/modules.xml b/Workspace/.idea/modules.xml
index 1796f0ba..6af297d4 100644
--- a/Workspace/.idea/modules.xml
+++ b/Workspace/.idea/modules.xml
@@ -6,6 +6,7 @@
       <module fileurl="file://$PROJECT_DIR$/client/client.iml" filepath="$PROJECT_DIR$/client/client.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
       <module fileurl="file://$PROJECT_DIR$/server/server.iml" filepath="$PROJECT_DIR$/server/server.iml" />
+      <module fileurl="file://$PROJECT_DIR$/server/server.iml" filepath="$PROJECT_DIR$/server/server.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Workspace/pom.xml b/Workspace/pom.xml
index 015073f8..8064626c 100644
--- a/Workspace/pom.xml
+++ b/Workspace/pom.xml
@@ -10,7 +10,7 @@
     <modules>
         <module>core</module>
         <module>client</module>
-        <module>server</module>
+        <module>com.pqt.server</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/Workspace/server/pom.xml b/Workspace/server/pom.xml
index 6d6622dc..12bd3dbc 100644
--- a/Workspace/server/pom.xml
+++ b/Workspace/server/pom.xml
@@ -8,6 +8,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <packaging>war</packaging>
 
     <artifactId>server</artifactId>
 
diff --git a/Workspace/server/src/main/java/com/pqt/server/Server.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/Server.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/Server.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/Server.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/account/AccountService.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/AccountService.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/account/AccountService.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/AccountService.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/account/IAccountDao.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/IAccountDao.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/account/IAccountDao.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/IAccountDao.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/client/ClientService.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/client/ClientService.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/client/ClientService.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/client/ClientService.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/sale/ISaleDao.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/ISaleDao.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/sale/ISaleDao.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/ISaleDao.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/sale/SaleService.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/SaleService.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/sale/SaleService.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/SaleService.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/state/ServerState.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerState.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/state/ServerState.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerState.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/state/ServerStateService.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerStateService.java
similarity index 94%
rename from Workspace/server/src/main/java/com/pqt/server/module/state/ServerStateService.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerStateService.java
index 0eea3c32..1d6f8878 100644
--- a/Workspace/server/src/main/java/com/pqt/server/module/state/ServerStateService.java
+++ b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerStateService.java
@@ -16,7 +16,7 @@ public class ServerStateService {
 	    this.serverState = new ServerState();
 
 	    //TODO config adresse IP
-        //this.server.setAddress(...);
+        //this.com.pqt.server.setAddress(...);
 
         this.server.setLastUpdate(new Date());
 	}
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/statistics/StatisticsService.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/statistics/StatisticsService.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/statistics/StatisticsService.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/statistics/StatisticsService.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/stock/HibernateStockDao.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/HibernateStockDao.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/stock/HibernateStockDao.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/HibernateStockDao.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/stock/IStockDao.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/IStockDao.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/stock/IStockDao.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/IStockDao.java
diff --git a/Workspace/server/src/main/java/com/pqt/server/module/stock/StockService.java b/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/StockService.java
similarity index 100%
rename from Workspace/server/src/main/java/com/pqt/server/module/stock/StockService.java
rename to Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/StockService.java
diff --git a/Workspace/server/src/main/WEB-INF/web.xml b/Workspace/server/src/main/WEB-INF/web.xml
new file mode 100644
index 00000000..e69de29b