renames demo apps and adapts POMs

Refs iris-connect/iris-backlog#68
iris-connect · May 4, 2021 · 592cbab · 592cbab
1 parent 2c59b68
commit 592cbab
Show file tree

Hide file tree

Showing 63 changed files with 11 additions and 57 deletions.
diff --git a/iris-app-api-demo/.gitignore → demo-checkin-app/.gitignore b/iris-app-api-demo/.gitignore → demo-checkin-app/.gitignore
diff --git a/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/...p-api-demo/.mvn/wrapper/maven-wrapper.jar → ...heckin-app/.mvn/wrapper/maven-wrapper.jar b/...p-api-demo/.mvn/wrapper/maven-wrapper.jar → ...heckin-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/...emo/.mvn/wrapper/maven-wrapper.properties → ...app/.mvn/wrapper/maven-wrapper.properties b/...emo/.mvn/wrapper/maven-wrapper.properties → ...app/.mvn/wrapper/maven-wrapper.properties
diff --git a/iris-app-api-demo/README.md → demo-checkin-app/README.md b/iris-app-api-demo/README.md → demo-checkin-app/README.md
diff --git a/iris-app-api-demo/mvnw → demo-checkin-app/mvnw b/iris-app-api-demo/mvnw → demo-checkin-app/mvnw
diff --git a/iris-app-api-demo/mvnw.cmd → demo-checkin-app/mvnw.cmd b/iris-app-api-demo/mvnw.cmd → demo-checkin-app/mvnw.cmd
diff --git a/iris-app-api-demo/pom.xml → demo-checkin-app/pom.xml b/iris-app-api-demo/pom.xml → demo-checkin-app/pom.xml
@@ -9,11 +9,10 @@
 		<version>2.4.4</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>de.healthIMIS</groupId>
-	<artifactId>iris-app-api-demo</artifactId>
+	<groupId>iris-gateway</groupId>
+	<artifactId>demo-checkin-app</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>iris-app-api-demo</name>
-	<description>Demo for App connection</description>
+	<name>Demo for Checkin Apps</name>
 	<properties>
 		<java.version>11</java.version>
 		<docker.image.prefix>inoeg</docker.image.prefix>

