From 8a638e8de653814700f9c76939f8474e635322a6 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 16 Jun 2012 14:32:26 -0300 Subject: [PATCH] - Migrate to Tile2.0 removing the dependecy with Struts. --- wise-webapp/pom.xml | 18 +- .../main/webapp/WEB-INF/defs/definitions.xml | 345 +++++++++--------- .../webapp/WEB-INF/wisemapping-nservlet.xml | 8 +- .../main/webapp/jsp/dialogFullTemplate.jsp | 42 +-- .../src/main/webapp/jsp/dialogTemplate.jsp | 19 +- .../src/main/webapp/jsp/iframeWrapper.jsp | 52 +-- wise-webapp/src/main/webapp/jsp/login.jsp | 2 +- wise-webapp/src/main/webapp/jsp/template.jsp | 4 +- 8 files changed, 237 insertions(+), 253 deletions(-) diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index c0811c8f..1b42b483 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -101,12 +101,6 @@ ${org.springframework.version} compile - - org.springframework - spring-struts - ${org.springframework.version} - runtime - javax.xml.bind jaxb-api @@ -141,16 +135,10 @@ runtime - org.apache.struts - struts-tiles - 1.3.8 + org.apache.tiles + tiles-jsp + 2.1.4 runtime - - - antlr - antlr - - org.springframework diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml index 50c7464e..d4aa1e44 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml @@ -1,174 +1,171 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 d94c86fd..91af3751 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml @@ -33,11 +33,11 @@ - - + + - + /WEB-INF/defs/definitions.xml @@ -76,7 +76,7 @@ /c/keyboard /c/renameMap /c/embeddedView - /c/forgotPassword + /c/user/resetPassword diff --git a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp index 79cf6c00..5c6a8c9d 100644 --- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp @@ -1,21 +1,21 @@ -<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> -<%@ include file="/jsp/init.jsp" %> - - - - - - - - - - - - - - -
- -
- - +<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> +<%@ include file="/jsp/init.jsp" %> + + + + + + + + + + + + + + +
+ +
+ + diff --git a/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp index 16bba939..aad76fc0 100644 --- a/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp @@ -1,11 +1,10 @@ -<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> - -<%@ include file="/jsp/init.jsp" %> - - - - -
- - +<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> + +<%@ include file="/jsp/init.jsp" %> + + + + +
+
\ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp index 13672749..fdf1f340 100644 --- a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp +++ b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp @@ -1,27 +1,27 @@ -<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> -<%@ include file="/jsp/init.jsp" %> - -
- -
- - -
-
- - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index 6a3d0168..ec38b153 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -55,7 +55,7 @@
- "> + "> diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp index 31eec2d7..dd503c64 100644 --- a/wise-webapp/src/main/webapp/jsp/template.jsp +++ b/wise-webapp/src/main/webapp/jsp/template.jsp @@ -1,6 +1,6 @@ <%@page pageEncoding="UTF-8" %> -<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> <%@ include file="/jsp/init.jsp" %> @@ -37,7 +37,7 @@
- +