From 3d1fabe9faf7442fc7ba8548830c6746d55cef1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sta=CC=88hr?= <martin@mstaehr.net>
Date: Mon, 28 May 2018 15:29:21 +0200
Subject: [PATCH] revert change of folder structure, introducing new interface
 folder

---
 gemeinsamforschen/{example-app => }/pom.xml                     | 0
 .../java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java    | 2 +-
 .../java/unipotsdam/gf/munchkin/interfaces}/IMunschkin.java     | 2 +-
 .../src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java   | 0
 .../java/unipotsdam/gf/munchkin/service/RestyMunschkin.java     | 2 +-
 .../{example-app => }/src/main/webapp/WEB-INF/classes/log4j.xml | 0
 .../{example-app => }/src/main/webapp/WEB-INF/web.xml           | 0
 gemeinsamforschen/{example-app => }/src/main/webapp/index.html  | 0
 .../{example-app => }/src/main/webapp/js/munschkinloader.js     | 0
 .../{example-app => }/src/main/webapp/jsexample.html            | 0
 gemeinsamforschen/{example-app => }/src/scripts/munschkins.sql  | 0
 .../{example-app => }/src/test/java/MunschkinLoaderTest.java    | 2 +-
 12 files changed, 4 insertions(+), 4 deletions(-)
 rename gemeinsamforschen/{example-app => }/pom.xml (100%)
 rename gemeinsamforschen/{example-app => }/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java (98%)
 rename gemeinsamforschen/{example-app/src/main/java/unipotsdam/gf/munchkin => src/main/java/unipotsdam/gf/munchkin/interfaces}/IMunschkin.java (85%)
 rename gemeinsamforschen/{example-app => }/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java (100%)
 rename gemeinsamforschen/{example-app => }/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java (95%)
 rename gemeinsamforschen/{example-app => }/src/main/webapp/WEB-INF/classes/log4j.xml (100%)
 rename gemeinsamforschen/{example-app => }/src/main/webapp/WEB-INF/web.xml (100%)
 rename gemeinsamforschen/{example-app => }/src/main/webapp/index.html (100%)
 rename gemeinsamforschen/{example-app => }/src/main/webapp/js/munschkinloader.js (100%)
 rename gemeinsamforschen/{example-app => }/src/main/webapp/jsexample.html (100%)
 rename gemeinsamforschen/{example-app => }/src/scripts/munschkins.sql (100%)
 rename gemeinsamforschen/{example-app => }/src/test/java/MunschkinLoaderTest.java (91%)

diff --git a/gemeinsamforschen/example-app/pom.xml b/gemeinsamforschen/pom.xml
similarity index 100%
rename from gemeinsamforschen/example-app/pom.xml
rename to gemeinsamforschen/pom.xml
diff --git a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
similarity index 98%
rename from gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
index 65a0f2ba..0114a103 100644
--- a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/controller/MunchkinImpl.java
@@ -1,6 +1,6 @@
 package unipotsdam.gf.munchkin.controller;
 
-import unipotsdam.gf.munchkin.IMunschkin;
+import unipotsdam.gf.munchkin.interfaces.IMunschkin;
 import unipotsdam.gf.munchkin.model.Munschkin;
 
 import java.sql.*;
diff --git a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/IMunschkin.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/interfaces/IMunschkin.java
similarity index 85%
rename from gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/IMunschkin.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/interfaces/IMunschkin.java
index 05776056..c3729ad8 100644
--- a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/IMunschkin.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/interfaces/IMunschkin.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.munchkin;
+package unipotsdam.gf.munchkin.interfaces;
 
 import unipotsdam.gf.munchkin.model.Munschkin;
 
diff --git a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java
similarity index 100%
rename from gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/model/Munschkin.java
diff --git a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
similarity index 95%
rename from gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
index 8ae8d662..c2e5bfdf 100644
--- a/gemeinsamforschen/example-app/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/munchkin/service/RestyMunschkin.java
@@ -4,7 +4,7 @@ package unipotsdam.gf.munchkin.service;
  * Created by dehne on 24.04.2018.
  */
 
-import unipotsdam.gf.munchkin.IMunschkin;
+import unipotsdam.gf.munchkin.interfaces.IMunschkin;
 import unipotsdam.gf.munchkin.controller.MunchkinImpl;
 import unipotsdam.gf.munchkin.model.Munschkin;
 import javax.ws.rs.GET;
diff --git a/gemeinsamforschen/example-app/src/main/webapp/WEB-INF/classes/log4j.xml b/gemeinsamforschen/src/main/webapp/WEB-INF/classes/log4j.xml
similarity index 100%
rename from gemeinsamforschen/example-app/src/main/webapp/WEB-INF/classes/log4j.xml
rename to gemeinsamforschen/src/main/webapp/WEB-INF/classes/log4j.xml
diff --git a/gemeinsamforschen/example-app/src/main/webapp/WEB-INF/web.xml b/gemeinsamforschen/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from gemeinsamforschen/example-app/src/main/webapp/WEB-INF/web.xml
rename to gemeinsamforschen/src/main/webapp/WEB-INF/web.xml
diff --git a/gemeinsamforschen/example-app/src/main/webapp/index.html b/gemeinsamforschen/src/main/webapp/index.html
similarity index 100%
rename from gemeinsamforschen/example-app/src/main/webapp/index.html
rename to gemeinsamforschen/src/main/webapp/index.html
diff --git a/gemeinsamforschen/example-app/src/main/webapp/js/munschkinloader.js b/gemeinsamforschen/src/main/webapp/js/munschkinloader.js
similarity index 100%
rename from gemeinsamforschen/example-app/src/main/webapp/js/munschkinloader.js
rename to gemeinsamforschen/src/main/webapp/js/munschkinloader.js
diff --git a/gemeinsamforschen/example-app/src/main/webapp/jsexample.html b/gemeinsamforschen/src/main/webapp/jsexample.html
similarity index 100%
rename from gemeinsamforschen/example-app/src/main/webapp/jsexample.html
rename to gemeinsamforschen/src/main/webapp/jsexample.html
diff --git a/gemeinsamforschen/example-app/src/scripts/munschkins.sql b/gemeinsamforschen/src/scripts/munschkins.sql
similarity index 100%
rename from gemeinsamforschen/example-app/src/scripts/munschkins.sql
rename to gemeinsamforschen/src/scripts/munschkins.sql
diff --git a/gemeinsamforschen/example-app/src/test/java/MunschkinLoaderTest.java b/gemeinsamforschen/src/test/java/MunschkinLoaderTest.java
similarity index 91%
rename from gemeinsamforschen/example-app/src/test/java/MunschkinLoaderTest.java
rename to gemeinsamforschen/src/test/java/MunschkinLoaderTest.java
index 41934e11..19069830 100644
--- a/gemeinsamforschen/example-app/src/test/java/MunschkinLoaderTest.java
+++ b/gemeinsamforschen/src/test/java/MunschkinLoaderTest.java
@@ -1,4 +1,4 @@
-import unipotsdam.gf.munchkin.IMunschkin;
+import unipotsdam.gf.munchkin.interfaces.IMunschkin;
 import unipotsdam.gf.munchkin.controller.MunchkinImpl;
 import unipotsdam.gf.munchkin.model.Munschkin;
 import org.junit.Test;
-- 
GitLab