From 2b4953ea11530451e64303ce7eb6075856e84d44 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Fri, 25 May 2012 12:31:09 -0300 Subject: [PATCH] Migrate some pages to new Spring Annotations schema. --- .../controller/KeyboardController.java | 36 -------- .../controller/PublicPagesController.java | 82 ------------------- .../ncontroller/ExtensionsController.java | 63 ++++++++++++++ .../ncontroller/PublicPagesController.java | 62 ++++++++++++++ .../webapp/WEB-INF/wisemapping-servlet.xml | 26 ++---- 5 files changed, 134 insertions(+), 135 deletions(-) delete mode 100644 wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java delete mode 100644 wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java create mode 100644 wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java create mode 100644 wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java b/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java deleted file mode 100644 index 7fa8f39f..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/controller/KeyboardController.java +++ /dev/null @@ -1,36 +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 org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class KeyboardController extends BaseMultiActionController { - public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return newsPage(httpServletRequest, httpServletResponse); - } - - public ModelAndView newsPage(HttpServletRequest request, HttpServletResponse response) { - logger.info("Keyboard"); - return new ModelAndView("keyboard"); - } -} diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java deleted file mode 100644 index 317f77fd..00000000 --- a/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java +++ /dev/null @@ -1,82 +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 org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.wisemapping.model.MindMap; - -public class PublicPagesController extends BaseMultiActionController { - - public ModelAndView handleNoSuchRequestHandlingMethod(NoSuchRequestHandlingMethodException noSuchRequestHandlingMethodException, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return this.home(httpServletRequest, httpServletResponse); - } - - public ModelAndView faq(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("faq"); - } - - public ModelAndView aboutUs(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("aboutUs"); - } - - public ModelAndView video(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("video"); - } - - public ModelAndView crew(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("crew"); - } - - public ModelAndView privacyPolicy(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("privacyPolicy"); - } - - public ModelAndView installCFG(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("installCFG"); - } - - public ModelAndView home(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("homepage"); - } - - public ModelAndView tryEditor(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - - final MindMap mindmap = getMindmapService().getMindmapById(TRY_EXAMPLE_MINDMAP_ID); - - ModelAndView view = new ModelAndView("mindmapEditor", "mindmap", mindmap); - final String xmlMap = mindmap.getXmlAsJsLiteral(); - view.addObject(MAP_XML_PARAM, xmlMap); - view.addObject("editorTryMode", true); - view.addObject("showHelp", true); - return view; - } - - public ModelAndView termsOfUse(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { - return new ModelAndView("termsOfUse"); - } - - public static final int TRY_EXAMPLE_MINDMAP_ID = 3; - public static final String MAP_XML_PARAM = "mapXml"; - -} diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java new file mode 100644 index 00000000..251f7cca --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java @@ -0,0 +1,63 @@ +/* +* 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.MindMap; +import com.wisemapping.service.MindmapService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import java.io.IOException; + +@Controller +@RequestMapping("/c/") +public class ExtensionsController { + @Autowired + private MindmapService mindmapService; + + @RequestMapping(value = "try") + public ModelAndView tryEditor() throws IOException { + + final MindMap mindmap = mindmapService.getMindmapById(TRY_EXAMPLE_MINDMAP_ID); + + ModelAndView view = new ModelAndView("mindmapEditor", "mindmap", mindmap); + final String xmlMap = mindmap.getXmlAsJsLiteral(); + view.addObject(MAP_XML_PARAM, xmlMap); + view.addObject("editorTryMode", true); + view.addObject("showHelp", true); + return view; + } + + @RequestMapping(value = "privacyPolicy") + public ModelAndView privacyPolicy() { + return new ModelAndView("privacyPolicy"); + } + + @RequestMapping(value = "termsOfUse") + public ModelAndView termsOfUse() { + return new ModelAndView("termsOfUse"); + } + + + public static final int TRY_EXAMPLE_MINDMAP_ID = 3; + public static final String MAP_XML_PARAM = "mapXml"; + +} diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java new file mode 100644 index 00000000..1fddd7b5 --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java @@ -0,0 +1,62 @@ +/* +* 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.service.MindmapService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +@Controller +@RequestMapping("/c/") +public class PublicPagesController { + @Autowired + private MindmapService mindmapService; + + @RequestMapping(value = "faq") + public ModelAndView faq() { + return new ModelAndView("faq"); + } + + @RequestMapping(value = "aboutUs") + public ModelAndView aboutUs() { + return new ModelAndView("aboutUs"); + } + + @RequestMapping(value = "crew") + public ModelAndView crew() { + return new ModelAndView("crew"); + } + + @RequestMapping(value = "installCFG") + public ModelAndView installCFG() { + return new ModelAndView("installCFG"); + } + + @RequestMapping(value = "keyboard") + public ModelAndView newsPage() { + return new ModelAndView("keyboard"); + } + + @RequestMapping(value = "home") + public ModelAndView home() { + return new ModelAndView("homepage"); + } +} 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 d89d2494..fb5dc2bf 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -14,7 +14,7 @@ - + @@ -26,11 +26,6 @@ - - - - - @@ -131,7 +126,7 @@ - + @@ -166,11 +161,6 @@ - - - - - @@ -190,9 +180,15 @@ + importMapController + + + publicView + embeddedView + + userController sharingController - homeController loginController forgotPasswordController activationController @@ -201,11 +197,7 @@ settingsController editProfileController tagsController - publicView - embeddedView - importMapController historyController - homeController