summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBusfreak2023-03-10 10:54:59 +0100
committerGitHub2023-03-10 10:54:59 +0100
commit68e2312651779220ec68f5bbb2eb9339505ebb3d (patch)
treeaee5e630082ae7a1f81fccdc0ebdaeefc950689c
parent9d66c42460dda63a6380ba0f30004fcd92a4f5c4 (diff)
parent4b121482f1a8323ea23858e8118934be5d9aa54c (diff)
Merge pull request #6 from CCC-MF/issue_5
Issue #5: Vorschlag für den Aufbau des Projekts
Diffstat
-rw-r--r--.gitignore5
-rw-r--r--DNPMPlugins/pom.xml167
-rw-r--r--pom.xml88
-rw-r--r--src/main/java/ATCCodes/AgentCode.java (renamed from DNPMPlugins/src/main/java/ATCCodes/AgentCode.java)0
-rw-r--r--src/main/java/ATCCodes/AtcCode.java (renamed from DNPMPlugins/src/main/java/ATCCodes/AtcCode.java)0
-rw-r--r--src/main/java/ATCCodes/AtcCodesPlugin.java (renamed from DNPMPlugins/src/main/java/ATCCodes/AtcCodesPlugin.java)0
-rw-r--r--src/main/java/ATCCodes/CodeSystem.java (renamed from DNPMPlugins/src/main/java/ATCCodes/CodeSystem.java)0
-rw-r--r--src/main/java/ATCCodes/FileParsingException.java (renamed from DNPMPlugins/src/main/java/ATCCodes/FileParsingException.java)0
-rw-r--r--src/main/java/ATCCodes/UnregisteredCode.java (renamed from DNPMPlugins/src/main/java/ATCCodes/UnregisteredCode.java)0
-rw-r--r--src/main/java/ATCCodes/services/AgentCodeService.java (renamed from DNPMPlugins/src/main/java/ATCCodes/services/AgentCodeService.java)0
-rw-r--r--src/main/java/ATCCodes/services/CsvAtcCodeService.java (renamed from DNPMPlugins/src/main/java/ATCCodes/services/CsvAtcCodeService.java)0
-rw-r--r--src/main/java/ATCCodes/services/FileBasedAgentCodeService.java (renamed from DNPMPlugins/src/main/java/ATCCodes/services/FileBasedAgentCodeService.java)0
-rw-r--r--src/main/java/ATCCodes/services/OnkostarAgentCodeService.java (renamed from DNPMPlugins/src/main/java/ATCCodes/services/OnkostarAgentCodeService.java)0
-rw-r--r--src/main/java/ATCCodes/services/WhoAtcCodeService.java (renamed from DNPMPlugins/src/main/java/ATCCodes/services/WhoAtcCodeService.java)0
-rw-r--r--src/main/java/DNPM/ConsentManager.java (renamed from DNPMPlugins/src/main/java/DNPM/ConsentManager.java)0
-rw-r--r--src/main/java/DNPM/DNPMHelper.java (renamed from DNPMPlugins/src/main/java/DNPM/DNPMHelper.java)0
-rw-r--r--src/main/java/DNPM/Merkmalskatalog.java (renamed from DNPMPlugins/src/main/java/DNPM/Merkmalskatalog.java)0
-rw-r--r--src/main/java/DNPM/VerweisVon.java (renamed from DNPMPlugins/src/main/java/DNPM/VerweisVon.java)0
-rw-r--r--src/main/java/DNPM/logger.java (renamed from DNPMPlugins/src/main/java/DNPM/logger.java)0
-rw-r--r--src/main/resources/app/lib/umr/FormUtils.js (renamed from DNPMPlugins/src/main/resources/app/lib/umr/FormUtils.js)0
-rw-r--r--src/main/resources/de/itc/onkostar/library/moduleContext.xml (renamed from DNPMPlugins/src/main/resources/de/itc/onkostar/library/moduleContext.xml)0
-rw-r--r--src/main/resources/onkostar-config.properties (renamed from DNPMPlugins/src/main/resources/onkostar-config.properties)0
22 files changed, 93 insertions, 167 deletions
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 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>DNPMHelper</groupId>
- <artifactId>DNPMHelper</artifactId>
- <version>0.0.2</version>
- <name>DNPMHelper</name>
-
- <dependencies>
- <!-- This is the onkostar-api -->
- <dependency>
- <groupId>de.itc</groupId>
- <artifactId>onkostar-parent</artifactId>
- <version>2.11.1.1</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/onkostar-api-2.11.1.1.jar</systemPath>
- </dependency>
-
- <!-- This is the core HAPI library -->
- <dependency>
- <groupId>ca.uhn.hapi</groupId>
- <artifactId>hapi-base</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/hapi-base-2.2.jar</systemPath>
- </dependency>
-
- <!-- This is the structure JAR for HL7 v2.1 -->
- <dependency>
- <groupId>ca.uhn.hapi</groupId>
- <artifactId>hapi-structures-v23</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/hapi-structures-v23-2.2.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>ca.uhn.hapi</groupId>
- <artifactId>hapi-structures-v24</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/hapi-structures-v24-2.2.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>ca.uhn.hapi</groupId>
- <artifactId>hapi-structures-v25</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/hapi-structures-v25-2.2.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>ca.uhn.hapi</groupId>
- <artifactId>hapi-structures-v26</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/hapi-structures-v26-2.2.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>4.3.8.RELEASE</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/spring-beans-4.3.8.RELEASE.jar</systemPath>
- </dependency>
-
- <!-- Hibernate -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>5.1.8.Final</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/hibernate-core-5.1.8.Final.jar</systemPath>
- </dependency>
-
- <!-- zusätzliche Erweiterungen. -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.10.1</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>2.2.1.RELEASE</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>3.2.1.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>2.14.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.14.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>5.3.14</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-csv</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <!-- Hier wird definiert, wie Maven das Artifakt bauen soll. -->
- <!-- Das erste Plugin kopiert die Resourcen in das JAR -->
- <!-- Das zweite Plugin kompiliert die Klassen als Java 11 -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <outputDirectory>C:\Onkostar-System\Onkostar\files\onkostar\plugins</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <id>default-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- <java.version>11</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <spring-version>4.3.8.RELEASE</spring-version>
- </properties>
-</project> \ 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 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>DNPMHelper</groupId>
+ <artifactId>DNPMHelper</artifactId>
+ <version>0.0.2</version>
+ <name>DNPMHelper</name>
+
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <java.version>11</java.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <spring-version>4.3.8.RELEASE</spring-version>
+ </properties>
+
+ <dependencies>
+ <!-- This is the onkostar-api -->
+ <dependency>
+ <groupId>de.itc</groupId>
+ <artifactId>onkostar-parent</artifactId>
+ <version>2.11.1.1</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/onkostar-api-2.11.1.1.jar</systemPath>
+ </dependency>
+
+ <!-- Hibernate -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>5.1.8.Final</version>
+ </dependency>
+
+ <!-- zusätzliche Erweiterungen. -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.10.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>2.2.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>3.2.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.14.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.14.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>5.3.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project> \ No newline at end of file
diff --git a/DNPMPlugins/src/main/java/ATCCodes/AgentCode.java b/src/main/java/ATCCodes/AgentCode.java
index 04d6065..04d6065 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/AgentCode.java
+++ b/src/main/java/ATCCodes/AgentCode.java
diff --git a/DNPMPlugins/src/main/java/ATCCodes/AtcCode.java b/src/main/java/ATCCodes/AtcCode.java
index e8bf9f1..e8bf9f1 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/AtcCode.java
+++ b/src/main/java/ATCCodes/AtcCode.java
diff --git a/DNPMPlugins/src/main/java/ATCCodes/AtcCodesPlugin.java b/src/main/java/ATCCodes/AtcCodesPlugin.java
index d0077ae..d0077ae 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/AtcCodesPlugin.java
+++ b/src/main/java/ATCCodes/AtcCodesPlugin.java
diff --git a/DNPMPlugins/src/main/java/ATCCodes/CodeSystem.java b/src/main/java/ATCCodes/CodeSystem.java
index ea20f49..ea20f49 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/CodeSystem.java
+++ b/src/main/java/ATCCodes/CodeSystem.java
diff --git a/DNPMPlugins/src/main/java/ATCCodes/FileParsingException.java b/src/main/java/ATCCodes/FileParsingException.java
index b009578..b009578 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/FileParsingException.java
+++ b/src/main/java/ATCCodes/FileParsingException.java
diff --git a/DNPMPlugins/src/main/java/ATCCodes/UnregisteredCode.java b/src/main/java/ATCCodes/UnregisteredCode.java
index 345b057..345b057 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/UnregisteredCode.java
+++ b/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
index 8057008..8057008 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/services/AgentCodeService.java
+++ b/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
index fa834e7..fa834e7 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/services/CsvAtcCodeService.java
+++ b/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
index 17ba389..17ba389 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/services/FileBasedAgentCodeService.java
+++ b/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
index f29f074..f29f074 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/services/OnkostarAgentCodeService.java
+++ b/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
index 5bb9b11..5bb9b11 100644
--- a/DNPMPlugins/src/main/java/ATCCodes/services/WhoAtcCodeService.java
+++ b/src/main/java/ATCCodes/services/WhoAtcCodeService.java
diff --git a/DNPMPlugins/src/main/java/DNPM/ConsentManager.java b/src/main/java/DNPM/ConsentManager.java
index d6b9994..d6b9994 100644
--- a/DNPMPlugins/src/main/java/DNPM/ConsentManager.java
+++ b/src/main/java/DNPM/ConsentManager.java
diff --git a/DNPMPlugins/src/main/java/DNPM/DNPMHelper.java b/src/main/java/DNPM/DNPMHelper.java
index 408c262..408c262 100644
--- a/DNPMPlugins/src/main/java/DNPM/DNPMHelper.java
+++ b/src/main/java/DNPM/DNPMHelper.java
diff --git a/DNPMPlugins/src/main/java/DNPM/Merkmalskatalog.java b/src/main/java/DNPM/Merkmalskatalog.java
index 8160156..8160156 100644
--- a/DNPMPlugins/src/main/java/DNPM/Merkmalskatalog.java
+++ b/src/main/java/DNPM/Merkmalskatalog.java
diff --git a/DNPMPlugins/src/main/java/DNPM/VerweisVon.java b/src/main/java/DNPM/VerweisVon.java
index afb6824..afb6824 100644
--- a/DNPMPlugins/src/main/java/DNPM/VerweisVon.java
+++ b/src/main/java/DNPM/VerweisVon.java
diff --git a/DNPMPlugins/src/main/java/DNPM/logger.java b/src/main/java/DNPM/logger.java
index 15dadb6..15dadb6 100644
--- a/DNPMPlugins/src/main/java/DNPM/logger.java
+++ b/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
index 7a8cbdd..7a8cbdd 100644
--- a/DNPMPlugins/src/main/resources/app/lib/umr/FormUtils.js
+++ b/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
index efcde36..efcde36 100644
--- a/DNPMPlugins/src/main/resources/de/itc/onkostar/library/moduleContext.xml
+++ b/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
index b546687..b546687 100644
--- a/DNPMPlugins/src/main/resources/onkostar-config.properties
+++ b/src/main/resources/onkostar-config.properties
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-01 05:46:37 +0000