From 2e279c25c8445ef14a4e75751092ab770b748780 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Wed, 1 Mar 2017 13:58:11 +0100 Subject: [PATCH] clean old submodules --- {services => cust-services}/doc/networking.md | 0 {services => cust-services}/doc/package.md | 0 .../de/hsadmin/module/util/QueryBuilder.java | 2 +- pom.xml | 4 +- services/pom.xml | 75 ------------------- xmlrpc/.gitignore | 14 ---- xmlrpc/pom.xml | 68 ----------------- .../main/resources/META-INF/persistence.xml | 30 -------- .../xmlrpc/webserver/XmlRpcServlet.properties | 6 -- 9 files changed, 2 insertions(+), 197 deletions(-) rename {services => cust-services}/doc/networking.md (100%) rename {services => cust-services}/doc/package.md (100%) delete mode 100644 services/pom.xml delete mode 100644 xmlrpc/.gitignore delete mode 100644 xmlrpc/pom.xml delete mode 100644 xmlrpc/src/main/resources/META-INF/persistence.xml delete mode 100644 xmlrpc/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties diff --git a/services/doc/networking.md b/cust-services/doc/networking.md similarity index 100% rename from services/doc/networking.md rename to cust-services/doc/networking.md diff --git a/services/doc/package.md b/cust-services/doc/package.md similarity index 100% rename from services/doc/package.md rename to cust-services/doc/package.md diff --git a/framework/src/main/java/de/hsadmin/module/util/QueryBuilder.java b/framework/src/main/java/de/hsadmin/module/util/QueryBuilder.java index c4a1606..ab52d63 100644 --- a/framework/src/main/java/de/hsadmin/module/util/QueryBuilder.java +++ b/framework/src/main/java/de/hsadmin/module/util/QueryBuilder.java @@ -42,7 +42,7 @@ public class QueryBuilder { final List predicates = new ArrayList<>(); for (Property p : criteria.properties()) { if (!p.valueIsNullOrEmpty()) { - Mapping mappingAnnotation = (Mapping) ReflectionUtil.getAnnotation(criteria.getClass(), p.getName(), Mapping.class); + final Mapping mappingAnnotation = (Mapping) ReflectionUtil.getAnnotation(criteria.getClass(), p.getName(), Mapping.class); final String mapping = mappingAnnotation != null ? mappingAnnotation.boMappingPath() : p.getName(); int pos = 0; Join join = null; diff --git a/pom.xml b/pom.xml index b91391e..87462df 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,11 @@ HSAdmin Parent Project + db-migration framework - services - xmlrpc cust-services web cli - db-migration diff --git a/services/pom.xml b/services/pom.xml deleted file mode 100644 index f0606c6..0000000 --- a/services/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - 4.0.0 - - de.hsadmin - hsadmin-parent - 1.0-SNAPSHOT - - services - jar - - HSAdmin Services - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - - - - - 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.activemq - activemq-client - 5.14.1 - - - org.apache.activemq - activemq-openwire-legacy - 5.14.1 - - - org.apache.xmlrpc - xmlrpc-server - 3.1.3 - - - log4j - log4j - 1.2.17 - - - diff --git a/xmlrpc/.gitignore b/xmlrpc/.gitignore deleted file mode 100644 index 4712857..0000000 --- a/xmlrpc/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -*.class - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -/target -/.settings -/.classpath -/.project -/.distribution diff --git a/xmlrpc/pom.xml b/xmlrpc/pom.xml deleted file mode 100644 index 11048a0..0000000 --- a/xmlrpc/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - 4.0.0 - - de.hsadmin - hsadmin-parent - 1.0-SNAPSHOT - - - xmlrpc-webapp - war - HSAdmin XML-RPC Webapp - - - de.hsadmin - framework - 1.0-SNAPSHOT - - - de.hsadmin - persistence - 1.0-SNAPSHOT - - - de.hsadmin - services - 1.0-SNAPSHOT - - - org.apache.xmlrpc - xmlrpc-server - 3.1.3 - - - javax.servlet - servlet-api - - - - - - xmlrpc-webapp - - - org.apache.openejb.maven - tomee-maven-plugin - 1.7.1 - - 1.7.1 - webprofile - false - 8000 - ${project.basedir}/src/test/tomee/conf - - org.postgresql:postgresql:9.4.1209.jre7 - - - ${project.basedir}/conf/client.ks - password - ${project.basedir}/conf/client.ts - password - - - - - - diff --git a/xmlrpc/src/main/resources/META-INF/persistence.xml b/xmlrpc/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 3b7dc51..0000000 --- a/xmlrpc/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - HsarDataSource - de.hsadmin.bo.customer.Contact - de.hsadmin.bo.customer.Customer - de.hsadmin.bo.customer.SEPADirectDebit - de.hsadmin.bo.database.Database - de.hsadmin.bo.database.DatabaseUser - de.hsadmin.bo.database.MySqlDatabase - de.hsadmin.bo.database.MySqlUser - de.hsadmin.bo.database.PgSqlDatabase - de.hsadmin.bo.database.PgSqlUser - de.hsadmin.bo.domain.Domain - de.hsadmin.bo.domain.DomainOption - de.hsadmin.bo.domain.EMailAddress - de.hsadmin.bo.pac.BaseComponent - de.hsadmin.bo.pac.BasePac - de.hsadmin.bo.pac.Component - de.hsadmin.bo.pac.EMailAlias - de.hsadmin.bo.pac.Hive - de.hsadmin.bo.pac.INetAddress - de.hsadmin.bo.pac.Pac - de.hsadmin.bo.pac.PacComponent - de.hsadmin.bo.pac.UnixUser - - \ No newline at end of file diff --git a/xmlrpc/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties b/xmlrpc/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties deleted file mode 100644 index f5864b8..0000000 --- a/xmlrpc/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties +++ /dev/null @@ -1,6 +0,0 @@ -customer=de.hsadmin.service.customer.CustomerRemote -contact=de.hsadmin.service.customer.ContactRemote -mandat=de.hsadmin.service.customer.SEPADirectDebitRemote -hive=de.hsadmin.service.pac.HiveRemote -pac=de.hsadmin.service.pac.PacRemote -property=de.hsadmin.service.property.PropertyRemote \ No newline at end of file