From 303eb9f66dd602cb24e1364b093f4dbafc7c159b Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Thu, 1 Aug 2013 06:04:23 +0000 Subject: [PATCH] WW-3872 Moves files to appropriate locations git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1509085 13f79535-47bb-0310-9956-ffa450edef68 --- apps/portlet/pom.xml | 4 ++++ ...-processTilesFreemarkerExample-validation.xml | 0 .../portlet/src}/main/resources/struts-tiles.xml | 0 apps/portlet/src/main/resources/struts.xml | 1 + .../portlet/src}/main/webapp/WEB-INF/tiles.xml | 0 .../src/main/webapp/WEB-INF/view/index.jsp | 1 + apps/portlet/src/main/webapp/WEB-INF/web.xml | 16 ++++++++++++++++ .../portlet/src/main/webapp}/tiles/footer.ftl | 0 .../portlet/src/main/webapp}/tiles/footer.jsp | 0 .../src/main/webapp}/tiles/formExample.jsp | 0 .../webapp}/tiles/formExampleInputValidation.jsp | 0 .../portlet/src/main/webapp}/tiles/header.jsp | 0 .../portlet/src/main/webapp}/tiles/index.jsp | 0 .../portlet/src/main/webapp}/tiles/layout.jsp | 0 pom.xml | 5 +++++ 15 files changed, 27 insertions(+) rename {src => apps/portlet/src}/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml (100%) rename {src => apps/portlet/src}/main/resources/struts-tiles.xml (100%) rename {src => apps/portlet/src}/main/webapp/WEB-INF/tiles.xml (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/footer.ftl (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/footer.jsp (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/formExample.jsp (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/formExampleInputValidation.jsp (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/header.jsp (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/index.jsp (100%) rename {src/main/webapp/WEB-INF => apps/portlet/src/main/webapp}/tiles/layout.jsp (100%) diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index a28f77bba..346fb1a93 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -109,6 +109,10 @@ org.apache.struts struts2-dwr-plugin + + org.apache.struts + struts2-portlet-tiles-plugin + org.apache.velocity diff --git a/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml similarity index 100% rename from src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml rename to apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml diff --git a/src/main/resources/struts-tiles.xml b/apps/portlet/src/main/resources/struts-tiles.xml similarity index 100% rename from src/main/resources/struts-tiles.xml rename to apps/portlet/src/main/resources/struts-tiles.xml diff --git a/apps/portlet/src/main/resources/struts.xml b/apps/portlet/src/main/resources/struts.xml index bbdb26000..ae41f3707 100644 --- a/apps/portlet/src/main/resources/struts.xml +++ b/apps/portlet/src/main/resources/struts.xml @@ -8,4 +8,5 @@ + diff --git a/src/main/webapp/WEB-INF/tiles.xml b/apps/portlet/src/main/webapp/WEB-INF/tiles.xml similarity index 100% rename from src/main/webapp/WEB-INF/tiles.xml rename to apps/portlet/src/main/webapp/WEB-INF/tiles.xml diff --git a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp index d7ad46784..217b158af 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp +++ b/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp @@ -12,6 +12,7 @@ Here you'll find examples of what is possible with the Struts Portlet integratio
  • ">File upload
  • ">FreeMarker
  • ">Velocity
    • +
  • ">Form Example Validation with Tiles
  • ">Go to edit mode and see what's there
  • ">Go to help mode and see what's there
    • diff --git a/apps/portlet/src/main/webapp/WEB-INF/web.xml b/apps/portlet/src/main/webapp/WEB-INF/web.xml index ff7019458..f42441989 100644 --- a/apps/portlet/src/main/webapp/WEB-INF/web.xml +++ b/apps/portlet/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,16 @@ + + + org.apache.tiles.factory.TilesContainerFactory + org.apache.struts2.tiles.StrutsTilesContainerFactory + + + org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG + /WEB-INF/tiles.xml + + contextConfigLocation @@ -12,4 +22,10 @@ org.springframework.web.context.ContextLoaderListener + + + org.apache.struts2.tiles.StrutsTilesListener + + + diff --git a/src/main/webapp/WEB-INF/tiles/footer.ftl b/apps/portlet/src/main/webapp/tiles/footer.ftl similarity index 100% rename from src/main/webapp/WEB-INF/tiles/footer.ftl rename to apps/portlet/src/main/webapp/tiles/footer.ftl diff --git a/src/main/webapp/WEB-INF/tiles/footer.jsp b/apps/portlet/src/main/webapp/tiles/footer.jsp similarity index 100% rename from src/main/webapp/WEB-INF/tiles/footer.jsp rename to apps/portlet/src/main/webapp/tiles/footer.jsp diff --git a/src/main/webapp/WEB-INF/tiles/formExample.jsp b/apps/portlet/src/main/webapp/tiles/formExample.jsp similarity index 100% rename from src/main/webapp/WEB-INF/tiles/formExample.jsp rename to apps/portlet/src/main/webapp/tiles/formExample.jsp diff --git a/src/main/webapp/WEB-INF/tiles/formExampleInputValidation.jsp b/apps/portlet/src/main/webapp/tiles/formExampleInputValidation.jsp similarity index 100% rename from src/main/webapp/WEB-INF/tiles/formExampleInputValidation.jsp rename to apps/portlet/src/main/webapp/tiles/formExampleInputValidation.jsp diff --git a/src/main/webapp/WEB-INF/tiles/header.jsp b/apps/portlet/src/main/webapp/tiles/header.jsp similarity index 100% rename from src/main/webapp/WEB-INF/tiles/header.jsp rename to apps/portlet/src/main/webapp/tiles/header.jsp diff --git a/src/main/webapp/WEB-INF/tiles/index.jsp b/apps/portlet/src/main/webapp/tiles/index.jsp similarity index 100% rename from src/main/webapp/WEB-INF/tiles/index.jsp rename to apps/portlet/src/main/webapp/tiles/index.jsp diff --git a/src/main/webapp/WEB-INF/tiles/layout.jsp b/apps/portlet/src/main/webapp/tiles/layout.jsp similarity index 100% rename from src/main/webapp/WEB-INF/tiles/layout.jsp rename to apps/portlet/src/main/webapp/tiles/layout.jsp diff --git a/pom.xml b/pom.xml index 12631e10f..cff66f7be 100644 --- a/pom.xml +++ b/pom.xml @@ -346,6 +346,11 @@ struts2-dwr-plugin ${project.version}     + + org.apache.struts + struts2-portlet-tiles-plugin + ${project.version} + org.apache.struts struts2-junit-plugin