diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..95297b3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/.idea/ +/libs/ +/target/ + +.project diff --git a/DNPMPlugins/pom.xml b/DNPMPlugins/pom.xml deleted file mode 100644 index 814d865..0000000 --- a/DNPMPlugins/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ - - 4.0.0 - DNPMHelper - DNPMHelper - 0.0.2 - DNPMHelper - - - - - de.itc - onkostar-parent - 2.11.1.1 - system - ${project.basedir}/libs/onkostar-api-2.11.1.1.jar - - - - - ca.uhn.hapi - hapi-base - 2.2 - system - ${project.basedir}/libs/hapi-base-2.2.jar - - - - - ca.uhn.hapi - hapi-structures-v23 - 2.2 - system - ${project.basedir}/libs/hapi-structures-v23-2.2.jar - - - ca.uhn.hapi - hapi-structures-v24 - 2.2 - system - ${project.basedir}/libs/hapi-structures-v24-2.2.jar - - - ca.uhn.hapi - hapi-structures-v25 - 2.2 - system - ${project.basedir}/libs/hapi-structures-v25-2.2.jar - - - ca.uhn.hapi - hapi-structures-v26 - 2.2 - system - ${project.basedir}/libs/hapi-structures-v26-2.2.jar - - - org.springframework - spring-beans - 4.3.8.RELEASE - system - ${project.basedir}/libs/spring-beans-4.3.8.RELEASE.jar - - - - - org.hibernate - hibernate-core - 5.1.8.Final - system - ${project.basedir}/libs/hibernate-core-5.1.8.Final.jar - - - - - com.fasterxml.jackson.core - jackson-databind - 2.10.1 - - - org.springframework.boot - spring-boot-starter-web - 2.2.1.RELEASE - compile - - - org.springframework - spring-tx - 3.2.1.RELEASE - - - org.apache.logging.log4j - log4j-api - 2.14.1 - - - org.apache.logging.log4j - log4j-core - 2.14.1 - - - javax.xml.bind - jaxb-api - 2.3.0 - provided - - - org.springframework - spring-jdbc - 5.3.14 - - - org.apache.commons - commons-csv - 1.2 - provided - - - commons-lang - commons-lang - 2.6 - provided - - - - - - - - - - maven-jar-plugin - 2.4 - - C:\Onkostar-System\Onkostar\files\onkostar\plugins - - - - default-jar - package - - jar - - - - - - maven-compiler-plugin - 3.8.1 - - 11 - 11 - - - - - - - 11 - 11 - 11 - UTF-8 - - 4.3.8.RELEASE - - \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..52945df --- /dev/null +++ b/pom.xml @@ -0,0 +1,88 @@ + + 4.0.0 + DNPMHelper + DNPMHelper + 0.0.2 + DNPMHelper + + + 11 + 11 + 11 + UTF-8 + + 4.3.8.RELEASE + + + + + + de.itc + onkostar-parent + 2.11.1.1 + system + ${project.basedir}/libs/onkostar-api-2.11.1.1.jar + + + + + org.hibernate + hibernate-core + 5.1.8.Final + + + + + com.fasterxml.jackson.core + jackson-databind + 2.10.1 + + + org.springframework.boot + spring-boot-starter-web + 2.2.1.RELEASE + compile + + + org.springframework + spring-tx + 3.2.1.RELEASE + + + org.apache.logging.log4j + log4j-api + 2.14.1 + + + org.apache.logging.log4j + log4j-core + 2.14.1 + + + javax.xml.bind + jaxb-api + 2.3.0 + provided + + + org.springframework + spring-jdbc + 5.3.14 + + + org.apache.commons + commons-csv + 1.2 + provided + + + commons-lang + commons-lang + 2.6 + provided + + + + \ No newline at end of file diff --git a/DNPMPlugins/src/main/java/ATCCodes/AgentCode.java b/src/main/java/ATCCodes/AgentCode.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/AgentCode.java rename to src/main/java/ATCCodes/AgentCode.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/AtcCode.java b/src/main/java/ATCCodes/AtcCode.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/AtcCode.java rename to src/main/java/ATCCodes/AtcCode.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/AtcCodesPlugin.java b/src/main/java/ATCCodes/AtcCodesPlugin.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/AtcCodesPlugin.java rename to src/main/java/ATCCodes/AtcCodesPlugin.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/CodeSystem.java b/src/main/java/ATCCodes/CodeSystem.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/CodeSystem.java rename to src/main/java/ATCCodes/CodeSystem.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/FileParsingException.java b/src/main/java/ATCCodes/FileParsingException.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/FileParsingException.java rename to src/main/java/ATCCodes/FileParsingException.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/UnregisteredCode.java b/src/main/java/ATCCodes/UnregisteredCode.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/UnregisteredCode.java rename to src/main/java/ATCCodes/UnregisteredCode.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/services/AgentCodeService.java b/src/main/java/ATCCodes/services/AgentCodeService.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/services/AgentCodeService.java rename to src/main/java/ATCCodes/services/AgentCodeService.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/services/CsvAtcCodeService.java b/src/main/java/ATCCodes/services/CsvAtcCodeService.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/services/CsvAtcCodeService.java rename to src/main/java/ATCCodes/services/CsvAtcCodeService.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/services/FileBasedAgentCodeService.java b/src/main/java/ATCCodes/services/FileBasedAgentCodeService.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/services/FileBasedAgentCodeService.java rename to src/main/java/ATCCodes/services/FileBasedAgentCodeService.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/services/OnkostarAgentCodeService.java b/src/main/java/ATCCodes/services/OnkostarAgentCodeService.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/services/OnkostarAgentCodeService.java rename to src/main/java/ATCCodes/services/OnkostarAgentCodeService.java diff --git a/DNPMPlugins/src/main/java/ATCCodes/services/WhoAtcCodeService.java b/src/main/java/ATCCodes/services/WhoAtcCodeService.java similarity index 100% rename from DNPMPlugins/src/main/java/ATCCodes/services/WhoAtcCodeService.java rename to src/main/java/ATCCodes/services/WhoAtcCodeService.java diff --git a/DNPMPlugins/src/main/java/DNPM/ConsentManager.java b/src/main/java/DNPM/ConsentManager.java similarity index 100% rename from DNPMPlugins/src/main/java/DNPM/ConsentManager.java rename to src/main/java/DNPM/ConsentManager.java diff --git a/DNPMPlugins/src/main/java/DNPM/DNPMHelper.java b/src/main/java/DNPM/DNPMHelper.java similarity index 100% rename from DNPMPlugins/src/main/java/DNPM/DNPMHelper.java rename to src/main/java/DNPM/DNPMHelper.java diff --git a/DNPMPlugins/src/main/java/DNPM/Merkmalskatalog.java b/src/main/java/DNPM/Merkmalskatalog.java similarity index 100% rename from DNPMPlugins/src/main/java/DNPM/Merkmalskatalog.java rename to src/main/java/DNPM/Merkmalskatalog.java diff --git a/DNPMPlugins/src/main/java/DNPM/VerweisVon.java b/src/main/java/DNPM/VerweisVon.java similarity index 100% rename from DNPMPlugins/src/main/java/DNPM/VerweisVon.java rename to src/main/java/DNPM/VerweisVon.java diff --git a/DNPMPlugins/src/main/java/DNPM/logger.java b/src/main/java/DNPM/logger.java similarity index 100% rename from DNPMPlugins/src/main/java/DNPM/logger.java rename to src/main/java/DNPM/logger.java diff --git a/DNPMPlugins/src/main/resources/app/lib/umr/FormUtils.js b/src/main/resources/app/lib/umr/FormUtils.js similarity index 100% rename from DNPMPlugins/src/main/resources/app/lib/umr/FormUtils.js rename to src/main/resources/app/lib/umr/FormUtils.js diff --git a/DNPMPlugins/src/main/resources/de/itc/onkostar/library/moduleContext.xml b/src/main/resources/de/itc/onkostar/library/moduleContext.xml similarity index 100% rename from DNPMPlugins/src/main/resources/de/itc/onkostar/library/moduleContext.xml rename to src/main/resources/de/itc/onkostar/library/moduleContext.xml diff --git a/DNPMPlugins/src/main/resources/onkostar-config.properties b/src/main/resources/onkostar-config.properties similarity index 100% rename from DNPMPlugins/src/main/resources/onkostar-config.properties rename to src/main/resources/onkostar-config.properties