From f5a981807fbfca6dbc3c7b5244531ea8e03a0578 Mon Sep 17 00:00:00 2001
From: Martin Staehr <martin@mstaehr.net>
Date: Mon, 28 May 2018 16:55:12 +0200
Subject: [PATCH] move to modules folder
---
gemeinsamforschen/pom.xml | 23 ++++++++-----------
.../communication/model/SampleAnswer.java | 2 +-
.../communication/service/SampleService.java | 4 ++--
.../communication/view/SampleView.java | 6 ++---
.../service/SampleServiceTest.java | 4 ++--
5 files changed, 18 insertions(+), 21 deletions(-)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/{ => modules}/communication/model/SampleAnswer.java (88%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/{ => modules}/communication/service/SampleService.java (66%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/{ => modules}/communication/view/SampleView.java (79%)
rename gemeinsamforschen/src/test/java/unipotsdam/gf/{ => modules}/communication/service/SampleServiceTest.java (75%)
diff --git a/gemeinsamforschen/pom.xml b/gemeinsamforschen/pom.xml
index 118c0104..bc7d93fb 100644
--- a/gemeinsamforschen/pom.xml
+++ b/gemeinsamforschen/pom.xml
@@ -30,9 +30,9 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -105,6 +105,12 @@
<version>2.4.5</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.4.5</version>
+ </dependency>
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
@@ -124,16 +130,7 @@
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-grizzly2-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.9.5</version>
- </dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/model/SampleAnswer.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/SampleAnswer.java
similarity index 88%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/communication/model/SampleAnswer.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/SampleAnswer.java
index 06243fbd..6a34b213 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/model/SampleAnswer.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/SampleAnswer.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.communication.model;
+package unipotsdam.gf.modules.communication.model;
public class SampleAnswer {
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/service/SampleService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/SampleService.java
similarity index 66%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/communication/service/SampleService.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/SampleService.java
index ee150d86..870b49db 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/service/SampleService.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/SampleService.java
@@ -1,6 +1,6 @@
-package unipotsdam.gf.communication.service;
+package unipotsdam.gf.modules.communication.service;
-import unipotsdam.gf.communication.model.SampleAnswer;
+import unipotsdam.gf.modules.communication.model.SampleAnswer;
public class SampleService {
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/view/SampleView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/SampleView.java
similarity index 79%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/communication/view/SampleView.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/SampleView.java
index 6c894443..e54f664d 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/view/SampleView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/SampleView.java
@@ -1,9 +1,9 @@
-package unipotsdam.gf.communication.view;
+package unipotsdam.gf.modules.communication.view;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import unipotsdam.gf.communication.model.SampleAnswer;
-import unipotsdam.gf.communication.service.SampleService;
+import unipotsdam.gf.modules.communication.model.SampleAnswer;
+import unipotsdam.gf.modules.communication.service.SampleService;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/communication/service/SampleServiceTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/SampleServiceTest.java
similarity index 75%
rename from gemeinsamforschen/src/test/java/unipotsdam/gf/communication/service/SampleServiceTest.java
rename to gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/SampleServiceTest.java
index d19745c8..e510a60c 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/communication/service/SampleServiceTest.java
+++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/SampleServiceTest.java
@@ -1,8 +1,8 @@
-package unipotsdam.gf.communication.service;
+package unipotsdam.gf.modules.communication.service;
import org.junit.Test;
-import unipotsdam.gf.communication.model.SampleAnswer;
+import unipotsdam.gf.modules.communication.model.SampleAnswer;
import static org.junit.Assert.assertEquals;
--
GitLab