From 9039f2025de8ef7f06dfd4d1f6c0d757043d41d3 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 7 Feb 2017 19:59:10 +0100 Subject: [PATCH] cust-service db-migration --- cust-services/.classpath | 26 + cust-services/.gitignore | 1 + cust-services/.project | 23 + .../.settings/org.eclipse.jdt.core.prefs | 5 + .../.settings/org.eclipse.m2e.core.prefs | 4 + cust-services/pom.xml | 70 ++ .../java/de/hsadmin/bo/customer/Contact.java | 0 .../java/de/hsadmin/bo/customer/Customer.java | 0 .../de/hsadmin/bo/customer/IndicatorVAT.java | 0 .../hsadmin/bo/customer/SEPADirectDebit.java | 0 .../java/de/hsadmin/bo/database/Database.java | 0 .../de/hsadmin/bo/database/DatabaseUser.java | 0 .../de/hsadmin/bo/database/MySqlDatabase.java | 0 .../de/hsadmin/bo/database/MySqlUser.java | 0 .../de/hsadmin/bo/database/PgSqlDatabase.java | 0 .../de/hsadmin/bo/database/PgSqlUser.java | 0 .../java/de/hsadmin/bo/domain/Domain.java | 0 .../de/hsadmin/bo/domain/DomainOption.java | 0 .../de/hsadmin/bo/domain/EMailAddress.java | 0 .../java/de/hsadmin/bo/pac/BaseComponent.java | 0 .../main/java/de/hsadmin/bo/pac/BasePac.java | 0 .../java/de/hsadmin/bo/pac/Component.java | 0 .../java/de/hsadmin/bo/pac/EMailAlias.java | 0 .../src/main/java/de/hsadmin/bo/pac/Hive.java | 0 .../java/de/hsadmin/bo/pac/INetAddress.java | 0 .../src/main/java/de/hsadmin/bo/pac/Pac.java | 0 .../java/de/hsadmin/bo/pac/PacComponent.java | 0 .../de/hsadmin/bo/pac/PacEntityListener.java | 56 +- .../main/java/de/hsadmin/bo/pac/UnixUser.java | 0 .../service/customer/ContactRemote.java | 0 .../service/customer/ContactService.java | 0 .../service/customer/ContactServiceLocal.java | 0 .../hsadmin/service/customer/ContactVO.java | 0 .../service/customer/CustomerRemote.java | 0 .../service/customer/CustomerService.java | 0 .../customer/CustomerServiceLocal.java | 0 .../hsadmin/service/customer/CustomerVO.java | 0 .../customer/SEPADirectDebitRemote.java | 0 .../customer/SEPADirectDebitService.java | 0 .../customer/SEPADirectDebitServiceLocal.java | 0 .../service/customer/SEPADirectDebitVO.java | 0 .../de/hsadmin/service/pac/HiveRemote.java | 0 .../de/hsadmin/service/pac/HiveService.java | 0 .../hsadmin/service/pac/HiveServiceLocal.java | 0 .../java/de/hsadmin/service/pac/HiveVO.java | 0 .../de/hsadmin/service/pac/INetAddressVO.java | 0 .../hsadmin/service/pac/PacComponentVO.java | 0 .../de/hsadmin/service/pac/PacRemote.java | 0 .../de/hsadmin/service/pac/PacService.java | 0 .../hsadmin/service/pac/PacServiceLocal.java | 0 .../java/de/hsadmin/service/pac/PacVO.java | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../test/java/de/hsadmin/test/pac/PacIT.java | 34 + .../src/test/tomee/conf/hsadmin.properties | 0 .../src/test/tomee/conf/tomee.xml | 0 db-migration/.classpath | 36 + db-migration/.gitignore | 1 + db-migration/.project | 23 + .../.settings/org.eclipse.jdt.core.prefs | 5 + .../.settings/org.eclipse.m2e.core.prefs | 4 + db-migration/pom.xml | 45 ++ .../main/java/de/hsadmin/migration/Watch.java | 22 + .../main/resources/liquibase/db.changelog.xml | 727 ++++++++++++++++++ .../resources/liquibase/liquibase.properties | 7 + db-migration/src/main/webapp/WEB-INF/web.xml | 31 + db-migration/src/test/tomee/conf/tomee.xml | 9 + pom.xml | 2 + 67 files changed, 1103 insertions(+), 28 deletions(-) create mode 100644 cust-services/.classpath create mode 100644 cust-services/.gitignore create mode 100644 cust-services/.project create mode 100644 cust-services/.settings/org.eclipse.jdt.core.prefs create mode 100644 cust-services/.settings/org.eclipse.m2e.core.prefs create mode 100644 cust-services/pom.xml rename {services => cust-services}/src/main/java/de/hsadmin/bo/customer/Contact.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/customer/Customer.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/customer/IndicatorVAT.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/customer/SEPADirectDebit.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/database/Database.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/database/DatabaseUser.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/database/MySqlDatabase.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/database/MySqlUser.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/database/PgSqlDatabase.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/database/PgSqlUser.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/domain/Domain.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/domain/DomainOption.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/domain/EMailAddress.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/BaseComponent.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/BasePac.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/Component.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/EMailAlias.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/Hive.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/INetAddress.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/Pac.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/PacComponent.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java (70%) rename {services => cust-services}/src/main/java/de/hsadmin/bo/pac/UnixUser.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/ContactRemote.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/ContactService.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/ContactServiceLocal.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/ContactVO.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/CustomerRemote.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/CustomerService.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/CustomerServiceLocal.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/CustomerVO.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/SEPADirectDebitRemote.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/SEPADirectDebitService.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/SEPADirectDebitServiceLocal.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/customer/SEPADirectDebitVO.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/HiveRemote.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/HiveService.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/HiveServiceLocal.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/HiveVO.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/INetAddressVO.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/PacComponentVO.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/PacRemote.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/PacService.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/PacServiceLocal.java (100%) rename {services => cust-services}/src/main/java/de/hsadmin/service/pac/PacVO.java (100%) rename {xmlrpc => cust-services}/src/main/webapp/WEB-INF/web.xml (100%) create mode 100644 cust-services/src/test/java/de/hsadmin/test/pac/PacIT.java rename {xmlrpc => cust-services}/src/test/tomee/conf/hsadmin.properties (100%) rename {xmlrpc => cust-services}/src/test/tomee/conf/tomee.xml (100%) create mode 100644 db-migration/.classpath create mode 100644 db-migration/.gitignore create mode 100644 db-migration/.project create mode 100644 db-migration/.settings/org.eclipse.jdt.core.prefs create mode 100644 db-migration/.settings/org.eclipse.m2e.core.prefs create mode 100644 db-migration/pom.xml create mode 100644 db-migration/src/main/java/de/hsadmin/migration/Watch.java create mode 100644 db-migration/src/main/resources/liquibase/db.changelog.xml create mode 100644 db-migration/src/main/resources/liquibase/liquibase.properties create mode 100644 db-migration/src/main/webapp/WEB-INF/web.xml create mode 100644 db-migration/src/test/tomee/conf/tomee.xml diff --git a/cust-services/.classpath b/cust-services/.classpath new file mode 100644 index 0000000..f619a53 --- /dev/null +++ b/cust-services/.classpath @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cust-services/.gitignore b/cust-services/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/cust-services/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/cust-services/.project b/cust-services/.project new file mode 100644 index 0000000..8d5af43 --- /dev/null +++ b/cust-services/.project @@ -0,0 +1,23 @@ + + + cust-webapp + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/cust-services/.settings/org.eclipse.jdt.core.prefs b/cust-services/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..ec4300d --- /dev/null +++ b/cust-services/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/cust-services/.settings/org.eclipse.m2e.core.prefs b/cust-services/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/cust-services/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/cust-services/pom.xml b/cust-services/pom.xml new file mode 100644 index 0000000..91bce4f --- /dev/null +++ b/cust-services/pom.xml @@ -0,0 +1,70 @@ + + 4.0.0 + + de.hsadmin + hsadmin-parent + 1.0-SNAPSHOT + + + cust-webapp + war + HSAdmin XML-RPC Customers Webapp + + + de.hsadmin + framework + 1.0-SNAPSHOT + + + org.apache.geronimo.specs + geronimo-jpa_2.0_spec + 1.1 + provided + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + 1.0.1 + provided + + + org.apache.geronimo.specs + geronimo-validation_1.0_spec + 1.1 + provided + + + org.apache.xmlrpc + xmlrpc-server + 3.1.3 + + + javax.servlet + servlet-api + + + + + + xmlrpc-webapp + + + org.apache.openejb.maven + tomee-maven-plugin + 1.7.4 + + 1.7.4 + webprofile + false + 8000 + ${project.basedir}/src/test/tomee/conf + + org.postgresql:postgresql:9.4.1212.jre7 + + + + + + diff --git a/services/src/main/java/de/hsadmin/bo/customer/Contact.java b/cust-services/src/main/java/de/hsadmin/bo/customer/Contact.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/customer/Contact.java rename to cust-services/src/main/java/de/hsadmin/bo/customer/Contact.java diff --git a/services/src/main/java/de/hsadmin/bo/customer/Customer.java b/cust-services/src/main/java/de/hsadmin/bo/customer/Customer.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/customer/Customer.java rename to cust-services/src/main/java/de/hsadmin/bo/customer/Customer.java diff --git a/services/src/main/java/de/hsadmin/bo/customer/IndicatorVAT.java b/cust-services/src/main/java/de/hsadmin/bo/customer/IndicatorVAT.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/customer/IndicatorVAT.java rename to cust-services/src/main/java/de/hsadmin/bo/customer/IndicatorVAT.java diff --git a/services/src/main/java/de/hsadmin/bo/customer/SEPADirectDebit.java b/cust-services/src/main/java/de/hsadmin/bo/customer/SEPADirectDebit.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/customer/SEPADirectDebit.java rename to cust-services/src/main/java/de/hsadmin/bo/customer/SEPADirectDebit.java diff --git a/services/src/main/java/de/hsadmin/bo/database/Database.java b/cust-services/src/main/java/de/hsadmin/bo/database/Database.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/database/Database.java rename to cust-services/src/main/java/de/hsadmin/bo/database/Database.java diff --git a/services/src/main/java/de/hsadmin/bo/database/DatabaseUser.java b/cust-services/src/main/java/de/hsadmin/bo/database/DatabaseUser.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/database/DatabaseUser.java rename to cust-services/src/main/java/de/hsadmin/bo/database/DatabaseUser.java diff --git a/services/src/main/java/de/hsadmin/bo/database/MySqlDatabase.java b/cust-services/src/main/java/de/hsadmin/bo/database/MySqlDatabase.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/database/MySqlDatabase.java rename to cust-services/src/main/java/de/hsadmin/bo/database/MySqlDatabase.java diff --git a/services/src/main/java/de/hsadmin/bo/database/MySqlUser.java b/cust-services/src/main/java/de/hsadmin/bo/database/MySqlUser.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/database/MySqlUser.java rename to cust-services/src/main/java/de/hsadmin/bo/database/MySqlUser.java diff --git a/services/src/main/java/de/hsadmin/bo/database/PgSqlDatabase.java b/cust-services/src/main/java/de/hsadmin/bo/database/PgSqlDatabase.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/database/PgSqlDatabase.java rename to cust-services/src/main/java/de/hsadmin/bo/database/PgSqlDatabase.java diff --git a/services/src/main/java/de/hsadmin/bo/database/PgSqlUser.java b/cust-services/src/main/java/de/hsadmin/bo/database/PgSqlUser.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/database/PgSqlUser.java rename to cust-services/src/main/java/de/hsadmin/bo/database/PgSqlUser.java diff --git a/services/src/main/java/de/hsadmin/bo/domain/Domain.java b/cust-services/src/main/java/de/hsadmin/bo/domain/Domain.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/domain/Domain.java rename to cust-services/src/main/java/de/hsadmin/bo/domain/Domain.java diff --git a/services/src/main/java/de/hsadmin/bo/domain/DomainOption.java b/cust-services/src/main/java/de/hsadmin/bo/domain/DomainOption.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/domain/DomainOption.java rename to cust-services/src/main/java/de/hsadmin/bo/domain/DomainOption.java diff --git a/services/src/main/java/de/hsadmin/bo/domain/EMailAddress.java b/cust-services/src/main/java/de/hsadmin/bo/domain/EMailAddress.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/domain/EMailAddress.java rename to cust-services/src/main/java/de/hsadmin/bo/domain/EMailAddress.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/BaseComponent.java b/cust-services/src/main/java/de/hsadmin/bo/pac/BaseComponent.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/BaseComponent.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/BaseComponent.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/BasePac.java b/cust-services/src/main/java/de/hsadmin/bo/pac/BasePac.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/BasePac.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/BasePac.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/Component.java b/cust-services/src/main/java/de/hsadmin/bo/pac/Component.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/Component.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/Component.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/EMailAlias.java b/cust-services/src/main/java/de/hsadmin/bo/pac/EMailAlias.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/EMailAlias.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/EMailAlias.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/Hive.java b/cust-services/src/main/java/de/hsadmin/bo/pac/Hive.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/Hive.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/Hive.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/INetAddress.java b/cust-services/src/main/java/de/hsadmin/bo/pac/INetAddress.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/INetAddress.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/INetAddress.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/Pac.java b/cust-services/src/main/java/de/hsadmin/bo/pac/Pac.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/Pac.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/Pac.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/PacComponent.java b/cust-services/src/main/java/de/hsadmin/bo/pac/PacComponent.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/PacComponent.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/PacComponent.java diff --git a/services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java b/cust-services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java similarity index 70% rename from services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java index 749f8d1..2201453 100644 --- a/services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java +++ b/cust-services/src/main/java/de/hsadmin/bo/pac/PacEntityListener.java @@ -2,19 +2,19 @@ package de.hsadmin.bo.pac; import java.util.Date; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TextMessage; +//import javax.jms.JMSException; +//import javax.jms.Queue; +//import javax.jms.QueueConnection; +//import javax.jms.QueueSender; +//import javax.jms.QueueSession; +//import javax.jms.Session; +//import javax.jms.TextMessage; import javax.persistence.PostLoad; import javax.persistence.PostPersist; import javax.persistence.PostUpdate; import javax.persistence.PreRemove; -import org.apache.activemq.ActiveMQConnectionFactory; +//import org.apache.activemq.ActiveMQConnectionFactory; public class PacEntityListener { @@ -101,26 +101,26 @@ public class PacEntityListener { public void sendNotification(final String module, final String opCode, final String name) { - final ActiveMQConnectionFactory connFactory = new ActiveMQConnectionFactory("ssl://hsh03.hostsharing.net:61617"); - QueueConnection connection = null; - try { - connection = connFactory.createQueueConnection("user-pactasks", "Ohf4oh"); - connection.start(); - final QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - final Queue queue = session.createQueue("queue.hsadminSystem-pactasks"); - final String string = module + "." + opCode + ":" + name + ":" + new Date(); - System.out.println(string); - final TextMessage message = session.createTextMessage(string); - final QueueSender sender = session.createSender(queue); - sender.send(message); - sender.close(); - session.close(); - } catch (JMSException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } finally { - if (connection != null) { try { connection.close(); } catch(JMSException e) { } } - } +// final ActiveMQConnectionFactory connFactory = new ActiveMQConnectionFactory("ssl://hsh03.hostsharing.net:61617"); +// QueueConnection connection = null; +// try { +// connection = connFactory.createQueueConnection("user-pactasks", "Ohf4oh"); +// connection.start(); +// final QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); +// final Queue queue = session.createQueue("queue.hsadminSystem-pactasks"); +// final String string = module + "." + opCode + ":" + name + ":" + new Date(); +// System.out.println(string); +// final TextMessage message = session.createTextMessage(string); +// final QueueSender sender = session.createSender(queue); +// sender.send(message); +// sender.close(); +// session.close(); +// } catch (JMSException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } finally { +// if (connection != null) { try { connection.close(); } catch(JMSException e) { } } +// } } public static void main(String[] args) { diff --git a/services/src/main/java/de/hsadmin/bo/pac/UnixUser.java b/cust-services/src/main/java/de/hsadmin/bo/pac/UnixUser.java similarity index 100% rename from services/src/main/java/de/hsadmin/bo/pac/UnixUser.java rename to cust-services/src/main/java/de/hsadmin/bo/pac/UnixUser.java diff --git a/services/src/main/java/de/hsadmin/service/customer/ContactRemote.java b/cust-services/src/main/java/de/hsadmin/service/customer/ContactRemote.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/ContactRemote.java rename to cust-services/src/main/java/de/hsadmin/service/customer/ContactRemote.java diff --git a/services/src/main/java/de/hsadmin/service/customer/ContactService.java b/cust-services/src/main/java/de/hsadmin/service/customer/ContactService.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/ContactService.java rename to cust-services/src/main/java/de/hsadmin/service/customer/ContactService.java diff --git a/services/src/main/java/de/hsadmin/service/customer/ContactServiceLocal.java b/cust-services/src/main/java/de/hsadmin/service/customer/ContactServiceLocal.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/ContactServiceLocal.java rename to cust-services/src/main/java/de/hsadmin/service/customer/ContactServiceLocal.java diff --git a/services/src/main/java/de/hsadmin/service/customer/ContactVO.java b/cust-services/src/main/java/de/hsadmin/service/customer/ContactVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/ContactVO.java rename to cust-services/src/main/java/de/hsadmin/service/customer/ContactVO.java diff --git a/services/src/main/java/de/hsadmin/service/customer/CustomerRemote.java b/cust-services/src/main/java/de/hsadmin/service/customer/CustomerRemote.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/CustomerRemote.java rename to cust-services/src/main/java/de/hsadmin/service/customer/CustomerRemote.java diff --git a/services/src/main/java/de/hsadmin/service/customer/CustomerService.java b/cust-services/src/main/java/de/hsadmin/service/customer/CustomerService.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/CustomerService.java rename to cust-services/src/main/java/de/hsadmin/service/customer/CustomerService.java diff --git a/services/src/main/java/de/hsadmin/service/customer/CustomerServiceLocal.java b/cust-services/src/main/java/de/hsadmin/service/customer/CustomerServiceLocal.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/CustomerServiceLocal.java rename to cust-services/src/main/java/de/hsadmin/service/customer/CustomerServiceLocal.java diff --git a/services/src/main/java/de/hsadmin/service/customer/CustomerVO.java b/cust-services/src/main/java/de/hsadmin/service/customer/CustomerVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/CustomerVO.java rename to cust-services/src/main/java/de/hsadmin/service/customer/CustomerVO.java diff --git a/services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitRemote.java b/cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitRemote.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitRemote.java rename to cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitRemote.java diff --git a/services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitService.java b/cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitService.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitService.java rename to cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitService.java diff --git a/services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitServiceLocal.java b/cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitServiceLocal.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitServiceLocal.java rename to cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitServiceLocal.java diff --git a/services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitVO.java b/cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitVO.java rename to cust-services/src/main/java/de/hsadmin/service/customer/SEPADirectDebitVO.java diff --git a/services/src/main/java/de/hsadmin/service/pac/HiveRemote.java b/cust-services/src/main/java/de/hsadmin/service/pac/HiveRemote.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/HiveRemote.java rename to cust-services/src/main/java/de/hsadmin/service/pac/HiveRemote.java diff --git a/services/src/main/java/de/hsadmin/service/pac/HiveService.java b/cust-services/src/main/java/de/hsadmin/service/pac/HiveService.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/HiveService.java rename to cust-services/src/main/java/de/hsadmin/service/pac/HiveService.java diff --git a/services/src/main/java/de/hsadmin/service/pac/HiveServiceLocal.java b/cust-services/src/main/java/de/hsadmin/service/pac/HiveServiceLocal.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/HiveServiceLocal.java rename to cust-services/src/main/java/de/hsadmin/service/pac/HiveServiceLocal.java diff --git a/services/src/main/java/de/hsadmin/service/pac/HiveVO.java b/cust-services/src/main/java/de/hsadmin/service/pac/HiveVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/HiveVO.java rename to cust-services/src/main/java/de/hsadmin/service/pac/HiveVO.java diff --git a/services/src/main/java/de/hsadmin/service/pac/INetAddressVO.java b/cust-services/src/main/java/de/hsadmin/service/pac/INetAddressVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/INetAddressVO.java rename to cust-services/src/main/java/de/hsadmin/service/pac/INetAddressVO.java diff --git a/services/src/main/java/de/hsadmin/service/pac/PacComponentVO.java b/cust-services/src/main/java/de/hsadmin/service/pac/PacComponentVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/PacComponentVO.java rename to cust-services/src/main/java/de/hsadmin/service/pac/PacComponentVO.java diff --git a/services/src/main/java/de/hsadmin/service/pac/PacRemote.java b/cust-services/src/main/java/de/hsadmin/service/pac/PacRemote.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/PacRemote.java rename to cust-services/src/main/java/de/hsadmin/service/pac/PacRemote.java diff --git a/services/src/main/java/de/hsadmin/service/pac/PacService.java b/cust-services/src/main/java/de/hsadmin/service/pac/PacService.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/PacService.java rename to cust-services/src/main/java/de/hsadmin/service/pac/PacService.java diff --git a/services/src/main/java/de/hsadmin/service/pac/PacServiceLocal.java b/cust-services/src/main/java/de/hsadmin/service/pac/PacServiceLocal.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/PacServiceLocal.java rename to cust-services/src/main/java/de/hsadmin/service/pac/PacServiceLocal.java diff --git a/services/src/main/java/de/hsadmin/service/pac/PacVO.java b/cust-services/src/main/java/de/hsadmin/service/pac/PacVO.java similarity index 100% rename from services/src/main/java/de/hsadmin/service/pac/PacVO.java rename to cust-services/src/main/java/de/hsadmin/service/pac/PacVO.java diff --git a/xmlrpc/src/main/webapp/WEB-INF/web.xml b/cust-services/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from xmlrpc/src/main/webapp/WEB-INF/web.xml rename to cust-services/src/main/webapp/WEB-INF/web.xml diff --git a/cust-services/src/test/java/de/hsadmin/test/pac/PacIT.java b/cust-services/src/test/java/de/hsadmin/test/pac/PacIT.java new file mode 100644 index 0000000..b187b98 --- /dev/null +++ b/cust-services/src/test/java/de/hsadmin/test/pac/PacIT.java @@ -0,0 +1,34 @@ +package de.hsadmin.test.pac; + +import static org.junit.Assert.fail; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class PacIT { + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void test() { + fail("Not yet implemented"); + } + +} diff --git a/xmlrpc/src/test/tomee/conf/hsadmin.properties b/cust-services/src/test/tomee/conf/hsadmin.properties similarity index 100% rename from xmlrpc/src/test/tomee/conf/hsadmin.properties rename to cust-services/src/test/tomee/conf/hsadmin.properties diff --git a/xmlrpc/src/test/tomee/conf/tomee.xml b/cust-services/src/test/tomee/conf/tomee.xml similarity index 100% rename from xmlrpc/src/test/tomee/conf/tomee.xml rename to cust-services/src/test/tomee/conf/tomee.xml diff --git a/db-migration/.classpath b/db-migration/.classpath new file mode 100644 index 0000000..e43402f --- /dev/null +++ b/db-migration/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/db-migration/.gitignore b/db-migration/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/db-migration/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/db-migration/.project b/db-migration/.project new file mode 100644 index 0000000..7ae503b --- /dev/null +++ b/db-migration/.project @@ -0,0 +1,23 @@ + + + db-migration + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/db-migration/.settings/org.eclipse.jdt.core.prefs b/db-migration/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..ec4300d --- /dev/null +++ b/db-migration/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/db-migration/.settings/org.eclipse.m2e.core.prefs b/db-migration/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/db-migration/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/db-migration/pom.xml b/db-migration/pom.xml new file mode 100644 index 0000000..2249b55 --- /dev/null +++ b/db-migration/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + de.hsadmin + hsadmin-parent + 1.0-SNAPSHOT + + db-migration + war + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + org.liquibase + liquibase-core + 3.5.3 + runtime + + + + db-migration + + + org.apache.openejb.maven + tomee-maven-plugin + 1.7.4 + + 1.7.4 + webprofile + false + 8000 + ${project.basedir}/src/test/tomee/conf + + org.postgresql:postgresql:9.4.1212.jre7 + + + + + + \ No newline at end of file diff --git a/db-migration/src/main/java/de/hsadmin/migration/Watch.java b/db-migration/src/main/java/de/hsadmin/migration/Watch.java new file mode 100644 index 0000000..df76e3b --- /dev/null +++ b/db-migration/src/main/java/de/hsadmin/migration/Watch.java @@ -0,0 +1,22 @@ +package de.hsadmin.migration; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@WebServlet(urlPatterns={"/", "/*"}) +public class Watch extends HttpServlet { + + private static final long serialVersionUID = 1L; + + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException + { + resp.setContentType("text/plain"); + resp.getWriter().println("servlet loaded"); + } +} diff --git a/db-migration/src/main/resources/liquibase/db.changelog.xml b/db-migration/src/main/resources/liquibase/db.changelog.xml new file mode 100644 index 0000000..43391c9 --- /dev/null +++ b/db-migration/src/main/resources/liquibase/db.changelog.xml @@ -0,0 +1,727 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/db-migration/src/main/resources/liquibase/liquibase.properties b/db-migration/src/main/resources/liquibase/liquibase.properties new file mode 100644 index 0000000..e507247 --- /dev/null +++ b/db-migration/src/main/resources/liquibase/liquibase.properties @@ -0,0 +1,7 @@ +changeLogFile=target/classes/liquibase/db.changelog.xml +driver=org.postgresql.Driver +url=jdbc:postgresql://localhost:5432/hsadmin_migdb +username=hsadmin_dbuser +password=SelfDefinedPassword +verbose=true +dropFirst=false \ No newline at end of file diff --git a/db-migration/src/main/webapp/WEB-INF/web.xml b/db-migration/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..1b8527d --- /dev/null +++ b/db-migration/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,31 @@ + + + + + + liquibase.changelog + liquibase/db.changelog.xml + + + + liquibase.datasource + java:comp/env/jdbc/hsar-ds + + + + liquibase.onerror.fail + true + + + + liquibase.integration.servlet.LiquibaseServletListener + + + + jdbc/hsar-ds + javax.sql.DataSource + + + \ No newline at end of file diff --git a/db-migration/src/test/tomee/conf/tomee.xml b/db-migration/src/test/tomee/conf/tomee.xml new file mode 100644 index 0000000..ea03d06 --- /dev/null +++ b/db-migration/src/test/tomee/conf/tomee.xml @@ -0,0 +1,9 @@ + + + + JdbcDriver = org.postgresql.Driver + JdbcUrl = jdbc:postgresql://localhost:5432/hsadmin_migdb + UserName = hsadmin_dbuser + Password = SelfDefinedPassword + + diff --git a/pom.xml b/pom.xml index 19392cb..b91391e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,10 @@ framework services xmlrpc + cust-services web cli + db-migration