Refactorisation structure du projet

src/database.properties

@@ -2,10 +2,10 @@
 url=jdbc:derby:microfolie-db;create=true
 
 # Chemin vers la class de gestion de la base
-manager=microfolie.db.MicrofolieDatabase
+manager=microfolie.persistance.MicrofolieDatabase
 
 # Valeur par défaut de @DbLink
-dblink=microfolie.db.table
+dblink=microfolie.persistance.table
 
 # Active ou non le cache des données récupèré en base
 cache=true

src/microfolie/Inscription.java → src/microfolie/entry/form/Inscription.java

@@ -1,4 +1,4 @@
-package microfolie;
+package microfolie.entry.form;
 
 import com.opensymphony.xwork2.ActionSupport;
 

src/rest/RestApplication.java → src/microfolie/entry/rest/RestApplication.java

@@ -1,4 +1,4 @@
-package rest;
+package microfolie.entry.rest;
 
 import javax.ws.rs.ApplicationPath;
 

src/rest/RestService.java → src/microfolie/entry/rest/RestService.java

@@ -1,4 +1,4 @@
-package rest;
+package microfolie.entry.rest;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;

src/servlets/Configure.java → src/microfolie/entry/servlet/Configure.java

@@ -1,4 +1,4 @@
-package servlets;
+package microfolie.entry.servlet;
 
 import java.io.IOException;
 

src/servlets/TestDb.java → src/microfolie/entry/servlet/TestDb.java

@@ -1,4 +1,4 @@
-package servlets;
+package microfolie.entry.servlet;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -15,14 +15,14 @@ import javax.servlet.http.HttpServletResponse;
 import db.Database;
 import db.DatabaseManager;
 import db.annotation.DbTable;
