From ea2bff60f723e7be92a256d7a71ef22e9a1112c1 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 16 Jun 2012 17:03:17 -0300 Subject: [PATCH] Login Migrated to MVC 3.0 --- .../controller/LoginController.java | 72 ------------------- .../ncontroller/ExtensionsController.java | 2 + .../ncontroller/LoginController.java | 49 +++++++++++++ wise-webapp/src/main/webapp/WEB-INF/web.xml | 2 +- .../webapp/WEB-INF/wisemapping-nservlet.xml | 7 ++ .../webapp/WEB-INF/wisemapping-servlet.xml | 46 +----------- 6 files changed, 60 insertions(+), 118 deletions(-) delete mode 100755 wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java create mode 100644 wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java b/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java deleted file mode 100755 index adc518c8..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/controller/LoginController.java +++ /dev/null @@ -1,72 +0,0 @@ -/* -* Copyright [2011] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package com.wisemapping.controller; - -import com.wisemapping.model.UserLogin; -import com.wisemapping.model.User; -import com.wisemapping.security.Utils; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Calendar; - -public class LoginController - extends BaseMultiActionController { - private String driver; - - protected ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest request, HttpServletResponse httpServletResponse) throws Exception { - // Reload user only in case of beeing necessary... - final User user = Utils.getUser(request); - - ModelAndView result; - if (user != null) { - result = new ModelAndView("forward:/c/maps/"); - - } else { - result = new ModelAndView("login"); - result.addObject("isHsql", driver.indexOf("hsql")!=-1); - } - - return result; - } - - public ModelAndView auditLogin(HttpServletRequest request, HttpServletResponse response) { - logger.info("Login Controller: auditLogin"); - - final String username = request.getUserPrincipal().getName(); - - final UserLogin userLogin = new UserLogin(); - final Calendar now = Calendar.getInstance(); - userLogin.setLoginDate(now); - userLogin.setEmail(username); - //userManager.auditLogin(userLogin); - - return new ModelAndView("forward:/c/maps/"); - } - - public void setDriver(String driver) { - this.driver = driver; - } - - public String getDriver() { - return driver; - } -} diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java index 356282a2..5475af8e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java @@ -21,6 +21,7 @@ package com.wisemapping.ncontroller; import com.wisemapping.model.MindMap; import com.wisemapping.service.MindmapService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; @@ -29,6 +30,7 @@ import java.io.IOException; @Controller public class ExtensionsController { + @Qualifier("mindmapService") @Autowired private MindmapService mindmapService; diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java new file mode 100644 index 00000000..2af6c8a5 --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java @@ -0,0 +1,49 @@ +/* +* Copyright [2011] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package com.wisemapping.ncontroller; + +import com.wisemapping.model.User; +import com.wisemapping.security.Utils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; + +@Controller +public class LoginController { + + @Value("${database.driver}") + private String driver; + + @RequestMapping(value = "login", method = RequestMethod.GET) + protected ModelAndView showLoginPage(HttpServletRequest request) { + final User user = Utils.getUser(request); + ModelAndView result; + if (user != null) { + result = new ModelAndView("forward:/c/maps/"); + } else { + result = new ModelAndView("login"); + result.addObject("isHsql", driver.indexOf("hsql") != -1); + } + return result; + } +} diff --git a/wise-webapp/src/main/webapp/WEB-INF/web.xml b/wise-webapp/src/main/webapp/WEB-INF/web.xml index a01fafaa..94d8e02a 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/web.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/web.xml @@ -90,8 +90,8 @@ contextConfigLocation + /WEB-INF/wisemapping-nservlet.xml - /WEB-INF/wisemapping-servlet.xml diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml index aa6b4c80..1706ec48 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml @@ -15,6 +15,7 @@ + @@ -60,6 +61,12 @@ + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index 6e5d2349..5871a7b3 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -3,37 +3,7 @@ - - - - - - - - - - - - - - - - tryEditor - installCFG - - - - - - - - - - - - + @@ -88,19 +58,6 @@ - - - - - - - - - - - - @@ -121,7 +78,6 @@ changePasswordController settingsController editProfileController - historyController