diff --git a/hsarback/.classpath b/hsarback/.classpath
deleted file mode 100644
index 8c4f05d..0000000
--- a/hsarback/.classpath
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hsarback/.gitignore b/hsarback/.gitignore
index 1ccef55..1156d45 100644
--- a/hsarback/.gitignore
+++ b/hsarback/.gitignore
@@ -1,3 +1,6 @@
/build
/bin
-/.settings
+/.classpath
+/.project
+/.settings/
+/target/
diff --git a/hsarback/.project b/hsarback/.project
deleted file mode 100644
index 9d84720..0000000
--- a/hsarback/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- hsarback
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/hsarback/.settings/org.eclipse.core.resources.prefs b/hsarback/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index feb9fe1..0000000
--- a/hsarback/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//doc/overview-for-translatewiki-net=UTF-8
diff --git a/hsarback/conf/META-INF/persistence.xml b/hsarback/conf/META-INF/persistence.xml
deleted file mode 100644
index ae4304b..0000000
--- a/hsarback/conf/META-INF/persistence.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- org.apache.openjpa.persistence.PersistenceProviderImpl
- java:/comp/env/jdbc/HSAdminDB
- de.hsadmin.core.qserv.QueueTask
- de.hsadmin.mods.cust.Customer
- de.hsadmin.mods.cust.Contact
- de.hsadmin.mods.pac.Pac
- de.hsadmin.mods.pac.BasePac
- de.hsadmin.mods.pac.BaseComponent
- de.hsadmin.mods.pac.Component
- de.hsadmin.mods.pac.PacComponent
- de.hsadmin.mods.pac.Hive
- de.hsadmin.mods.pac.INetAddress
- de.hsadmin.mods.user.UnixUser
- de.hsadmin.mods.dom.Domain
- de.hsadmin.mods.dom.DomainOption
- de.hsadmin.mods.email.EMailAddress
- de.hsadmin.mods.email.EMailAlias
- de.hsadmin.mods.db.DatabaseUser
- de.hsadmin.mods.db.MySqlUser
- de.hsadmin.mods.db.PgSqlUser
- de.hsadmin.mods.db.Database
- de.hsadmin.mods.db.MySqlDatabase
- de.hsadmin.mods.db.PgSqlDatabase
-
-
-
-
-
-
diff --git a/hsarback/pom.xml b/hsarback/pom.xml
new file mode 100644
index 0000000..59181c7
--- /dev/null
+++ b/hsarback/pom.xml
@@ -0,0 +1,118 @@
+
+ 4.0.0
+ de.hsadmin
+ hsar
+ war
+ 4.0.6
+ HSAdmin Stable Backend Webapp
+ http://maven.apache.org
+
+ UTF-8
+ UTF-8
+ 11
+ 11
+
+
+
+ local
+
+ true
+
+
+
+
+ src/main/resources
+
+
+ src/main/local-resources
+
+
+
+
+
+
+
+ de.hsadmin.core
+ hsadmin-util
+ 4.0.6
+
+
+ commons-httpclient
+ commons-httpclient
+ 3.1
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
+
+ org.apache.xmlrpc
+ xmlrpc-server
+ 3.1.3
+
+
+ org.apache.xmlrpc
+ xmlrpc-client
+ 3.1.3
+
+
+ org.apache.velocity
+ velocity-engine-core
+ 2.3
+
+
+ org.apache.activemq
+ activemq-core
+ 5.7.0
+
+
+ org.apache.openjpa
+ openjpa
+ 3.2.2
+
+
+ junit
+ junit
+ 4.13.2
+ test
+
+
+ javax.servlet
+ javax.servlet-api
+ 4.0.1
+ provided
+
+
+
+ hsar
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.4.0
+
+
+ org.apache.openjpa
+ openjpa-maven-plugin
+ 3.2.2
+
+ **/QueueTask.class,**/Domain.class,**/DomainOption.class,**/EMailAddress.class,**/EMailAlias.class,**/Customer.class,**/Contact.class,**/UnixUser.class,**/Pac.class,**/BasePac.class,**/BaseComponent.class,**/PacComponent.class,**/Component.class,**/Hive.class,**/INetAddress.class,**/Database.class,**/DatabaseUser.class,**/PgSqlDatabase.class,**/MySqlDatabase.class,**/PgSqlUser.class,**/MySqlUser.class
+ true
+ true
+
+
+
+ enhancer
+ process-classes
+
+ enhance
+
+
+
+
+
+
+
diff --git a/hsarback/src/de/hsadmin/core/model/AbstractEntity.java b/hsarback/src/main/java/de/hsadmin/core/model/AbstractEntity.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AbstractEntity.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AbstractEntity.java
diff --git a/hsarback/src/de/hsadmin/core/model/AbstractListValue.java b/hsarback/src/main/java/de/hsadmin/core/model/AbstractListValue.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AbstractListValue.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AbstractListValue.java
diff --git a/hsarback/src/de/hsadmin/core/model/AbstractModuleImpl.java b/hsarback/src/main/java/de/hsadmin/core/model/AbstractModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AbstractModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AbstractModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/core/model/AnnFieldIO.java b/hsarback/src/main/java/de/hsadmin/core/model/AnnFieldIO.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AnnFieldIO.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AnnFieldIO.java
diff --git a/hsarback/src/de/hsadmin/core/model/AnnModuleImpl.java b/hsarback/src/main/java/de/hsadmin/core/model/AnnModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AnnModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AnnModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/core/model/AuthenticationException.java b/hsarback/src/main/java/de/hsadmin/core/model/AuthenticationException.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AuthenticationException.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AuthenticationException.java
diff --git a/hsarback/src/de/hsadmin/core/model/AuthorisationException.java b/hsarback/src/main/java/de/hsadmin/core/model/AuthorisationException.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/AuthorisationException.java
rename to hsarback/src/main/java/de/hsadmin/core/model/AuthorisationException.java
diff --git a/hsarback/src/de/hsadmin/core/model/BooleanListValue.java b/hsarback/src/main/java/de/hsadmin/core/model/BooleanListValue.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/BooleanListValue.java
rename to hsarback/src/main/java/de/hsadmin/core/model/BooleanListValue.java
diff --git a/hsarback/src/de/hsadmin/core/model/DefaultSelectableValues.java b/hsarback/src/main/java/de/hsadmin/core/model/DefaultSelectableValues.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/DefaultSelectableValues.java
rename to hsarback/src/main/java/de/hsadmin/core/model/DefaultSelectableValues.java
diff --git a/hsarback/src/de/hsadmin/core/model/EntitySessionHelper.java b/hsarback/src/main/java/de/hsadmin/core/model/EntitySessionHelper.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/EntitySessionHelper.java
rename to hsarback/src/main/java/de/hsadmin/core/model/EntitySessionHelper.java
diff --git a/hsarback/src/de/hsadmin/core/model/GenericModuleImpl.java b/hsarback/src/main/java/de/hsadmin/core/model/GenericModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/GenericModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/core/model/GenericModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/core/model/KindOfSelectableValue.java b/hsarback/src/main/java/de/hsadmin/core/model/KindOfSelectableValue.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/KindOfSelectableValue.java
rename to hsarback/src/main/java/de/hsadmin/core/model/KindOfSelectableValue.java
diff --git a/hsarback/src/de/hsadmin/core/model/ModuleInterface.java b/hsarback/src/main/java/de/hsadmin/core/model/ModuleInterface.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/ModuleInterface.java
rename to hsarback/src/main/java/de/hsadmin/core/model/ModuleInterface.java
diff --git a/hsarback/src/de/hsadmin/core/model/PersistenceManager.java b/hsarback/src/main/java/de/hsadmin/core/model/PersistenceManager.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/PersistenceManager.java
rename to hsarback/src/main/java/de/hsadmin/core/model/PersistenceManager.java
diff --git a/hsarback/src/de/hsadmin/core/model/PersistenceManagerContextListener.java b/hsarback/src/main/java/de/hsadmin/core/model/PersistenceManagerContextListener.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/PersistenceManagerContextListener.java
rename to hsarback/src/main/java/de/hsadmin/core/model/PersistenceManagerContextListener.java
diff --git a/hsarback/src/de/hsadmin/core/model/PrivilegesInterface.java b/hsarback/src/main/java/de/hsadmin/core/model/PrivilegesInterface.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/PrivilegesInterface.java
rename to hsarback/src/main/java/de/hsadmin/core/model/PrivilegesInterface.java
diff --git a/hsarback/src/de/hsadmin/core/model/PrivilegesModuleImpl.java b/hsarback/src/main/java/de/hsadmin/core/model/PrivilegesModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/PrivilegesModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/core/model/PrivilegesModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/core/model/ReadWriteAccess.java b/hsarback/src/main/java/de/hsadmin/core/model/ReadWriteAccess.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/ReadWriteAccess.java
rename to hsarback/src/main/java/de/hsadmin/core/model/ReadWriteAccess.java
diff --git a/hsarback/src/de/hsadmin/core/model/ReflectionUtil.java b/hsarback/src/main/java/de/hsadmin/core/model/ReflectionUtil.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/ReflectionUtil.java
rename to hsarback/src/main/java/de/hsadmin/core/model/ReflectionUtil.java
diff --git a/hsarback/src/de/hsadmin/core/model/SearchFilter.java b/hsarback/src/main/java/de/hsadmin/core/model/SearchFilter.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/SearchFilter.java
rename to hsarback/src/main/java/de/hsadmin/core/model/SearchFilter.java
diff --git a/hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java b/hsarback/src/main/java/de/hsadmin/core/model/SecureDefaultModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/SecureDefaultModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/core/model/SecureDefaultModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/core/model/SelectableValue.java b/hsarback/src/main/java/de/hsadmin/core/model/SelectableValue.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/SelectableValue.java
rename to hsarback/src/main/java/de/hsadmin/core/model/SelectableValue.java
diff --git a/hsarback/src/de/hsadmin/core/model/TechnicalException.java b/hsarback/src/main/java/de/hsadmin/core/model/TechnicalException.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/TechnicalException.java
rename to hsarback/src/main/java/de/hsadmin/core/model/TechnicalException.java
diff --git a/hsarback/src/de/hsadmin/core/model/TicketValidator.java b/hsarback/src/main/java/de/hsadmin/core/model/TicketValidator.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/TicketValidator.java
rename to hsarback/src/main/java/de/hsadmin/core/model/TicketValidator.java
diff --git a/hsarback/src/de/hsadmin/core/model/Transaction.java b/hsarback/src/main/java/de/hsadmin/core/model/Transaction.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/model/Transaction.java
rename to hsarback/src/main/java/de/hsadmin/core/model/Transaction.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/AbstractProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/AbstractProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/AbstractProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/AbstractProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/CommandShell.java b/hsarback/src/main/java/de/hsadmin/core/qserv/CommandShell.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/CommandShell.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/CommandShell.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/CompoundProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/CompoundProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/CompoundProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/CompoundProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/CopyFileProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/CopyFileProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/CopyFileProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/CopyFileProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/CreateFileProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/CreateFileProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/CreateFileProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/CreateFileProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/EntityProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/core/qserv/EntityProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/EntityProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/EntityProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/JDBCProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/JDBCProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/JDBCProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/NullProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/NullProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/NullProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/NullProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/Processor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/Processor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/Processor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/Processor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/ProcessorException.java b/hsarback/src/main/java/de/hsadmin/core/qserv/ProcessorException.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/ProcessorException.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/ProcessorException.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/QueueClient.java b/hsarback/src/main/java/de/hsadmin/core/qserv/QueueClient.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/QueueClient.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/QueueClient.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/QueueCommons.java b/hsarback/src/main/java/de/hsadmin/core/qserv/QueueCommons.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/QueueCommons.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/QueueCommons.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/QueueServer.java b/hsarback/src/main/java/de/hsadmin/core/qserv/QueueServer.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/QueueServer.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/QueueServer.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java b/hsarback/src/main/java/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/QueueTask.java b/hsarback/src/main/java/de/hsadmin/core/qserv/QueueTask.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/QueueTask.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/QueueTask.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/ShellException.java b/hsarback/src/main/java/de/hsadmin/core/qserv/ShellException.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/ShellException.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/ShellException.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/ShellProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/ShellProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/ShellProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/ShellProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/SmtpHelper.java b/hsarback/src/main/java/de/hsadmin/core/qserv/SmtpHelper.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/SmtpHelper.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/SmtpHelper.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/VelocityProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/VelocityProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/VelocityProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/VelocityProcessor.java
diff --git a/hsarback/src/de/hsadmin/core/qserv/WaitingTasksProcessor.java b/hsarback/src/main/java/de/hsadmin/core/qserv/WaitingTasksProcessor.java
similarity index 100%
rename from hsarback/src/de/hsadmin/core/qserv/WaitingTasksProcessor.java
rename to hsarback/src/main/java/de/hsadmin/core/qserv/WaitingTasksProcessor.java
diff --git a/hsarback/src/de/hsadmin/hostsharing/BasePacType.java b/hsarback/src/main/java/de/hsadmin/hostsharing/BasePacType.java
similarity index 100%
rename from hsarback/src/de/hsadmin/hostsharing/BasePacType.java
rename to hsarback/src/main/java/de/hsadmin/hostsharing/BasePacType.java
diff --git a/hsarback/src/de/hsadmin/hostsharing/MultiOption.java b/hsarback/src/main/java/de/hsadmin/hostsharing/MultiOption.java
similarity index 100%
rename from hsarback/src/de/hsadmin/hostsharing/MultiOption.java
rename to hsarback/src/main/java/de/hsadmin/hostsharing/MultiOption.java
diff --git a/hsarback/src/de/hsadmin/mods/cust/Contact.java b/hsarback/src/main/java/de/hsadmin/mods/cust/Contact.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/cust/Contact.java
rename to hsarback/src/main/java/de/hsadmin/mods/cust/Contact.java
diff --git a/hsarback/src/de/hsadmin/mods/cust/Customer.java b/hsarback/src/main/java/de/hsadmin/mods/cust/Customer.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/cust/Customer.java
rename to hsarback/src/main/java/de/hsadmin/mods/cust/Customer.java
diff --git a/hsarback/src/de/hsadmin/mods/cust/IndicatorVAT.java b/hsarback/src/main/java/de/hsadmin/mods/cust/IndicatorVAT.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/cust/IndicatorVAT.java
rename to hsarback/src/main/java/de/hsadmin/mods/cust/IndicatorVAT.java
diff --git a/hsarback/src/de/hsadmin/mods/db/Database.java b/hsarback/src/main/java/de/hsadmin/mods/db/Database.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/Database.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/Database.java
diff --git a/hsarback/src/de/hsadmin/mods/db/DatabaseUser.java b/hsarback/src/main/java/de/hsadmin/mods/db/DatabaseUser.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/DatabaseUser.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/DatabaseUser.java
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlDatabase.java b/hsarback/src/main/java/de/hsadmin/mods/db/MySqlDatabase.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/MySqlDatabase.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/MySqlDatabase.java
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/MySqlDatabaseProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlUser.java b/hsarback/src/main/java/de/hsadmin/mods/db/MySqlUser.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/MySqlUser.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/MySqlUser.java
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/db/MySqlUserModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/MySqlUserModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/db/MySqlUserProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/MySqlUserProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/MySqlUserProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlDatabase.java b/hsarback/src/main/java/de/hsadmin/mods/db/PgSqlDatabase.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/PgSqlDatabase.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/PgSqlDatabase.java
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/PgSqlDatabaseProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlUser.java b/hsarback/src/main/java/de/hsadmin/mods/db/PgSqlUser.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/PgSqlUser.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/PgSqlUser.java
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlUserModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/db/PgSqlUserModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/PgSqlUserModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/PgSqlUserModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/db/PgSqlUserProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/db/PgSqlUserProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/db/PgSqlUserProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/db/PgSqlUserProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/dom/Domain.java b/hsarback/src/main/java/de/hsadmin/mods/dom/Domain.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/Domain.java
rename to hsarback/src/main/java/de/hsadmin/mods/dom/Domain.java
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/dom/DomainModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/dom/DomainModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainOption.java b/hsarback/src/main/java/de/hsadmin/mods/dom/DomainOption.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/DomainOption.java
rename to hsarback/src/main/java/de/hsadmin/mods/dom/DomainOption.java
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java b/hsarback/src/main/java/de/hsadmin/mods/dom/DomainOptionValues.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java
rename to hsarback/src/main/java/de/hsadmin/mods/dom/DomainOptionValues.java
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddress.java b/hsarback/src/main/java/de/hsadmin/mods/email/EMailAddress.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/email/EMailAddress.java
rename to hsarback/src/main/java/de/hsadmin/mods/email/EMailAddress.java
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddressModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/email/EMailAddressModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/email/EMailAddressModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/email/EMailAddressModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAlias.java b/hsarback/src/main/java/de/hsadmin/mods/email/EMailAlias.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/email/EMailAlias.java
rename to hsarback/src/main/java/de/hsadmin/mods/email/EMailAlias.java
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAliasModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/email/EMailAliasModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/email/EMailAliasModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/email/EMailAliasModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAliasProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/email/EMailAliasProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/email/EMailAliasProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/email/EMailAliasProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/BaseComponent.java b/hsarback/src/main/java/de/hsadmin/mods/pac/BaseComponent.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/BaseComponent.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/BaseComponent.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/BasePac.java b/hsarback/src/main/java/de/hsadmin/mods/pac/BasePac.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/BasePac.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/BasePac.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/Component.java b/hsarback/src/main/java/de/hsadmin/mods/pac/Component.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/Component.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/Component.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/Hive.java b/hsarback/src/main/java/de/hsadmin/mods/pac/Hive.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/Hive.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/Hive.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/INetAddress.java b/hsarback/src/main/java/de/hsadmin/mods/pac/INetAddress.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/INetAddress.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/INetAddress.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/Pac.java b/hsarback/src/main/java/de/hsadmin/mods/pac/Pac.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/Pac.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/Pac.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacComponent.java b/hsarback/src/main/java/de/hsadmin/mods/pac/PacComponent.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/PacComponent.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/PacComponent.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/pac/PacModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/PacModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/pac/PacProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/PacProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/mods/pac/PacTasksServlet.java b/hsarback/src/main/java/de/hsadmin/mods/pac/PacTasksServlet.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/PacTasksServlet.java
rename to hsarback/src/main/java/de/hsadmin/mods/pac/PacTasksServlet.java
diff --git a/hsarback/src/de/hsadmin/mods/qstat/QTaskModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/qstat/QTaskModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/qstat/QTaskModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/qstat/QTaskModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUser.java b/hsarback/src/main/java/de/hsadmin/mods/user/UnixUser.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/user/UnixUser.java
rename to hsarback/src/main/java/de/hsadmin/mods/user/UnixUser.java
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java b/hsarback/src/main/java/de/hsadmin/mods/user/UnixUserModuleImpl.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java
rename to hsarback/src/main/java/de/hsadmin/mods/user/UnixUserModuleImpl.java
diff --git a/hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java b/hsarback/src/main/java/de/hsadmin/mods/user/UnixUserProcessorFactory.java
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/user/UnixUserProcessorFactory.java
rename to hsarback/src/main/java/de/hsadmin/mods/user/UnixUserProcessorFactory.java
diff --git a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java b/hsarback/src/main/java/de/hsadmin/pillar/JsonPillarServlet.java
similarity index 100%
rename from hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
rename to hsarback/src/main/java/de/hsadmin/pillar/JsonPillarServlet.java
diff --git a/hsarback/src/de/hsadmin/remote/AbstractRemote.java b/hsarback/src/main/java/de/hsadmin/remote/AbstractRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/AbstractRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/AbstractRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/DomainRemote.java b/hsarback/src/main/java/de/hsadmin/remote/DomainRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/DomainRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/DomainRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/EMailAddressRemote.java b/hsarback/src/main/java/de/hsadmin/remote/EMailAddressRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/EMailAddressRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/EMailAddressRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/EMailAliasRemote.java b/hsarback/src/main/java/de/hsadmin/remote/EMailAliasRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/EMailAliasRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/EMailAliasRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/EMailRemote.java b/hsarback/src/main/java/de/hsadmin/remote/EMailRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/EMailRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/EMailRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/GenericAbstractRemote.java b/hsarback/src/main/java/de/hsadmin/remote/GenericAbstractRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/GenericAbstractRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/GenericAbstractRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/HSXmlRpcServlet.java b/hsarback/src/main/java/de/hsadmin/remote/HSXmlRpcServlet.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/HSXmlRpcServlet.java
rename to hsarback/src/main/java/de/hsadmin/remote/HSXmlRpcServlet.java
diff --git a/hsarback/src/de/hsadmin/remote/IRemote.java b/hsarback/src/main/java/de/hsadmin/remote/IRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/IRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/IRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/ModulePropertiesRemote.java b/hsarback/src/main/java/de/hsadmin/remote/ModulePropertiesRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/ModulePropertiesRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/ModulePropertiesRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/MysqlDbRemote.java b/hsarback/src/main/java/de/hsadmin/remote/MysqlDbRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/MysqlDbRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/MysqlDbRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/MysqlUserRemote.java b/hsarback/src/main/java/de/hsadmin/remote/MysqlUserRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/MysqlUserRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/MysqlUserRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/PacRemote.java b/hsarback/src/main/java/de/hsadmin/remote/PacRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/PacRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/PacRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/PgsqlDbRemote.java b/hsarback/src/main/java/de/hsadmin/remote/PgsqlDbRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/PgsqlDbRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/PgsqlDbRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/PgsqlUserRemote.java b/hsarback/src/main/java/de/hsadmin/remote/PgsqlUserRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/PgsqlUserRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/PgsqlUserRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/PropertyRemote.java b/hsarback/src/main/java/de/hsadmin/remote/PropertyRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/PropertyRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/PropertyRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/QueueTaskRemote.java b/hsarback/src/main/java/de/hsadmin/remote/QueueTaskRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/QueueTaskRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/QueueTaskRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/RoleRemote.java b/hsarback/src/main/java/de/hsadmin/remote/RoleRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/RoleRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/RoleRemote.java
diff --git a/hsarback/src/de/hsadmin/remote/UnixUserRemote.java b/hsarback/src/main/java/de/hsadmin/remote/UnixUserRemote.java
similarity index 100%
rename from hsarback/src/de/hsadmin/remote/UnixUserRemote.java
rename to hsarback/src/main/java/de/hsadmin/remote/UnixUserRemote.java
diff --git a/hsarback/src/main/resources/META-INF/persistence.xml b/hsarback/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..3cf4201
--- /dev/null
+++ b/hsarback/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,38 @@
+
+
+
+ org.apache.openjpa.persistence.PersistenceProviderImpl
+ java:/comp/env/jdbc/HSAdminDB
+ de.hsadmin.core.qserv.QueueTask
+ de.hsadmin.mods.cust.Customer
+ de.hsadmin.mods.cust.Contact
+ de.hsadmin.mods.pac.Pac
+ de.hsadmin.mods.pac.BasePac
+ de.hsadmin.mods.pac.BaseComponent
+ de.hsadmin.mods.pac.Component
+ de.hsadmin.mods.pac.PacComponent
+ de.hsadmin.mods.pac.Hive
+ de.hsadmin.mods.pac.INetAddress
+ de.hsadmin.mods.user.UnixUser
+ de.hsadmin.mods.dom.Domain
+ de.hsadmin.mods.dom.DomainOption
+ de.hsadmin.mods.email.EMailAddress
+ de.hsadmin.mods.email.EMailAlias
+ de.hsadmin.mods.db.DatabaseUser
+ de.hsadmin.mods.db.MySqlUser
+ de.hsadmin.mods.db.PgSqlUser
+ de.hsadmin.mods.db.Database
+ de.hsadmin.mods.db.MySqlDatabase
+ de.hsadmin.mods.db.PgSqlDatabase
+
+
+
+
+
+
diff --git a/hsarback/src/de/hsadmin/mods/dom/acmebot-domain.properties.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/acmebot-domain.properties.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/acmebot-domain.properties.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/dom/acmebot-domain.properties.vm
diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/dom/apache-vhost.vm
diff --git a/hsarback/src/de/hsadmin/mods/dom/htaccess.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/htaccess.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/htaccess.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/dom/htaccess.vm
diff --git a/hsarback/src/de/hsadmin/mods/dom/index.html.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/index.html.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/index.html.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/dom/index.html.vm
diff --git a/hsarback/src/de/hsadmin/mods/dom/named-hsh-conf.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/named-hsh-conf.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/named-hsh-conf.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/dom/named-hsh-conf.vm
diff --git a/hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm b/hsarback/src/main/resources/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/dom/postgrey-whitelist-recipients.vm
diff --git a/hsarback/src/de/hsadmin/mods/pac/hosts.vm b/hsarback/src/main/resources/de/hsadmin/mods/pac/hosts.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/hosts.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/pac/hosts.vm
diff --git a/hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv4.vm b/hsarback/src/main/resources/de/hsadmin/mods/pac/pac-addr-ipv4.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv4.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/pac/pac-addr-ipv4.vm
diff --git a/hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv6.vm b/hsarback/src/main/resources/de/hsadmin/mods/pac/pac-addr-ipv6.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/pac-addr-ipv6.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/pac/pac-addr-ipv6.vm
diff --git a/hsarback/src/de/hsadmin/mods/pac/pac-zonefile.vm b/hsarback/src/main/resources/de/hsadmin/mods/pac/pac-zonefile.vm
similarity index 100%
rename from hsarback/src/de/hsadmin/mods/pac/pac-zonefile.vm
rename to hsarback/src/main/resources/de/hsadmin/mods/pac/pac-zonefile.vm
diff --git a/hsarback/src/org/apache/xmlrpc/webserver/XmlRpcServlet.properties b/hsarback/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
similarity index 100%
rename from hsarback/src/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
rename to hsarback/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
diff --git a/hsarback/conf/META-INF/dev-context.xml b/hsarback/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from hsarback/conf/META-INF/dev-context.xml
rename to hsarback/src/main/webapp/META-INF/context.xml
diff --git a/hsarback/conf/META-INF/test-context.xml b/hsarback/src/main/webapp/META-INF/dev-context.xml
similarity index 100%
rename from hsarback/conf/META-INF/test-context.xml
rename to hsarback/src/main/webapp/META-INF/dev-context.xml
diff --git a/hsarback/conf/META-INF/persistence-with-sql-logging.xml b/hsarback/src/main/webapp/META-INF/persistence-with-sql-logging.xml
similarity index 100%
rename from hsarback/conf/META-INF/persistence-with-sql-logging.xml
rename to hsarback/src/main/webapp/META-INF/persistence-with-sql-logging.xml
diff --git a/hsarback/conf/META-INF/prod-context.xml b/hsarback/src/main/webapp/META-INF/prod-context.xml
similarity index 100%
rename from hsarback/conf/META-INF/prod-context.xml
rename to hsarback/src/main/webapp/META-INF/prod-context.xml
diff --git a/hsarback/src/main/webapp/META-INF/test-context.xml b/hsarback/src/main/webapp/META-INF/test-context.xml
new file mode 100644
index 0000000..5d2ca88
--- /dev/null
+++ b/hsarback/src/main/webapp/META-INF/test-context.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hsarback/src/main/webapp/WEB-INF/web.xml b/hsarback/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..397de57
--- /dev/null
+++ b/hsarback/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,109 @@
+
+
+
+
+ de.hsadmin.core.model.PersistenceManagerContextListener
+
+
+
+ Queue Status Servlet
+ de.hsadmin.core.qserv.QueueStatusReceiverServlet
+
+ proxyValidateUrl
+ http://localhost:8080/cas/proxyValidate
+
+
+ proxyServiceUrl
+ http://localhost:8080/hsar/backend
+
+ 1
+
+
+
+ Queue PacTasks Servlet
+ de.hsadmin.mods.pac.PacTasksServlet
+ 1
+
+
+
+ XmlRpcServlet
+ de.hsadmin.remote.HSXmlRpcServlet
+
+ enabledForExtensions
+ true
+
+
+
+
+ PillarServlet
+ de.hsadmin.pillar.JsonPillarServlet
+
+
+
+ Queue Status Servlet
+ /queueStatus
+
+
+
+ PillarServlet
+ /pillar
+
+
+
+ XmlRpcServlet
+ /xmlrpc/*
+
+
+
+ Queue PacTasks Servlet
+ /queuePacTasks
+
+
+
+ jdbc/HSAdminDB
+ javax.sql.DataSource
+ Container
+
+
+
+ jms/QueueCF
+ javax.jms.QueueConnectionFactory
+ Container
+ Shareable
+
+
+
+ jms/hsadminSystem-h99
+ javax.jms.Queue
+ Container
+ Shareable
+
+
+ jms/hsadminSystem-testdns
+ javax.jms.Queue
+ Container
+ Shareable
+
+
+ jms/hsadminSystem-testmail
+ javax.jms.Queue
+ Container
+ Shareable
+
+
+ jms/hsadminStatus
+ javax.jms.Queue
+ Container
+ Shareable
+
+
+ jms/hsadminSystem-pactasks
+ javax.jms.Queue
+ Container
+ Shareable
+
+
+
\ No newline at end of file
diff --git a/hsarback/test/de/hsadmin/remote/ContinuousIntegrationTest.java b/hsarback/src/test/java/de/hsadmin/remote/ContinuousIntegrationTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/ContinuousIntegrationTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/ContinuousIntegrationTest.java
diff --git a/hsarback/test/de/hsadmin/remote/CustomerTest.java b/hsarback/src/test/java/de/hsadmin/remote/CustomerTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/CustomerTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/CustomerTest.java
diff --git a/hsarback/test/de/hsadmin/remote/DatabaseCleanTest.java b/hsarback/src/test/java/de/hsadmin/remote/DatabaseCleanTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/DatabaseCleanTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/DatabaseCleanTest.java
diff --git a/hsarback/test/de/hsadmin/remote/DomainDeleteTest.java b/hsarback/src/test/java/de/hsadmin/remote/DomainDeleteTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/DomainDeleteTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/DomainDeleteTest.java
diff --git a/hsarback/test/de/hsadmin/remote/DomainOptionTester.java b/hsarback/src/test/java/de/hsadmin/remote/DomainOptionTester.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/DomainOptionTester.java
rename to hsarback/src/test/java/de/hsadmin/remote/DomainOptionTester.java
diff --git a/hsarback/test/de/hsadmin/remote/DomainTest.java b/hsarback/src/test/java/de/hsadmin/remote/DomainTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/DomainTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/DomainTest.java
diff --git a/hsarback/test/de/hsadmin/remote/EMailAddressTest.java b/hsarback/src/test/java/de/hsadmin/remote/EMailAddressTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/EMailAddressTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/EMailAddressTest.java
diff --git a/hsarback/test/de/hsadmin/remote/EMailAliasTest.java b/hsarback/src/test/java/de/hsadmin/remote/EMailAliasTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/EMailAliasTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/EMailAliasTest.java
diff --git a/hsarback/test/de/hsadmin/remote/InitDataTest.java b/hsarback/src/test/java/de/hsadmin/remote/InitDataTest.java
similarity index 99%
rename from hsarback/test/de/hsadmin/remote/InitDataTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/InitDataTest.java
index 05571f6..155a470 100644
--- a/hsarback/test/de/hsadmin/remote/InitDataTest.java
+++ b/hsarback/src/test/java/de/hsadmin/remote/InitDataTest.java
@@ -39,7 +39,7 @@ public class InitDataTest {
@Test
public void initData() {
- testAdd1Member();
+// testAdd1Member();
testAdd2Pac();
testAdd3User();
testAdd4Domain();
diff --git a/hsarback/test/de/hsadmin/remote/LongCustomerNameTest.java b/hsarback/src/test/java/de/hsadmin/remote/LongCustomerNameTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/LongCustomerNameTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/LongCustomerNameTest.java
diff --git a/hsarback/test/de/hsadmin/remote/MysqlDbTest.java b/hsarback/src/test/java/de/hsadmin/remote/MysqlDbTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/MysqlDbTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/MysqlDbTest.java
diff --git a/hsarback/test/de/hsadmin/remote/MysqlUserTest.java b/hsarback/src/test/java/de/hsadmin/remote/MysqlUserTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/MysqlUserTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/MysqlUserTest.java
diff --git a/hsarback/test/de/hsadmin/remote/PacTest.java b/hsarback/src/test/java/de/hsadmin/remote/PacTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/PacTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/PacTest.java
diff --git a/hsarback/test/de/hsadmin/remote/PgsqlDbTest.java b/hsarback/src/test/java/de/hsadmin/remote/PgsqlDbTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/PgsqlDbTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/PgsqlDbTest.java
diff --git a/hsarback/test/de/hsadmin/remote/PgsqlUserTest.java b/hsarback/src/test/java/de/hsadmin/remote/PgsqlUserTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/PgsqlUserTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/PgsqlUserTest.java
diff --git a/hsarback/test/de/hsadmin/remote/QueueTaskTest.java b/hsarback/src/test/java/de/hsadmin/remote/QueueTaskTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/QueueTaskTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/QueueTaskTest.java
diff --git a/hsarback/test/de/hsadmin/remote/RemoteCASHelper.java b/hsarback/src/test/java/de/hsadmin/remote/RemoteCASHelper.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/RemoteCASHelper.java
rename to hsarback/src/test/java/de/hsadmin/remote/RemoteCASHelper.java
diff --git a/hsarback/test/de/hsadmin/remote/RemoteTest.java b/hsarback/src/test/java/de/hsadmin/remote/RemoteTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/RemoteTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/RemoteTest.java
diff --git a/hsarback/test/de/hsadmin/remote/RemoteTestHelper.java b/hsarback/src/test/java/de/hsadmin/remote/RemoteTestHelper.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/RemoteTestHelper.java
rename to hsarback/src/test/java/de/hsadmin/remote/RemoteTestHelper.java
diff --git a/hsarback/test/de/hsadmin/remote/RoleTest.java b/hsarback/src/test/java/de/hsadmin/remote/RoleTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/RoleTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/RoleTest.java
diff --git a/hsarback/test/de/hsadmin/remote/SSLCertDomainTest.java b/hsarback/src/test/java/de/hsadmin/remote/SSLCertDomainTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/SSLCertDomainTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/SSLCertDomainTest.java
diff --git a/hsarback/test/de/hsadmin/remote/UnixUserTest.java b/hsarback/src/test/java/de/hsadmin/remote/UnixUserTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/remote/UnixUserTest.java
rename to hsarback/src/test/java/de/hsadmin/remote/UnixUserTest.java
diff --git a/hsarback/test/de/hsadmin/validate/EMailAliasValidationTest.java b/hsarback/src/test/java/de/hsadmin/validate/EMailAliasValidationTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/validate/EMailAliasValidationTest.java
rename to hsarback/src/test/java/de/hsadmin/validate/EMailAliasValidationTest.java
diff --git a/hsarback/test/de/hsadmin/validate/PacNameTest.java b/hsarback/src/test/java/de/hsadmin/validate/PacNameTest.java
similarity index 100%
rename from hsarback/test/de/hsadmin/validate/PacNameTest.java
rename to hsarback/src/test/java/de/hsadmin/validate/PacNameTest.java
diff --git a/hsarback/test/META-INF/persistence.xml b/hsarback/src/test/resources/META-INF/persistence.xml
similarity index 98%
rename from hsarback/test/META-INF/persistence.xml
rename to hsarback/src/test/resources/META-INF/persistence.xml
index 25c8084..259e101 100644
--- a/hsarback/test/META-INF/persistence.xml
+++ b/hsarback/src/test/resources/META-INF/persistence.xml
@@ -32,7 +32,7 @@
MaxWait=10000,
TestOnBorrow=true,
Username=hsh03_hsatest,
- Password=Eeng7ietee"/>
+ Password=t0psecr3t"/>