diff --git a/...appapidemo/IrisAppApiDemoApplication.java → ...appapidemo/IrisAppApiDemoApplication.java b/...appapidemo/IrisAppApiDemoApplication.java → ...appapidemo/IrisAppApiDemoApplication.java
diff --git a/...onfig/BlockingRestTemplateCustomizer.java → ...onfig/BlockingRestTemplateCustomizer.java b/...onfig/BlockingRestTemplateCustomizer.java → ...onfig/BlockingRestTemplateCustomizer.java
diff --git a/...irisappapidemo/config/ResourceHelper.java → ...irisappapidemo/config/ResourceHelper.java b/...irisappapidemo/config/ResourceHelper.java → ...irisappapidemo/config/ResourceHelper.java
diff --git a/...est/controller/DataRequestController.java → ...est/controller/DataRequestController.java b/...est/controller/DataRequestController.java → ...est/controller/DataRequestController.java
diff --git a/...uest/controller/RestExceptionHandler.java → ...uest/controller/RestExceptionHandler.java b/...uest/controller/RestExceptionHandler.java → ...uest/controller/RestExceptionHandler.java
diff --git a/...est/model/dto/LocationDataRequestDto.java → ...est/model/dto/LocationDataRequestDto.java b/...est/model/dto/LocationDataRequestDto.java → ...est/model/dto/LocationDataRequestDto.java
diff --git a/...mission/bootstrap/DataProviderLoader.java → ...mission/bootstrap/DataProviderLoader.java b/...mission/bootstrap/DataProviderLoader.java → ...mission/bootstrap/DataProviderLoader.java
diff --git a/...datasubmission/bootstrap/GuestLoader.java → ...datasubmission/bootstrap/GuestLoader.java b/...datasubmission/bootstrap/GuestLoader.java → ...datasubmission/bootstrap/GuestLoader.java
diff --git a/.../datasubmission/encryption/Decryptor.java → .../datasubmission/encryption/Decryptor.java b/.../datasubmission/encryption/Decryptor.java → .../datasubmission/encryption/Decryptor.java
diff --git a/.../datasubmission/encryption/Encryptor.java → .../datasubmission/encryption/Encryptor.java b/.../datasubmission/encryption/Encryptor.java → .../datasubmission/encryption/Encryptor.java
diff --git a/...ission/encryption/GuestListDecryptor.java → ...ission/encryption/GuestListDecryptor.java b/...ission/encryption/GuestListDecryptor.java → ...ission/encryption/GuestListDecryptor.java
diff --git a/...ission/encryption/GuestListEncryptor.java → ...ission/encryption/GuestListEncryptor.java b/...ission/encryption/GuestListEncryptor.java → ...ission/encryption/GuestListEncryptor.java
diff --git a/.../datasubmission/model/dto/AddressDto.java → .../datasubmission/model/dto/AddressDto.java b/.../datasubmission/model/dto/AddressDto.java → .../datasubmission/model/dto/AddressDto.java
diff --git a/...n/model/dto/AttendanceInformationDto.java → ...n/model/dto/AttendanceInformationDto.java b/...n/model/dto/AttendanceInformationDto.java → ...n/model/dto/AttendanceInformationDto.java
diff --git a/...submission/model/dto/DataProviderDto.java → ...submission/model/dto/DataProviderDto.java b/...submission/model/dto/DataProviderDto.java → ...submission/model/dto/DataProviderDto.java
diff --git a/...mo/datasubmission/model/dto/GuestDto.java → ...mo/datasubmission/model/dto/GuestDto.java b/...mo/datasubmission/model/dto/GuestDto.java → ...mo/datasubmission/model/dto/GuestDto.java
diff --git a/...atasubmission/model/dto/GuestListDto.java → ...atasubmission/model/dto/GuestListDto.java b/...atasubmission/model/dto/GuestListDto.java → ...atasubmission/model/dto/GuestListDto.java
diff --git a/...mission/model/dto/GuestSubmissionDto.java → ...mission/model/dto/GuestSubmissionDto.java b/...mission/model/dto/GuestSubmissionDto.java → ...mission/model/dto/GuestSubmissionDto.java
diff --git a/...demo/datasubmission/model/dto/SexDto.java → ...demo/datasubmission/model/dto/SexDto.java b/...demo/datasubmission/model/dto/SexDto.java → ...demo/datasubmission/model/dto/SexDto.java
diff --git a/...ission/service/DataSubmissionService.java → ...ission/service/DataSubmissionService.java b/...ission/service/DataSubmissionService.java → ...ission/service/DataSubmissionService.java
diff --git a/...sion/web/client/DataSubmissionClient.java → ...sion/web/client/DataSubmissionClient.java b/...sion/web/client/DataSubmissionClient.java → ...sion/web/client/DataSubmissionClient.java
diff --git a/...earchindex/bootstrap/LocationsLoader.java → ...earchindex/bootstrap/LocationsLoader.java b/...earchindex/bootstrap/LocationsLoader.java → ...earchindex/bootstrap/LocationsLoader.java
diff --git a/...apidemo/searchindex/model/AddressDto.java → ...apidemo/searchindex/model/AddressDto.java b/...apidemo/searchindex/model/AddressDto.java → ...apidemo/searchindex/model/AddressDto.java
diff --git a/...apidemo/searchindex/model/ContactDto.java → ...apidemo/searchindex/model/ContactDto.java b/...apidemo/searchindex/model/ContactDto.java → ...apidemo/searchindex/model/ContactDto.java
diff --git a/...apidemo/searchindex/model/ContextDto.java → ...apidemo/searchindex/model/ContextDto.java b/...apidemo/searchindex/model/ContextDto.java → ...apidemo/searchindex/model/ContextDto.java
diff --git a/...pidemo/searchindex/model/LocationDto.java → ...pidemo/searchindex/model/LocationDto.java b/...pidemo/searchindex/model/LocationDto.java → ...pidemo/searchindex/model/LocationDto.java
diff --git a/...idemo/searchindex/model/LocationsDto.java → ...idemo/searchindex/model/LocationsDto.java b/...idemo/searchindex/model/LocationsDto.java → ...idemo/searchindex/model/LocationsDto.java
diff --git a/...chindex/web/client/SearchIndexClient.java → ...chindex/web/client/SearchIndexClient.java b/...chindex/web/client/SearchIndexClient.java → ...chindex/web/client/SearchIndexClient.java
diff --git a/...isappapidemo/startup/LocationUpdater.java → ...isappapidemo/startup/LocationUpdater.java b/...isappapidemo/startup/LocationUpdater.java → ...isappapidemo/startup/LocationUpdater.java
diff --git a/...n/resources/application-docker.properties → ...n/resources/application-docker.properties b/...n/resources/application-docker.properties → ...n/resources/application-docker.properties
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/.../bootstrap/dataprovider/smartmeeting.json → .../bootstrap/dataprovider/smartmeeting.json b/.../bootstrap/dataprovider/smartmeeting.json → .../bootstrap/dataprovider/smartmeeting.json
diff --git a/...esources/bootstrap/guests/guest_list.json → ...esources/bootstrap/guests/guest_list.json b/...esources/bootstrap/guests/guest_list.json → ...esources/bootstrap/guests/guest_list.json
diff --git a/...urces/bootstrap/locations/da-michele.json → ...urces/bootstrap/locations/da-michele.json b/...urces/bootstrap/locations/da-michele.json → ...urces/bootstrap/locations/da-michele.json
diff --git a/...ces/bootstrap/locations/fc-darmstadt.json → ...ces/bootstrap/locations/fc-darmstadt.json b/...ces/bootstrap/locations/fc-darmstadt.json → ...ces/bootstrap/locations/fc-darmstadt.json
diff --git a/...-api-demo/src/main/resources/keystore.p12 → ...eckin-app/src/main/resources/keystore.p12 b/...-api-demo/src/main/resources/keystore.p12 → ...eckin-app/src/main/resources/keystore.p12
diff --git a/...idemo/IrisAppApiDemoApplicationTests.java → ...idemo/IrisAppApiDemoApplicationTests.java b/...idemo/IrisAppApiDemoApplicationTests.java → ...idemo/IrisAppApiDemoApplicationTests.java
diff --git a/...risappapidemo/IrisWebIntegrationTest.java → ...risappapidemo/IrisWebIntegrationTest.java b/...risappapidemo/IrisWebIntegrationTest.java → ...risappapidemo/IrisWebIntegrationTest.java
diff --git a/...IMIS/irisappapidemo/IrisWireMockTest.java → ...IMIS/irisappapidemo/IrisWireMockTest.java b/...IMIS/irisappapidemo/IrisWireMockTest.java → ...IMIS/irisappapidemo/IrisWireMockTest.java
diff --git a/...submission/bootstrap/GuestLoaderTest.java → ...submission/bootstrap/GuestLoaderTest.java b/...submission/bootstrap/GuestLoaderTest.java → ...submission/bootstrap/GuestLoaderTest.java
diff --git a/...ubmission/service/DataSubmissionTest.java → ...ubmission/service/DataSubmissionTest.java b/...ubmission/service/DataSubmissionTest.java → ...ubmission/service/DataSubmissionTest.java
diff --git a/...dex/web/client/SearchIndexClientTest.java → ...dex/web/client/SearchIndexClientTest.java b/...dex/web/client/SearchIndexClientTest.java → ...dex/web/client/SearchIndexClientTest.java
diff --git a/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java b/.../.mvn/wrapper/MavenWrapperDownloader.java → .../.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/...app/.mvn/wrapper/maven-wrapper.properties → ...app/.mvn/wrapper/maven-wrapper.properties b/...app/.mvn/wrapper/maven-wrapper.properties → ...app/.mvn/wrapper/maven-wrapper.properties
diff --git a/iris-dummy-app/mvnw → demo-contact-diary-app/mvnw b/iris-dummy-app/mvnw → demo-contact-diary-app/mvnw
diff --git a/iris-dummy-app/mvnw.cmd → demo-contact-diary-app/mvnw.cmd b/iris-dummy-app/mvnw.cmd → demo-contact-diary-app/mvnw.cmd
diff --git a/iris-dummy-app/pom.xml → demo-contact-diary-app/pom.xml b/iris-dummy-app/pom.xml → demo-contact-diary-app/pom.xml
@@ -6,14 +6,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>de.healthIMIS</groupId>
+		<groupId>iris-gateway</groupId>
 		<artifactId>parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>iris-dummy-app</artifactId>
