From: Brett Porter Date: Thu, 6 Jul 2006 06:25:42 +0000 (+0000) Subject: upgrade to webwork 2.2.2 X-Git-Tag: archiva-0.9-alpha-1~791 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d2ddbae672c96833bafebb201634d00bac8407d;p=archiva.git upgrade to webwork 2.2.2 git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@419461 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml index 4d3a7abfa..8b7445d82 100644 --- a/maven-repository-webapp/pom.xml +++ b/maven-repository-webapp/pom.xml @@ -40,7 +40,7 @@ org.codehaus.plexus plexus-xwork-integration - 1.0-alpha-1 + 1.0-alpha-2-SNAPSHOT org.apache.maven.repository @@ -125,4 +125,10 @@ + + + codehaus.snapshots + http://snapshots.repository.codehaus.org + + diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp index 2f3b75f76..7e3203181 100644 --- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp @@ -14,7 +14,7 @@ ~ limitations under the License. --%> -<%@ taglib uri="webwork" prefix="ww" %> +<%@ taglib uri="/webwork" prefix="ww" %> Maven Repository Manager @@ -25,13 +25,13 @@

Maven Repository Manager

<%@ include file="form.jspf" %> -

+

<%@ include file="indexconfig.jsp" %> -

+

-

+

<%@ include file="schedulerconfig.jsp" %> -

+

diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp index 36552830a..75de3ee81 100644 --- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp @@ -15,22 +15,26 @@ ~ --%> -<%@ taglib uri="webwork" prefix="ww" %> +<%@ taglib uri="/webwork" prefix="ww" %>
+

-INDEX CONFIGURATION: + INDEX CONFIGURATION:

- Index Path: "/> + Index Path: " />
- Minimal Index Path: "/> + Minimal Index Path: " />
- Blacklist Patterns: "/> + Blacklist Patterns: " />
- Discover Snapshots: "/> - + Discover Snapshots: " /> +
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp index 5f278578f..77591a77e 100644 --- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp @@ -15,16 +15,18 @@ ~ --%> -<%@ taglib uri="webwork" prefix="ww" %> +<%@ taglib uri="/webwork" prefix="ww" %>
+

-SCHEDULER CONFIGURATION: + SCHEDULER CONFIGURATION:

- Cron Expression: "/> - + Cron Expression: " /> +
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml b/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml index 847a49e3d..cb00405bb 100644 --- a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml @@ -21,38 +21,52 @@ Maven Repository Manager + + plexus + org.codehaus.plexus.xwork.PlexusFilter + + + + webwork-cleanup + com.opensymphony.webwork.dispatcher.ActionContextCleanUp + + sitemesh com.opensymphony.module.sitemesh.filter.PageFilter + + webwork + com.opensymphony.webwork.dispatcher.FilterDispatcher + + + - sitemesh + plexus /* - - org.codehaus.plexus.servlet.PlexusServletContextListener - + + + webwork-cleanup + /* + - - org.codehaus.plexus.webwork.servlet.PlexusWebWorkApplicationLifecycleListener - + + sitemesh + /* + + + + webwork + /* + - org.codehaus.plexus.webwork.servlet.PlexusWebWorkSessionLifecycleListener + org.codehaus.plexus.xwork.PlexusLifecycleListener - - webwork - com.opensymphony.webwork.dispatcher.ServletDispatcher - - - - webwork - *.action - - index.action index.jsp