]> source.dussan.org Git - archiva.git/commitdiff
projects / archiva.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e8d7cd7)
upgrade to webwork 2.2.2
authorBrett Porter <brett@apache.org>
Thu, 6 Jul 2006 06:25:42 +0000 (06:25 +0000)
committerBrett Porter <brett@apache.org>
Thu, 6 Jul 2006 06:25:42 +0000 (06:25 +0000)
git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@419461 13f79535-47bb-0310-9956-ffa450edef68

maven-repository-webapp/pom.xml patch | blob | history
maven-repository-webapp/src/main/webapp/WEB-INF/jsp/index.jsp patch | blob | history
maven-repository-webapp/src/main/webapp/WEB-INF/jsp/indexconfig.jsp patch | blob | history
maven-repository-webapp/src/main/webapp/WEB-INF/jsp/schedulerconfig.jsp patch | blob | history
maven-repository-webapp/src/main/webapp/WEB-INF/web.xml patch | blob | history

diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml
index 4d3a7abfac411d10bed209c15b3e3c3e3d368a57..8b7445d82acc1d255e6a6231ee209615f52f6eb8 100644 (file)
--- a/maven-repository-webapp/pom.xml
+++ b/maven-repository-webapp/pom.xml
@@ -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>
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 2f3b75f764a1fb685c583dc433aabaf2a7143487..7e3203181d0c2afa41278874d182cd30721bd819 100644 (file)
--- 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" %>
 <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>
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 36552830a9fc7c89cd5bcd501d590690a1c8e9ad..75de3ee812c7864eebb0641e513de0c41a6c350f 100644 (file)
--- 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" %>
 
 <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>
 
 
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 5f278578f6652164bb80015828676ac05306cbf4..77591a77e807021e04ecc2da773154d107502e8c 100644 (file)
--- 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 @@
   ~\r
   --%>\r
 \r
-<%@ taglib uri="webwork" prefix="ww" %>\r
+<%@ taglib uri="/webwork" prefix="ww" %>\r
 \r
 <br>\r
+\r
 <p>\r
-<b>SCHEDULER CONFIGURATION:</b>\r
+  <b>SCHEDULER CONFIGURATION:</b>\r
 </p>\r
 \r
 <form action="configureScheduler.action" method="post">\r
-  Cron Expression: <input type="text" name="discoveryCronExpression" value="<ww:property value="parameters.discoveryCronExpression"/>"/>\r
-  <input type="submit" value="Update"/>\r
+  Cron Expression: <input type="text" name="discoveryCronExpression"\r
+                          value="<ww:property value="parameters.discoveryCronExpression"/>" />\r
+  <input type="submit" value="Update" />\r
 </form>\r
 \r
 \r
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 847a49e3d902b9a5a94634035f4b5a59dae7ffa7..cb00405bb74d9c17be3cdd54e1af140e11851137 100644 (file)
--- 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 @@
 <web-app>
   <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>
     <welcome-file>index.jsp</welcome-file>
Apache Archiva Repository: https://github.com/apache/archiva