From 694d396a3b66cf3dc489e0034581c90004763eb3 Mon Sep 17 00:00:00 2001
From: Julian Dehne <julian.dehne@uni-potsdam.de>
Date: Mon, 28 May 2018 16:12:47 +0200
Subject: [PATCH] - munchkin example in neue Struktur verschoben

---
 .../src/main/java/unipotsdam/gf/interfaces/IMunschkin.java  | 4 +---
 .../gf/{ => modules}/munchkin/controller/MunchkinImpl.java  | 4 ++--
 .../gf/{ => modules}/munchkin/model/Munschkin.java          | 2 +-
 .../gf/{ => modules}/munchkin/service/RestyMunschkin.java   | 6 +++---
 gemeinsamforschen/src/test/java/MunschkinLoaderTest.java    | 4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename gemeinsamforschen/src/main/java/unipotsdam/gf/{ => modules}/munchkin/controller/MunchkinImpl.java (96%)
 rename gemeinsamforschen/src/main/java/unipotsdam/gf/{ => modules}/munchkin/model/Munschkin.java (97%)
 rename gemeinsamforschen/src/main/java/unipotsdam/gf/{ => modules}/munchkin/service/RestyMunschkin.java (87%)

diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IMunschkin.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IMunschkin.java
index da90fcb3..7b0acf2b 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IMunschkin.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IMunschkin.java
@@ -1,8 +1,6 @@
 package unipotsdam.gf.interfaces;
 
-import unipotsdam.gf.munchkin.model.Munschkin;
-
-import javax.ws.rs.PathParam;
+import unipotsdam.gf.modules.munchkin.model.Munschkin;
 
 /**
  * Created by dehne on 25.04.2018.
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/controller/MunchkinImpl.java
similarity index 96%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/controller/MunchkinImpl.java
index 4f0adb53..a80be9a9 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/controller/MunchkinImpl.java
@@ -1,7 +1,7 @@
-package unipotsdam.gf.munchkin.controller;
+package unipotsdam.gf.modules.munchkin.controller;
 
 import unipotsdam.gf.interfaces.IMunschkin;
-import unipotsdam.gf.munchkin.model.Munschkin;
+import unipotsdam.gf.modules.munchkin.model.Munschkin;
 
 import java.sql.*;
 
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/model/Munschkin.java
similarity index 97%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/model/Munschkin.java
index 68a31988..883392b7 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/model/Munschkin.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.munchkin.model;
+package unipotsdam.gf.modules.munchkin.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/service/RestyMunschkin.java
similarity index 87%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/service/RestyMunschkin.java
index 950abd38..b4ab145e 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/munchkin/service/RestyMunschkin.java
@@ -1,12 +1,12 @@
-package unipotsdam.gf.munchkin.service;
+package unipotsdam.gf.modules.munchkin.service;
 
 /**
  * Created by dehne on 24.04.2018.
  */
 
 import unipotsdam.gf.interfaces.IMunschkin;
-import unipotsdam.gf.munchkin.controller.MunchkinImpl;
-import unipotsdam.gf.munchkin.model.Munschkin;
+import unipotsdam.gf.modules.munchkin.controller.MunchkinImpl;
+import unipotsdam.gf.modules.munchkin.model.Munschkin;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
diff --git a/gemeinsamforschen/src/test/java/MunschkinLoaderTest.java b/gemeinsamforschen/src/test/java/MunschkinLoaderTest.java
index 48eaeb2a..d86b172c 100644
--- a/gemeinsamforschen/src/test/java/MunschkinLoaderTest.java
+++ b/gemeinsamforschen/src/test/java/MunschkinLoaderTest.java
@@ -1,6 +1,6 @@
 import unipotsdam.gf.interfaces.IMunschkin;
-import unipotsdam.gf.munchkin.controller.MunchkinImpl;
-import unipotsdam.gf.munchkin.model.Munschkin;
+import unipotsdam.gf.modules.munchkin.controller.MunchkinImpl;
+import unipotsdam.gf.modules.munchkin.model.Munschkin;
 import org.junit.Test;
 
 /**
-- 
GitLab