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 65a0f2ba6b538e656e3d54e4fd06e7aea224ee91..0114a103883c31bb53076235c428e59b8d64d8e0 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 05776056fccc41d9702fe0e16d1b44cf3b755efc..c3729ad8a5fe9e4f8f88ed78d66a9fcf8f512a89 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 8ae8d6620112334f6ec6bbac641d8d890755e3a2..c2e5bfdfcc2724d2fb8959bf01b4d678b1c1b73e 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 41934e1132b4223c48ed60990b8f2eb000141ba3..19069830e4ad32aa81561ca0862a3c6ac2d7618e 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;