+	<artifactId>demo-contact-diary-app</artifactId>
 
-	<name>IRIS Dummy App</name>
+	<name>Demo for Contact Diary App</name>
 	<description>A dummy app as example for an app that uses the IRIS system.</description>
 	<licenses>
 		<license>
@@ -30,12 +30,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>de.healthIMIS</groupId>
-			<artifactId>iris-api-app-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.hateoas</groupId>
 			<artifactId>spring-hateoas</artifactId>

diff --git a/...thIMIS/iris/dummy_app/DataRequestDto.java → ...thIMIS/iris/dummy_app/DataRequestDto.java b/...thIMIS/iris/dummy_app/DataRequestDto.java → ...thIMIS/iris/dummy_app/DataRequestDto.java
diff --git a/...MIS/iris/dummy_app/DataSubmissionDto.java → ...MIS/iris/dummy_app/DataSubmissionDto.java b/...MIS/iris/dummy_app/DataSubmissionDto.java → ...MIS/iris/dummy_app/DataSubmissionDto.java
diff --git a/...althIMIS/iris/dummy_app/IrisDummyApp.java → ...althIMIS/iris/dummy_app/IrisDummyApp.java b/...althIMIS/iris/dummy_app/IrisDummyApp.java → ...althIMIS/iris/dummy_app/IrisDummyApp.java
diff --git a/...c/main/resources/example-input.properties → ...c/main/resources/example-input.properties b/...c/main/resources/example-input.properties → ...c/main/resources/example-input.properties
diff --git a/...-dummy-app/src/main/resources/logback.xml → ...-diary-app/src/main/resources/logback.xml b/...-dummy-app/src/main/resources/logback.xml → ...-diary-app/src/main/resources/logback.xml
diff --git a/iris-location-service/pom.xml b/iris-location-service/pom.xml
@@ -8,7 +8,7 @@
         <version>2.4.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>de.healthIMIS.iris</groupId>