-import entity.Ecole;
-import entity.Espace;
-import entity.Usager;
-import entity.Ville;
-import microfolie.db.table.EcoleTable;
-import microfolie.db.table.EspaceTable;
-import microfolie.db.table.UsagerTable;
-import microfolie.db.table.VilleTable;
+import microfolie.persistance.entity.Ecole;
+import microfolie.persistance.entity.Espace;
+import microfolie.persistance.entity.Usager;
+import microfolie.persistance.entity.Ville;
+import microfolie.persistance.table.EcoleTable;
+import microfolie.persistance.table.EspaceTable;
+import microfolie.persistance.table.UsagerTable;
+import microfolie.persistance.table.VilleTable;
 
 /**
  * Servlet implementation class TestDb

src/microfolie/db/MicrofolieDatabase.java → src/microfolie/persistance/MicrofolieDatabase.java

@@ -1,4 +1,4 @@
-package microfolie.db;
+package microfolie.persistance;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

src/entity/Ecole.java → src/microfolie/persistance/entity/Ecole.java

@@ -1,4 +1,4 @@
-package entity;
+package microfolie.persistance.entity;
 
 import db.Persistable;
 import db.annotation.DbField;

src/entity/Espace.java → src/microfolie/persistance/entity/Espace.java

@@ -1,4 +1,4 @@
-package entity;
+package microfolie.persistance.entity;
 
 import db.Persistable;
 import db.annotation.DbField;

src/entity/Frequentation.java → src/microfolie/persistance/entity/Frequentation.java

@@ -1,4 +1,4 @@
-package entity;
+package microfolie.persistance.entity;
 
 import java.util.Date;
 

src/entity/Niveau.java → src/microfolie/persistance/entity/Niveau.java

@@ -1,4 +1,4 @@
-package entity;
+package microfolie.persistance.entity;
 
 import db.Persistable;
 import db.annotation.DbField;

src/entity/Usager.java → src/microfolie/persistance/entity/Usager.java

@@ -1,4 +1,4 @@
-package entity;
+package microfolie.persistance.entity;
 
 import java.util.Date;
 

src/entity/Ville.java → src/microfolie/persistance/entity/Ville.java

@@ -1,4 +1,4 @@
-package entity;
+package microfolie.persistance.entity;
 
 import db.Persistable;
 import db.annotation.DbField;

src/microfolie/db/table/EcoleTable.java → src/microfolie/persistance/table/EcoleTable.java

@@ -1,8 +1,8 @@
-package microfolie.db.table;
+package microfolie.persistance.table;
 
 import db.DatabaseTable;
 import db.annotation.DbTable;
-import entity.Ecole;
+import microfolie.persistance.entity.Ecole;
 
 @DbTable(name = "Ecole", entity = Ecole.class)
 public class EcoleTable extends DatabaseTable<Ecole> {

src/microfolie/db/table/EspaceTable.java → src/microfolie/persistance/table/EspaceTable.java

@@ -1,11 +1,11 @@
-package microfolie.db.table;
+package microfolie.persistance.table;
 
 import java.util.List;
 import java.util.Optional;
 
 import db.DatabaseTable;
 import db.annotation.DbTable;
-import entity.Espace;
+import microfolie.persistance.entity.Espace;
 
 @DbTable(name = "Espace", entity = Espace.class)
 public class EspaceTable extends DatabaseTable<Espace>{

src/microfolie/db/table/FrequentationTable.java → src/microfolie/persistance/table/FrequentationTable.java

@@ -1,8 +1,8 @@
-package microfolie.db.table;
+package microfolie.persistance.table;
 
 import db.DatabaseTable;
 import db.annotation.DbTable;
-import entity.Frequentation;
+import microfolie.persistance.entity.Frequentation;
 
 @DbTable(name = "Frequentation", entity = Frequentation.class)
 public class FrequentationTable extends DatabaseTable<Frequentation>{

src/microfolie/db/table/NiveauTable.java → src/microfolie/persistance/table/NiveauTable.java

@@ -1,8 +1,8 @@
-package microfolie.db.table;
+package microfolie.persistance.table;
 
 import db.DatabaseTable;
 import db.annotation.DbTable;
-import entity.Niveau;
+import microfolie.persistance.entity.Niveau;
 
 @DbTable(name = "Niveau", entity = Niveau.class)
 public class NiveauTable extends DatabaseTable<Niveau> {

src/microfolie/db/table/UsagerTable.java → src/microfolie/persistance/table/UsagerTable.java

@@ -1,11 +1,11 @@
-package microfolie.db.table;
+package microfolie.persistance.table;
 
 import java.util.List;
 import java.util.Optional;
 
 import db.DatabaseTable;
 import db.annotation.DbTable;
-import entity.Usager;
+import microfolie.persistance.entity.Usager;
 
 @DbTable(name = "Usager", entity = Usager.class)
 public class UsagerTable extends DatabaseTable<Usager> {

src/microfolie/db/table/VilleTable.java → src/microfolie/persistance/table/VilleTable.java

@@ -1,11 +1,11 @@
-package microfolie.db.table;
+package microfolie.persistance.table;
 
 import java.util.List;
 import java.util.Optional;
 
 import db.DatabaseTable;
 import db.annotation.DbTable;
-import entity.Ville;
+import microfolie.persistance.entity.Ville;
 
 @DbTable(name = "Ville", entity = Ville.class)
 public class VilleTable extends DatabaseTable<Ville> {

src/struts.xml

@@ -8,11 +8,11 @@
     <constant name="struts.custom.i18n.resources" value="microfolie" />
     <constant name="struts.action.extension" value="ili" />
     <package name="microfolie" extends="struts-default">
-        <action name="inscription" class="microfolie.Inscription">
+        <action name="inscription" class="microfolie.entry.form.Inscription">
             <result name="success">/index.jsp</result>
             <result name="input">/inscription.jsp</result>
         </action>
-        <action name="gotoinscription" class="microfolie.Inscription" method="before">
+        <action name="gotoinscription" class="microfolie.entry.form.Inscription" method="before">
             <result>/inscription.jsp</result>
         </action>
         <action name="gotoabonnes">