From 11cedd1b682f6cd8899440afe90d0b35c20c8b5b Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 17 Oct 2012 09:04:48 +0200
Subject: [PATCH] Moved controller classes into package
de.thm.arsnova.controller
---
.../java/de/thm/arsnova/{ => controller}/LoginController.java | 3 +--
.../de/thm/arsnova/{ => controller}/SessionController.java | 2 +-
.../de/thm/arsnova/{ => controller}/WelcomeController.java | 2 +-
.../java/de/thm/arsnova/controller/LoginControllerTest.java | 1 -
.../java/de/thm/arsnova/controller/SessionControllerTest.java | 2 --
5 files changed, 3 insertions(+), 7 deletions(-)
rename src/main/java/de/thm/arsnova/{ => controller}/LoginController.java (98%)
rename src/main/java/de/thm/arsnova/{ => controller}/SessionController.java (99%)
rename src/main/java/de/thm/arsnova/{ => controller}/WelcomeController.java (97%)
diff --git a/src/main/java/de/thm/arsnova/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
similarity index 98%
rename from src/main/java/de/thm/arsnova/LoginController.java
rename to src/main/java/de/thm/arsnova/controller/LoginController.java
index 5f1ae033..7a14b419 100644
--- a/src/main/java/de/thm/arsnova/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.thm.arsnova;
+package de.thm.arsnova.controller;
import java.io.IOException;
import java.util.ArrayList;
@@ -47,7 +47,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.view.RedirectView;
diff --git a/src/main/java/de/thm/arsnova/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
similarity index 99%
rename from src/main/java/de/thm/arsnova/SessionController.java
rename to src/main/java/de/thm/arsnova/controller/SessionController.java
index fa046818..9b89a8cb 100644
--- a/src/main/java/de/thm/arsnova/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.thm.arsnova;
+package de.thm.arsnova.controller;
import java.util.UUID;
diff --git a/src/main/java/de/thm/arsnova/WelcomeController.java b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
similarity index 97%
rename from src/main/java/de/thm/arsnova/WelcomeController.java
rename to src/main/java/de/thm/arsnova/controller/WelcomeController.java
index ab9a6926..832751a5 100644
--- a/src/main/java/de/thm/arsnova/WelcomeController.java
+++ b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.thm.arsnova;
+package de.thm.arsnova.controller;
import javax.servlet.http.HttpServletRequest;
diff --git a/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java b/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
index 03741d10..2eb8a76a 100644
--- a/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/LoginControllerTest.java
@@ -40,7 +40,6 @@ import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
import org.springframework.web.servlet.view.RedirectView;
-import de.thm.arsnova.LoginController;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={
diff --git a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
index b1204794..eaddb5f3 100644
--- a/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/SessionControllerTest.java
@@ -19,8 +19,6 @@ import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
-import de.thm.arsnova.SessionController;
-import de.thm.arsnova.exceptions.NotFoundException;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={
--
GitLab