+    <groupId>iris-gateway</groupId>
     <artifactId>iris-location-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>IRIS Location Service</name>

diff --git a/iris-public-server/pom.xml b/iris-public-server/pom.xml
@@ -9,7 +9,7 @@
 		<version>2.4.2</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>de.healthIMIS</groupId>
+	<groupId>iris-gateway</groupId>
 	<artifactId>iris-public-server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>IRIS Public Server</name>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>de.healthIMIS</groupId>
+	<groupId>iris-gateway</groupId>
 	<artifactId>parent</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
@@ -15,52 +15,13 @@
 	<properties>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
-		<jackson-version>2.12.2</jackson-version>
 	</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-web</artifactId>
-				<version>2.4.4</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-commons</artifactId>
-				<version>2.4.6</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.datatype</groupId>
-				<artifactId>jackson-datatype-jsr310</artifactId>
-				<version>${jackson-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.validation</groupId>
-				<artifactId>validation-api</artifactId>
-				<version>2.0.1.Final</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>${jackson-version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<modules>
-		<module>iris-api-generator</module>
-		<module>iris-api-location-service</module>
-		<module>iris-api-public-server</module>
-		<module>iris-api-sidecar-server</module>
-		<module>iris-api-sidecar-client</module>
-		<module>iris-api-app-client</module>
-		<module>iris-sormas-api-client</module>
 		<module>iris-public-server</module>
 		<module>iris-location-service</module>
-		<module>iris-client-sormas-sidecar</module>
-		<module>iris-app-api-demo</module>
-		<module>iris-dummy-app</module>
+		<module>demo-checkin-app</module>
+		<module>demo-contact-diary-app</module>
 	</modules>
 
 	<build>