Author: brett
Date: Wed Jul 5 23:25:42 2006
New Revision: 419461
URL: http://svn.apache.org/viewvc?rev=419461&view=rev
Log:
upgrade to webwork 2.2.2
Modified:
maven/repository-manager/trunk/maven-repository-webapp/pom.xml
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
Modified: maven/repository-manager/trunk/maven-repository-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/pom.xml?rev=419461&r1=419460&r2=419461&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-webapp/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-webapp/pom.xml Wed Jul 5
23:25:42 2006
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-xwork-integration</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.repository</groupId>
@@ -125,4 +125,10 @@
</plugin>
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>codehaus.snapshots</id>
+ <url>http://snapshots.repository.codehaus.org</url>
+ </repository>
+ </repositories>
</project>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp?rev=419461&r1=419460&r2=419461&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp
Wed Jul 5 23:25:42 2006
@@ -14,7 +14,7 @@
~ limitations under the License.
--%>
-<%@ taglib uri="webwork" prefix="ww" %>
+<%@ taglib uri="/webwork" prefix="ww" %>
<html>
<head>
<title>Maven Repository Manager</title>
@@ -25,13 +25,13 @@
<h1>Maven Repository Manager</h1>
<%@ include file="form.jspf" %>
-<p/>
+<p />
<%@ include file="indexconfig.jsp" %>
-<p/>
+<p />
-<p/>
+<p />
<%@ include file="schedulerconfig.jsp" %>
-<p/>
+<p />
</body>
</html>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp?rev=419461&r1=419460&r2=419461&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp
Wed Jul 5 23:25:42 2006
@@ -15,22 +15,26 @@
~
--%>
-<%@ taglib uri="webwork" prefix="ww" %>
+<%@ taglib uri="/webwork" prefix="ww" %>
<br>
+
<p>
-<b>INDEX CONFIGURATION:</b>
+ <b>INDEX CONFIGURATION:</b>
</p>
<form action="configureIndex.action" method="post">
- Index Path: <input type="text" name="indexPath" value="<ww:property
value="parameters.indexPath"/>"/>
+ Index Path: <input type="text" name="indexPath" value="<ww:property
value="parameters.indexPath"/>" />
<br>
- Minimal Index Path: <input type="text" name="minimalIndexPath"
value="<ww:property value="parameters.minimalIndexPath"/>"/>
+ Minimal Index Path: <input type="text" name="minimalIndexPath"
+ value="<ww:property
value="parameters.minimalIndexPath"/>" />
<br>
- Blacklist Patterns: <input type="text" name="discoveryBlacklistPatterns"
value="<ww:property value="parameters.discoveryBlacklistPatterns"/>"/>
+ Blacklist Patterns: <input type="text" name="discoveryBlacklistPatterns"
+ value="<ww:property
value="parameters.discoveryBlacklistPatterns"/>" />
<br>
- Discover Snapshots: <input type="text" name="discoverSnapshots"
value="<ww:property value="parameters.discoverSnapshots"/>"/>
- <input type="submit" value="Update"/>
+ Discover Snapshots: <input type="text" name="discoverSnapshots"
+ value="<ww:property
value="parameters.discoverSnapshots"/>" />
+ <input type="submit" value="Update" />
</form>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp?rev=419461&r1=419460&r2=419461&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp
Wed Jul 5 23:25:42 2006
@@ -15,16 +15,18 @@
~
--%>
-<%@ taglib uri="webwork" prefix="ww" %>
+<%@ taglib uri="/webwork" prefix="ww" %>
<br>
+
<p>
-<b>SCHEDULER CONFIGURATION:</b>
+ <b>SCHEDULER CONFIGURATION:</b>
</p>
<form action="configureScheduler.action" method="post">
- Cron Expression: <input type="text" name="discoveryCronExpression"
value="<ww:property value="parameters.discoveryCronExpression"/>"/>
- <input type="submit" value="Update"/>
+ Cron Expression: <input type="text" name="discoveryCronExpression"
+ value="<ww:property
value="parameters.discoveryCronExpression"/>" />
+ <input type="submit" value="Update" />
</form>
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml?rev=419461&r1=419460&r2=419461&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml
Wed Jul 5 23:25:42 2006
@@ -22,36 +22,50 @@
<display-name>Maven Repository Manager</display-name>
<filter>
+ <filter-name>plexus</filter-name>
+ <filter-class>org.codehaus.plexus.xwork.PlexusFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>webwork-cleanup</filter-name>
+
<filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+ </filter>
+
+ <filter>
<filter-name>sitemesh</filter-name>
<filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
</filter>
+ <filter>
+ <filter-name>webwork</filter-name>
+
<filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ </filter>
+
+ <!-- this must be before the webwork filter -->
<filter-mapping>
- <filter-name>sitemesh</filter-name>
+ <filter-name>plexus</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- <listener>
-
<listener-class>org.codehaus.plexus.servlet.PlexusServletContextListener</listener-class>
- </listener>
+ <!-- this must be before the sitemesh filter -->
+ <filter-mapping>
+ <filter-name>webwork-cleanup</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
- <listener>
-
<listener-class>org.codehaus.plexus.webwork.servlet.PlexusWebWorkApplicationLifecycleListener</listener-class>
- </listener>
+ <filter-mapping>
+ <filter-name>sitemesh</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>webwork</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<listener>
-
<listener-class>org.codehaus.plexus.webwork.servlet.PlexusWebWorkSessionLifecycleListener</listener-class>
+
<listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
</listener>
-
- <servlet>
- <servlet-name>webwork</servlet-name>
-
<servlet-class>com.opensymphony.webwork.dispatcher.ServletDispatcher</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>webwork</servlet-name>
- <url-pattern>*.action</url-pattern>
- </servlet-mapping>
<welcome-file-list>
<welcome-file>index.action</welcome-file>
