svn commit: r398640 - in /incubator/webwork2/webapps: portlet/src/main/etc/exo/ portlet/src/main/etc/gridsphere/ portlet/src/main/etc/jbossportal2.0/ portlet/src/main/etc/jbossportal2.2/ portlet/src/m
Author: mrdon Date: Mon May 1 10:39:18 2006 New Revision: 398640 URL: http://svn.apache.org/viewcvs?rev=398640&view=rev Log: Changing webapp copyrights, removing OS copyrights, added Apache copyrights to dtree scripts (license acceptable for distribution) Modified: incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml incubator/webwork2/webapps/portlet/src/main/etc/liferay3.6.1/web.xml incubator/webwork2/webapps/portlet/src/main/java/xwork.xml incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/applicationContext.xml incubator/webwork2/webapps/portlet/src/main/webapp/WEB-INF/dwr.xml incubator/webwork2/webapps/shopping-cart/src/main/webapp/css/dtree.css incubator/webwork2/webapps/shopping-cart/src/main/webapp/js/dtree.js incubator/webwork2/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml incubator/webwork2/webapps/showcase/src/main/webapp/styles/forms.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/layout-navtop-1col.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/layout-navtop-localleft.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/layout.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/main.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/nav-horizontal.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/tools.css incubator/webwork2/webapps/showcase/src/main/webapp/styles/typo.css Modified: incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml?rev=398640&r1=398639&r2=398640&view=diff == --- incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml (original) +++ incubator/webwork2/webapps/portlet/src/main/etc/exo/web.xml Mon May 1 10:39:18 2006 @@ -1,8 +1,4 @@ - http://java.sun.com/dtd/web-app_2_3.dtd";> struts-portlet Modified: incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml?rev=398640&r1=398639&r2=398640&view=diff == --- incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml (original) +++ incubator/webwork2/webapps/portlet/src/main/etc/gridsphere/web.xml Mon May 1 10:39:18 2006 @@ -1,8 +1,4 @@ - http://java.sun.com/dtd/web-app_2_3.dtd";> struts-portlet Modified: incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml?rev=398640&r1=398639&r2=398640&view=diff == --- incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml (original) +++ incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml Mon May 1 10:39:18 2006 @@ -1,7 +1,3 @@ - struts-portlet Modified: incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml?rev=398640&r1=398639&r2=398640&view=diff == --- incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml (original) +++ incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml Mon May 1 10:39:18 2006 @@ -1,8 +1,4 @@ - StrutsPortlet Modified: incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml?rev=398640&r1=398639&r2=398640&view=diff == -
svn commit: r398643 - /incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitAjaxTest.java
Author: mrdon Date: Mon May 1 10:43:30 2006 New Revision: 398643 URL: http://svn.apache.org/viewcvs?rev=398643&view=rev Log: Removing test class with other copyright. When the grant comes it, we can add it back. Removed: incubator/webwork2/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitAjaxTest.java
svn commit: r400350 - in /struts/site/src/site: site.xml xdoc/javadoc.xml
Author: mrdon Date: Sat May 6 12:02:13 2006 New Revision: 400350 URL: http://svn.apache.org/viewcvs?rev=400350&view=rev Log: Fixed Javadoc links, started adding in Action 2, minor link reorgs Modified: struts/site/src/site/site.xml struts/site/src/site/xdoc/javadoc.xml Modified: struts/site/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/site/src/site/site.xml?rev=400350&r1=400349&r2=400350&view=diff == --- struts/site/src/site/site.xml (original) +++ struts/site/src/site/site.xml Sat May 6 12:02:13 2006 @@ -13,9 +13,9 @@ http://www.apache.org"; /> -http://struts.apache.org/struts-action"; /> +http://struts.apache.org/struts-action"; /> +http://struts.apache.org/struts-action2"; /> http://struts.apache.org/struts-shale"; /> -http://struts.apache.org/struts-tiles"; /> @@ -65,15 +65,16 @@ -http://struts.apache.org/struts-action/index.html"/> +http://struts.apache.org/struts-action/index.html"/> +http://struts.apache.org/struts-action2/index.html"/> http://struts.apache.org/struts-shale/index.html"/> - -http://struts.apache.org/struts-sandbox/index.html"/> - - +http://struts.apache.org/struts-sandbox/index.html"; +/> http://struts.apache.org/struts-doc-1.0.2/index.html"; -/> - - - -http://incubator.apache.org/projects/webwork2.html"; -/> -http://confluence.twdata.org/"; /> Modified: struts/site/src/site/xdoc/javadoc.xml URL: http://svn.apache.org/viewcvs/struts/site/src/site/xdoc/javadoc.xml?rev=400350&r1=400349&r2=400350&view=diff == --- struts/site/src/site/xdoc/javadoc.xml (original) +++ struts/site/src/site/xdoc/javadoc.xml Sat May 6 12:02:13 2006 @@ -29,26 +29,14 @@ -Struts -Action Framework +Struts +Action Framework 1 Struts Shale Framework - - - - -Struts -Sandbox - - - - -Struts -Tiles
svn commit: r400377 - /struts/action/trunk/src/site/xdoc/userGuide/dev_validator.xml
Author: mrdon Date: Sat May 6 16:20:03 2006 New Revision: 400377 URL: http://svn.apache.org/viewcvs?rev=400377&view=rev Log: Starting to move validator guide` Added: struts/action/trunk/src/site/xdoc/userGuide/dev_validator.xml - copied unchanged from r400370, struts/action/trunk/taglib/src/site/xdoc/dev_validator.xml
svn commit: r400380 - in /struts/action/trunk: apps/src/site/ el/src/site/ el/src/site/xdoc/ extras/src/site/ faces/src/site/ faces/src/site/xdoc/ scripting/src/site/ scripting/src/site/xdoc/ src/site
Author: mrdon
Date: Sat May 6 17:59:42 2006
New Revision: 400380
URL: http://svn.apache.org/viewcvs?rev=400380&view=rev
Log:
Trying to cleanup the Struts Action 1 site by adding consistent
submenus, consistent titles, fix blank pages, moving validator to
faqs, moving design whiteboards to wiki, etc
Added:
struts/action/trunk/src/site/xdoc/faqs/validator.xml
- copied unchanged from r400377,
struts/action/trunk/src/site/xdoc/userGuide/dev_validator.xml
Removed:
struts/action/trunk/src/site/xdoc/userGuide/dev_validator.xml
struts/action/trunk/taglib/src/site/xdoc/dev_validator.xml
Modified:
struts/action/trunk/apps/src/site/site.xml
struts/action/trunk/el/src/site/site.xml
struts/action/trunk/el/src/site/xdoc/index.xml
struts/action/trunk/extras/src/site/site.xml
struts/action/trunk/faces/src/site/site.xml
struts/action/trunk/faces/src/site/xdoc/index.xml
struts/action/trunk/scripting/src/site/site.xml
struts/action/trunk/scripting/src/site/xdoc/index.xml
struts/action/trunk/src/site/site.xml
struts/action/trunk/src/site/xdoc/faqs/index.xml
struts/action/trunk/src/site/xdoc/index.xml
struts/action/trunk/src/site/xdoc/roadmap.xml
struts/action/trunk/taglib/src/site/site.xml
struts/action/trunk/taglib/src/site/xdoc/index.xml
struts/action/trunk/tiles/src/site/site.xml
struts/action/trunk/tiles/src/site/xdoc/index.xml
Modified: struts/action/trunk/apps/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/src/site/site.xml?rev=400380&r1=400379&r2=400380&view=diff
==
--- struts/action/trunk/apps/src/site/site.xml (original)
+++ struts/action/trunk/apps/src/site/site.xml Sat May 6 17:59:42 2006
@@ -13,20 +13,11 @@
http://www.apache.org"; />
-http://struts.apache.org/struts-action";
/>
+http://struts.apache.org/struts-action"; />
+http://struts.apache.org/struts-action2"; />
http://struts.apache.org/struts-shale"; />
-http://struts.apache.org/struts-tiles"; />
-
-http://struts.apache.org/"/>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://struts.apache.org/"/>
+
${modules}
Modified: struts/action/trunk/el/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/el/src/site/site.xml?rev=400380&r1=400379&r2=400380&view=diff
==
--- struts/action/trunk/el/src/site/site.xml (original)
+++ struts/action/trunk/el/src/site/site.xml Sat May 6 17:59:42 2006
@@ -13,9 +13,9 @@
http://www.apache.org"; />
-http://struts.apache.org/struts-action";
/>
+http://struts.apache.org/struts-action"; />
+http://struts.apache.org/struts-action2"; />
http://struts.apache.org/struts-shale"; />
-http://struts.apache.org/struts-tiles"; />
@@ -28,9 +28,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://struts.apache.org/"/>
+
Modified: struts/action/trunk/el/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/el/src/site/xdoc/index.xml?rev=400380&r1=400379&r2=400380&view=diff
==
--- struts/action/trunk/el/src/site/xdoc/index.xml (original)
+++ struts/action/trunk/el/src/site/xdoc/index.xml Sat May 6 17:59:42 2006
@@ -18,7 +18,7 @@
-->
-Welcome
+Struts Action 1 - EL Taglibs
Modified: struts/action/trunk/extras/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/extras/src/site/site.xml?rev=400380&r1=400379&r2=400380&view=diff
==
--- struts/action/trunk/extras/src/site/site.xml (original)
+++ struts/action/trunk/extras/src/site/site.xml Sat May 6 17:59:42 2006
@@ -13,21 +13,49 @@
http://www.apache.org"; />
-http://struts.apache.org/struts-action";
/>
+http://struts.apac
svn commit: r400381 - /struts/action/trunk/src/site/xdoc/milestones.xml
Author: mrdon Date: Sat May 6 18:00:13 2006 New Revision: 400381 URL: http://svn.apache.org/viewcvs?rev=400381&view=rev Log: Removing old milestones, content moved to roadmap Removed: struts/action/trunk/src/site/xdoc/milestones.xml
svn commit: r400382 - in /incubator/webwork2: pom.xml src/site/ src/site/site.xml src/site/xdoc/ src/site/xdoc/index.xml
Author: mrdon
Date: Sat May 6 18:15:49 2006
New Revision: 400382
URL: http://svn.apache.org/viewcvs?rev=400382&view=rev
Log:
Added a site, started Maven 2 sync with Struts pom
Added:
incubator/webwork2/src/site/
incubator/webwork2/src/site/site.xml
incubator/webwork2/src/site/xdoc/
incubator/webwork2/src/site/xdoc/index.xml
Modified:
incubator/webwork2/pom.xml
Modified: incubator/webwork2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=400382&r1=400381&r2=400382&view=diff
==
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Sat May 6 18:15:49 2006
@@ -6,9 +6,9 @@
2.0-SNAPSHOT
project
pom
-Struts Action Framework 2.0 Project
+Struts Action 2
-WebWork is a Java web-application development framework.
+Struts Action 2 is a Java web-application development framework.
It is built specifically with developer productivity and
code simplicity in mind, providing robust support for building
reusable UI templates, such as form controls, UI themes,
@@ -17,23 +17,44 @@
-The OpenSymphony Software License 1.1
-http://opensymphony.com/webwork/license.action
-
-This license is derived and fully compatible with the Apache
Software
-License - see http://www.apache.org/LICENSE.txt
-
+The Apache Software License, Version 2.0
+http://www.apache.org/licenses/LICENSE-2.0.txt
+repo
+
-http://www.opensymphony.com/webwork/
-
-OpenSymphony
-http://www.opensymphony.com/
+http://struts.apache.org
+
+Apache Software Foundation
+http://www.apache.org
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/struts/action/trunk
+
scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk
+ http://svn.apache.org/viewcvs.cgi/struts/action/trunk
+
+
JIRA
-http://jira.opensymphony.com/browse/WW
+http://issues.apache.org/struts/
+
+
+
+
+ apache-maven-test-builds
+ Apache Maven Repository (Test Builds)
+
scp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository
+
+
+apache-site
+
scp://people.apache.org/www/struts.apache.org/struts-action2/
+
+
+
+
WebWork users list
@@ -182,11 +203,6 @@
-
-
scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
-
scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
-http://svn.apache.org/repos/asf/incubator/webwork2/trunk/
-
Added: incubator/webwork2/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/site/site.xml?rev=400382&view=auto
==
--- incubator/webwork2/src/site/site.xml (added)
+++ incubator/webwork2/src/site/site.xml Sat May 6 18:15:49 2006
@@ -0,0 +1,42 @@
+
+
+
+Apache Software Foundation
+http://www.apache.org/images/asf-logo.gif
+http://www.apache.org
+
+
+Apache Struts
+http://struts.apache.org/images/struts.gif
+http://struts.apache.org
+
+
+
+http://www.apache.org"; />
+http://struts.apache.org/struts-action"; />
+http://struts.apache.org/struts-action2"; />
+http://struts.apache.org/struts-shale"; />
+
+
+
+http://struts.apache.org/downloads.html"/>
+
+
+
+
+http://svn.apache.org/viewcvs.cgi/struts/action2/trunk/?root=Apache-SVN";
+/>
+
+${reports}
+
+
Added: incubator/webwork2/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/site/xdoc/index.xml?rev=400382&view=auto
==
--- incubator/webwork2/src/site/xdoc/index.xml (added)
+++ incubator/webwork2/src/site/xdoc/index.xml Sat May 6 18:15:49 2006
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+Struts Action 2
+
+
+
+
+
+
+
+
+Struts Action 2 is a Java web-application development
framework.
+It is built specifically with developer productivity and
+code simplicity in mind, providing robust support for building
+reusable UI templates, such as form controls, UI themes,
+internationalization, dynamic form parameter mapping to JavaBeans,
+robust client and server side validation, and much more.
+
+
+
+
+
+
svn commit: r400383 - /struts/action/trunk/core/src/site/
Author: mrdon Date: Sat May 6 18:28:35 2006 New Revision: 400383 URL: http://svn.apache.org/viewcvs?rev=400383&view=rev Log: Removing the core site as it isn't used Removed: struts/action/trunk/core/src/site/
svn commit: r400385 - in /incubator/webwork2: ./ action/ core/ core/src/test/java/org/apache/struts/action2/views/jsp/ src/site/ thirdparty/ thirdparty/jasperreports/ thirdparty/jfreechart/ thirdparty
Author: mrdon Date: Sat May 6 19:32:25 2006 New Revision: 400385 URL: http://svn.apache.org/viewcvs?rev=400385&view=rev Log: Starting to synchronizing the Maven 2 build with Struts Action 1, keeping the Ant build in sync Added: incubator/webwork2/core/ - copied from r400381, incubator/webwork2/action/ Removed: incubator/webwork2/action/ Modified: incubator/webwork2/build.properties incubator/webwork2/core/pom.xml incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java incubator/webwork2/osbuild.xml incubator/webwork2/pom.xml incubator/webwork2/src/site/site.xml incubator/webwork2/thirdparty/jasperreports/pom.xml incubator/webwork2/thirdparty/jfreechart/pom.xml incubator/webwork2/thirdparty/pell-file-upload/pom.xml incubator/webwork2/thirdparty/pom.xml incubator/webwork2/webapps/blank/pom.xml incubator/webwork2/webapps/pom.xml incubator/webwork2/webapps/portlet/pom.xml incubator/webwork2/webapps/shopping-cart/pom.xml incubator/webwork2/webapps/showcase/pom.xml incubator/webwork2/webapps/starter/pom.xml Modified: incubator/webwork2/build.properties URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.properties?rev=400385&r1=400384&r2=400385&view=diff == --- incubator/webwork2/build.properties (original) +++ incubator/webwork2/build.properties Sat May 6 19:32:25 2006 @@ -1,4 +1,4 @@ -name = struts-action +name = struts-core fullname = Struts Action 2 version = 2.0-dev status = integration Modified: incubator/webwork2/core/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/core/pom.xml?rev=400385&r1=400381&r2=400385&view=diff == --- incubator/webwork2/core/pom.xml (original) +++ incubator/webwork2/core/pom.xml Sat May 6 19:32:25 2006 @@ -8,9 +8,17 @@ 2.0-SNAPSHOT org.apache.struts.action2 -action +struts-core jar -Struts Action Framework 2.0 +Struts Action 2 - Core + + + +apache-site + scp://people.apache.org/www/struts.apache.org/struts-action2/core + + + +1.1 true @@ -104,6 +104,7 @@ opensymphony sitemesh +2.2.1 true @@ -111,12 +112,14 @@ jetty org.mortbay.jetty +5.1.4 true eclipse jdtcore +3.1.0 true @@ -176,13 +179,6 @@ true - -commons-collections -commons-collections -2.1.1 -true - - xstream @@ -190,35 +186,17 @@ 1.1.2 - - -jasperreports -jasperreports -true - - - - -jfree -jfreechart -true - - -gnujaxp -gnujaxp - - - - org.apache.struts.tiles tiles-core +0.2-SNAPSHOT true commons-digester commons-digester +1.7 true @@ -226,12 +204,14 @@ portlet-api portlet-api +1.0 true org.apache.pluto pluto +1.0.1-rc4 true @@ -239,6 +219,7 @@ org.codehaus.plexus plexus-container-default +1.0-alpha-10-SNAPSHOT true @@ -246,30 +227,35 @@ org.springframework spring-beans +1.2.6 true org.springframework spring-core +1.2.6 true org.springframework spring-context +1.2.6 true org.springframework spring-web +1.2.6 true org.springframework spring-mock +1.2.6 test @@ -278,6 +264,7 @@ junit junit compile +3.8.1 true @@ -285,58 +272,68 @@ jmock jmock +1.0.1 test easymock easymock +2.0 test easymock
svn commit: r400412 - /incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
Author: mrdon
Date: Sat May 6 21:23:21 2006
New Revision: 400412
URL: http://svn.apache.org/viewcvs?rev=400412&view=rev
Log:
Adding a configuration reset to ensure altSyntax is enabled
Modified:
incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
Modified:
incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java?rev=400412&r1=400411&r2=400412&view=diff
==
---
incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
(original)
+++
incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
Sat May 6 21:23:21 2006
@@ -49,6 +49,7 @@
import org.apache.struts.action2.dispatcher.DispatcherUtils;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.util.OgnlValueStack;
+import org.apache.struts.action2.config.Configuration;
/**
*/
@@ -79,7 +80,9 @@
public void setUp() throws Exception {
super.setUp();
- mockPortletApiAvailable();
+ Configuration.reset();
+
+mockPortletApiAvailable();
stack = new OgnlValueStack();
svn commit: r400415 - in /incubator/webwork2: apps/ apps/pom.xml apps/portlet/pom.xml apps/showcase/pom.xml build.xml core/src/main/java/org/apache/struts/action2/Main.java osbuild.xml pom.xml webapps
Author: mrdon
Date: Sat May 6 21:48:10 2006
New Revision: 400415
URL: http://svn.apache.org/viewcvs?rev=400415&view=rev
Log:
Moved webapps to apps to match Struts Action 1
WW-1305
Added:
incubator/webwork2/apps/
- copied from r400413, incubator/webwork2/webapps/
Removed:
incubator/webwork2/webapps/
Modified:
incubator/webwork2/apps/pom.xml
incubator/webwork2/apps/portlet/pom.xml
incubator/webwork2/apps/showcase/pom.xml
incubator/webwork2/build.xml
incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
incubator/webwork2/osbuild.xml
incubator/webwork2/pom.xml
Modified: incubator/webwork2/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/pom.xml?rev=400415&r1=400413&r2=400415&view=diff
==
--- incubator/webwork2/apps/pom.xml (original)
+++ incubator/webwork2/apps/pom.xml Sat May 6 21:48:10 2006
@@ -22,7 +22,7 @@
apache-site
-
scp://people.apache.org/www/struts.apache.org/struts-action2/webapps
+
scp://people.apache.org/www/struts.apache.org/struts-action2/apps
Modified: incubator/webwork2/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/portlet/pom.xml?rev=400415&r1=400413&r2=400415&view=diff
==
--- incubator/webwork2/apps/portlet/pom.xml (original)
+++ incubator/webwork2/apps/portlet/pom.xml Sat May 6 21:48:10 2006
@@ -37,5 +37,12 @@
2.4
provided
+
+commons-lang
+commons-lang
+2.0
+
+
+
Modified: incubator/webwork2/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/showcase/pom.xml?rev=400415&r1=400413&r2=400415&view=diff
==
--- incubator/webwork2/apps/showcase/pom.xml (original)
+++ incubator/webwork2/apps/showcase/pom.xml Sat May 6 21:48:10 2006
@@ -41,7 +41,37 @@
sitemesh
2.2.1
-
+
+log4j
+log4j
+1.2.9
+
+
+
+org.springframework
+spring-beans
+1.2.6
+
+
+
+org.springframework
+spring-core
+1.2.6
+
+
+
+org.springframework
+spring-context
+1.2.6
+
+
+
+org.springframework
+spring-web
+1.2.6
+
+
+
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=400415&r1=400414&r2=400415&view=diff
==
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Sat May 6 21:48:10 2006
@@ -71,9 +71,9 @@
-
-
-
+
+
+
@@ -88,8 +88,8 @@
-
-
+
+
@@ -99,7 +99,7 @@
-
+
@@ -214,15 +214,15 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Modified:
incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java?rev=400415&r1=400414&r2=400415&view=diff
==
--- incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
(original)
+++ incubator/webwork2/core/src/main/java/org/apache/struts/action2/Main.java
Sat May 6 21:48:10 2006
@@ -54,7 +54,7 @@
System.out.println("");
System.out.println("Execute the commands for additional usage
instructions.");
System.out.println("Note: the *:xxx commands are just shortcuts
for ");
-System.out.println(" running the command on a webapp in the
webapps dir.");
+System.out.println(" running the command on a webapp in the
apps dir.");
System.out.println(" For example, 'quickstart:sandbox' will
start QuickStart");
System.out.println(" automatically for the webapp
'sandbox'.");
return;
@@ -131,8 +131,8 @@
command = "quickstart";
String name = c
svn commit: r400423 - in /incubator/webwork2: core/pom.xml src/site/site.xml
Author: mrdon Date: Sat May 6 22:03:32 2006 New Revision: 400423 URL: http://svn.apache.org/viewcvs?rev=400423&view=rev Log: Adding reports, changing subproject site path to match action 1 Modified: incubator/webwork2/core/pom.xml incubator/webwork2/src/site/site.xml Modified: incubator/webwork2/core/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/core/pom.xml?rev=400423&r1=400422&r2=400423&view=diff == --- incubator/webwork2/core/pom.xml (original) +++ incubator/webwork2/core/pom.xml Sat May 6 22:03:32 2006 @@ -15,9 +15,42 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts-action2/core + scp://people.apache.org/www/struts.apache.org/struts-action2/struts-core + + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +maven-javadoc-plugin + +true + + + +maven-surefire-report-plugin + + + +org.codehaus.mojo +jxr-maven-plugin + + +maven-pmd-plugin + + +
svn commit: r400426 - /struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
Author: mrdon
Date: Sat May 6 22:33:43 2006
New Revision: 400426
URL: http://svn.apache.org/viewcvs?rev=400426&view=rev
Log:
Allowing the mask validator to work on strings with just spaces
STR-2854
Modified:
struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
Modified:
struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java?rev=400426&r1=400425&r2=400426&view=diff
==
---
struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
(original)
+++
struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
Sat May 6 22:33:43 2006
@@ -227,7 +227,7 @@
String mask =
Resources.getVarValue("mask", field, validator, request, true);
-if (!GenericValidator.isBlankOrNull(value)
+if (value != null && value.length()>0
&& !GenericValidator.matchRegexp(value, mask)) {
errors.add(field.getKey(),
Resources.getActionMessage(validator, request, va, field));
svn commit: r403550 - /struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
Author: mrdon
Date: Sat May 6 23:08:29 2006
New Revision: 403550
URL: http://svn.apache.org/viewcvs?rev=403550&view=rev
Log:
Allowing continued processing of attributes when found a null value and ignore
enabled
STR-2809
Modified:
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
Modified:
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java?rev=403550&r1=403549&r2=403550&view=diff
==
---
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
(original)
+++
struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java
Sat May 6 23:08:29 2006
@@ -153,10 +153,9 @@
Object value = compContext.getAttribute(name);
// Check if value exist and if we must send a runtime exception
if( value == null )
-if(!isErrorIgnored)
+if(!isErrorIgnored) {
throw new JspException ( "Error - tag importAttribute : property '"+
name + "' not found in context. Check tag syntax" );
- else
- return SKIP_BODY;
+}
pageContext.setAttribute(name, value, scope);
}
@@ -176,10 +175,9 @@
Object value = compContext.getAttribute(name);
// Check if value exist and if we must send a runtime exception
if( value == null ) {
- if(!isErrorIgnored)
+ if(!isErrorIgnored) {
throw new JspException ( "Error - tag importAttribute : property
'"+ name + "' has a value of 'null'" );
- else
-return SKIP_BODY;
+ }
}
pageContext.setAttribute(name, value, scope);
} // end loop
svn commit: r404792 - in /incubator/webwork2: extras/ pom.xml thirdparty/
Author: mrdon Date: Sun May 7 09:38:24 2006 New Revision: 404792 URL: http://svn.apache.org/viewcvs?rev=404792&view=rev Log: Starting move of thirdparty to extras to match Action 1 Added: incubator/webwork2/extras/ - copied from r400413, incubator/webwork2/thirdparty/ Removed: incubator/webwork2/thirdparty/ Modified: incubator/webwork2/pom.xml Modified: incubator/webwork2/pom.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=404792&r1=404791&r2=404792&view=diff == --- incubator/webwork2/pom.xml (original) +++ incubator/webwork2/pom.xml Sun May 7 09:38:24 2006 @@ -86,7 +86,7 @@ core -thirdparty +extras apps @@ -134,9 +134,9 @@ -thirdparty +extras -thirdparty +extras
svn commit: r404794 - in /incubator/webwork2: ./ apps/showcase/ extras/ extras/jasperreports/ extras/jfreechart/ extras/pell-file-upload/ extras/src/ extras/src/main/java/org/apache/struts/action2/dis
Author: mrdon
Date: Sun May 7 09:51:48 2006
New Revision: 404794
URL: http://svn.apache.org/viewcvs?rev=404794&view=rev
Log:
Completing move from thirdparty to extras, consolidated sources into one module
Added:
incubator/webwork2/extras/src/
- copied from r404792, incubator/webwork2/extras/jasperreports/src/
incubator/webwork2/extras/src/main/java/org/apache/struts/action2/dispatcher/
- copied from r404792,
incubator/webwork2/extras/jfreechart/src/main/java/org/apache/struts/action2/dispatcher/
incubator/webwork2/extras/src/main/java/org/apache/struts/action2/dispatcher/multipart/
- copied from r404792,
incubator/webwork2/extras/pell-file-upload/src/main/java/org/apache/struts/action2/dispatcher/multipart/
incubator/webwork2/extras/src/test/java/org/
- copied from r404792,
incubator/webwork2/extras/jfreechart/src/test/java/org/
Removed:
incubator/webwork2/extras/jasperreports/
incubator/webwork2/extras/jfreechart/
incubator/webwork2/extras/pell-file-upload/
Modified:
incubator/webwork2/apps/showcase/pom.xml
incubator/webwork2/build.xml
incubator/webwork2/extras/pom.xml
Modified: incubator/webwork2/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/apps/showcase/pom.xml?rev=404794&r1=404793&r2=404794&view=diff
==
--- incubator/webwork2/apps/showcase/pom.xml (original)
+++ incubator/webwork2/apps/showcase/pom.xml Sun May 7 09:51:48 2006
@@ -25,7 +25,7 @@
org.apache.struts.action2
-struts-jasperreports
+struts-extras
${pom.version}
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=404794&r1=404793&r2=404794&view=diff
==
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Sun May 7 09:51:48 2006
@@ -240,9 +240,7 @@
-
-
-
+
Modified: incubator/webwork2/extras/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/extras/pom.xml?rev=404794&r1=404793&r2=404794&view=diff
==
--- incubator/webwork2/extras/pom.xml (original)
+++ incubator/webwork2/extras/pom.xml Sun May 7 09:51:48 2006
@@ -8,20 +8,64 @@
2.0-SNAPSHOT
org.apache.struts.action2
-thirdparty
-pom
-Third Party Modules
+struts-extras
+jar
+Struts Extras
apache-site
-
scp://people.apache.org/www/struts.apache.org/struts-action2/thirdparty
+
scp://people.apache.org/www/struts.apache.org/struts-action2/struts-extras
-
-jasperreports
-jfreechart
-pell-file-upload
-
+
+
+
+ javax.servlet
+ servlet-api
+ 2.4
+ provided
+
+
+
+org.apache.struts.action2
+struts-core
+${pom.version}
+
+
+
+jasperreports
+jasperreports
+1.2.1
+
+
+
+mockobjects
+mockobjects-core
+0.09
+test
+
+
+
+jfree
+jfreechart
+1.0.0
+true
+
+
+gnujaxp
+gnujaxp
+
+
+
+
+
+opensymphony
+pell-multipart
+2.1.5
+true
+
+
+
svn commit: r404797 - /struts/action/trunk/src/site/xdoc/roadmap.xml
Author: mrdon Date: Sun May 7 10:02:46 2006 New Revision: 404797 URL: http://svn.apache.org/viewcvs?rev=404797&view=rev Log: Cleaned up roadmap, keeping it high level Modified: struts/action/trunk/src/site/xdoc/roadmap.xml Modified: struts/action/trunk/src/site/xdoc/roadmap.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/roadmap.xml?rev=404797&r1=404796&r2=404797&view=diff == --- struts/action/trunk/src/site/xdoc/roadmap.xml (original) +++ struts/action/trunk/src/site/xdoc/roadmap.xml Sun May 7 10:02:46 2006 @@ -202,7 +202,7 @@ - + Major refactoring of Struts internals to provide support for modules and a new @@ -212,42 +212,22 @@ optional package. - - - + + + -Continued refactorings of the Struts 1.x product series. - - - -Removed deprecations created in the 1.0 to 1.1 -timeframe, and prior - - -Added support for wildcard mappings. - - -Other minor enhancements, improvements, and -refactorings - - - - - - - -Migrated repository to Subversion; update website. +Split internal libraries into their own projects in Jakarta +Commons. Added support for modules and plugins. - - + + -Minor enhancements, improvements, and refactorings only, -as needed. -New features should be added to the 1.3.x series. +Added support for wildcard mappings, internal project restructuring, +removed deprecations, other minor enhancements. - + @@ -257,16 +237,16 @@ -Divide distribution into subprojects +Divided distribution into subprojects -Complete support for Maven 2 builds +Completed support for Maven 2 builds -Move action to "Struts Chain" Request Processor +Moved action to "Struts Chain" Request Processor -Enhance all configs to extend one configuration +Enhanced all configs to extend one configuration element from another, as is done with Tiles Definitions
svn commit: r404805 - in /struts/action/trunk/src/site/xdoc/userGuide: index.xml release-notes-1.3.1.xml release-notes-1.3.2.xml release-notes.xml
Author: mrdon Date: Sun May 7 10:33:11 2006 New Revision: 404805 URL: http://svn.apache.org/viewcvs?rev=404805&view=rev Log: Updating release notes, implementing Paul's cleanups Added: struts/action/trunk/src/site/xdoc/userGuide/release-notes-1.3.2.xml - copied unchanged from r404802, struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml Removed: struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml Modified: struts/action/trunk/src/site/xdoc/userGuide/index.xml struts/action/trunk/src/site/xdoc/userGuide/release-notes-1.3.1.xml Modified: struts/action/trunk/src/site/xdoc/userGuide/index.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/index.xml?rev=404805&r1=404804&r2=404805&view=diff == --- struts/action/trunk/src/site/xdoc/userGuide/index.xml (original) +++ struts/action/trunk/src/site/xdoc/userGuide/index.xml Sun May 7 10:33:11 2006 @@ -436,6 +436,26 @@ 6.1 Release Notes +Release +Notes 1.3.2 + + +Release +Notes 1.3.1 (Test Build) + + +Release +Notes 1.2.8 + + +Release +Notes 1.2.7 + + +Release +Notes 1.2.4 + + Release Notes 1.1 Modified: struts/action/trunk/src/site/xdoc/userGuide/release-notes-1.3.1.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/release-notes-1.3.1.xml?rev=404805&r1=404804&r2=404805&view=diff == --- struts/action/trunk/src/site/xdoc/userGuide/release-notes-1.3.1.xml (original) +++ struts/action/trunk/src/site/xdoc/userGuide/release-notes-1.3.1.xml Sun May 7 10:33:11 2006 @@ -291,6 +291,7 @@ + Composable Request Processor In prior versions, the request processing guantlet is @@ -371,6 +372,7 @@ Processor. + Arbitrary configuration properties Most every Struts configuration element now accepts a map @@ -460,6 +462,7 @@ the legacy Request Processor included in Struts Action 1.3. + Enhanced Global Exception Handlers We now support use of global exception handlers in cases @@ -498,6 +501,7 @@ /> + Extends attribute In the Struts configuration file, @@ -539,6 +543,7 @@ it's easier to see the forest for the trees. + "isCommitted" Exception Handling When using Tiles, sometimes the response is already @@ -570,6 +575,7 @@ </exception> + Postback Forms The action attribute of the Form taglib is now optional. @@ -581,6 +587,7 @@ onsubmit="return validateLogonForm(this);"> + Wildcard ActionConfig properties Wildcards can now be used in the properties of an
svn commit: r404812 - /incubator/webwork2/ant-build/
Author: mrdon Date: Sun May 7 11:28:01 2006 New Revision: 404812 URL: http://svn.apache.org/viewcvs?rev=404812&view=rev Log: Creating ant build dir Added: incubator/webwork2/ant-build/
svn commit: r404823 - in /incubator/webwork2: ./ ant-build/
Author: mrdon Date: Sun May 7 12:03:38 2006 New Revision: 404823 URL: http://svn.apache.org/viewcvs?rev=404823&view=rev Log: Removing unnecessary files, moving Ant build into its own directory Added: incubator/webwork2/ant-build/build.properties - copied unchanged from r400413, incubator/webwork2/build.properties incubator/webwork2/ant-build/ivy.xml - copied, changed from r400413, incubator/webwork2/ivy.xml incubator/webwork2/ant-build/ivyconf.properties - copied unchanged from r400413, incubator/webwork2/ivyconf.properties incubator/webwork2/ant-build/ivyconf.xml - copied, changed from r400413, incubator/webwork2/ivyconf.xml incubator/webwork2/ant-build/osbuild.xml - copied, changed from r400415, incubator/webwork2/osbuild.xml Removed: incubator/webwork2/WebWork.iml incubator/webwork2/WebWork.ipr incubator/webwork2/build.properties incubator/webwork2/dojo.profile.js incubator/webwork2/idea-setup.txt incubator/webwork2/ivy.xml incubator/webwork2/ivyconf.properties incubator/webwork2/ivyconf.xml incubator/webwork2/osbuild.xml Modified: incubator/webwork2/build.xml Copied: incubator/webwork2/ant-build/ivy.xml (from r400413, incubator/webwork2/ivy.xml) URL: http://svn.apache.org/viewcvs/incubator/webwork2/ant-build/ivy.xml?p2=incubator/webwork2/ant-build/ivy.xml&p1=incubator/webwork2/ivy.xml&r1=400413&r2=404823&rev=404823&view=diff == --- incubator/webwork2/ivy.xml (original) +++ incubator/webwork2/ant-build/ivy.xml Sun May 7 12:03:38 2006 @@ -1,7 +1,7 @@ http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl";?> - Copied: incubator/webwork2/ant-build/ivyconf.xml (from r400413, incubator/webwork2/ivyconf.xml) URL: http://svn.apache.org/viewcvs/incubator/webwork2/ant-build/ivyconf.xml?p2=incubator/webwork2/ant-build/ivyconf.xml&p1=incubator/webwork2/ivyconf.xml&r1=400413&r2=404823&rev=404823&view=diff == --- incubator/webwork2/ivyconf.xml (original) +++ incubator/webwork2/ant-build/ivyconf.xml Sun May 7 12:03:38 2006 @@ -1,5 +1,5 @@ - + @@ -27,4 +27,4 @@ - \ No newline at end of file + Copied: incubator/webwork2/ant-build/osbuild.xml (from r400415, incubator/webwork2/osbuild.xml) URL: http://svn.apache.org/viewcvs/incubator/webwork2/ant-build/osbuild.xml?p2=incubator/webwork2/ant-build/osbuild.xml&p1=incubator/webwork2/osbuild.xml&r1=400415&r2=404823&rev=404823&view=diff == --- incubator/webwork2/osbuild.xml (original) +++ incubator/webwork2/ant-build/osbuild.xml Sun May 7 12:03:38 2006 @@ -21,9 +21,9 @@ - - - + + + Modified: incubator/webwork2/build.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=404823&r1=404822&r2=404823&view=diff == --- incubator/webwork2/build.xml (original) +++ incubator/webwork2/build.xml Sun May 7 12:03:38 2006 @@ -11,7 +11,7 @@ " /> - + @@ -40,13 +40,9 @@ and compile the dependent Struts Action 2 code, run the 'compile-optional' task. - - - - - - - + + +
svn commit: r404872 - in /struts/action2/trunk/apps/shopping-cart: pom.xml src/main/webapp/WEB-INF/lib/
Author: mrdon
Date: Sun May 7 16:46:52 2006
New Revision: 404872
URL: http://svn.apache.org/viewcvs?rev=404872&view=rev
Log:
Removing sitemesh jar, making it a maven dep
Removed:
struts/action2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/lib/
Modified:
struts/action2/trunk/apps/shopping-cart/pom.xml
Modified: struts/action2/trunk/apps/shopping-cart/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/shopping-cart/pom.xml?rev=404872&r1=404871&r2=404872&view=diff
==
--- struts/action2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/action2/trunk/apps/shopping-cart/pom.xml Sun May 7 16:46:52 2006
@@ -25,6 +25,12 @@
struts-core
${pom.version}
+
+
+ opensymphony
+ sitemesh
+ 2.2.1
+
svn commit: r404873 - in /struts/action2/trunk/apps/portlet/src/main: java/xwork.xml webapp/WEB-INF/lib/ webapp/WEB-INF/tld/ webapp/WEB-INF/view/chartExample.jsp webapp/WEB-INF/view/index.jsp webapp/W
Author: mrdon Date: Sun May 7 16:53:15 2006 New Revision: 404873 URL: http://svn.apache.org/viewcvs?rev=404873&view=rev Log: Removing cewolf chart example from exampley Removed: struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/lib/ struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/tld/ struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp Modified: struts/action2/trunk/apps/portlet/src/main/java/xwork.xml struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Modified: struts/action2/trunk/apps/portlet/src/main/java/xwork.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/java/xwork.xml?rev=404873&r1=404872&r2=404873&view=diff == --- struts/action2/trunk/apps/portlet/src/main/java/xwork.xml (original) +++ struts/action2/trunk/apps/portlet/src/main/java/xwork.xml Sun May 7 16:53:15 2006 @@ -12,10 +12,6 @@ /WEB-INF/view/index.jsp - - /WEB-INF/view/chartExample.jsp - - Modified: struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp?rev=404873&r1=404872&r2=404873&view=diff == --- struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp (original) +++ struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/index.jsp Sun May 7 16:53:15 2006 @@ -10,7 +10,6 @@ ">Ajax ">FreeMarker ">Velocity -">Chart example ">Go to edit mode and see what's there ">Go to help mode and see what's there Modified: struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml?rev=404873&r1=404872&r2=404873&view=diff == --- struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml (original) +++ struts/action2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Sun May 7 16:53:15 2006 @@ -40,23 +40,10 @@ dwr uk.ltd.getahead.dwr.DWRServlet - - CewolfServlet - de.laures.cewolf.CewolfRenderer - - CewolfServlet - /cewolf/* - - dwr /dwr/* - - - /cewolf - /WEB-INF/tld/cewolf.tld -
svn commit: r404874 - in /struts/action2/trunk/apps/portlet/src/main/etc/gridsphere: README-gridsphere.txt gridsphere-ui-tags-2.1.2.jar
Author: mrdon Date: Sun May 7 16:55:18 2006 New Revision: 404874 URL: http://svn.apache.org/viewcvs?rev=404874&view=rev Log: Removing the gridsphere jar and added instructions on how to download it Removed: struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar Modified: struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt Modified: struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt?rev=404874&r1=404873&r2=404874&view=diff == --- struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt (original) +++ struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt Sun May 7 16:55:18 2006 @@ -1,2 +1,2 @@ Put the empty 'struts-portlet' file in the $CATALINA_HOME/webapps/gridsphere/WEB-INF/CustomPortal/portlets -folder of your Gridsphere installation. +folder of your Gridsphere installation. You will need to add the gridsphere-ui-tags-2.1.2.jar to your project.
svn commit: r404882 - /struts/action2/trunk/pom.xml
Author: mrdon Date: Sun May 7 17:23:47 2006 New Revision: 404882 URL: http://svn.apache.org/viewcvs?rev=404882&view=rev Log: Changed pom to inherit Struts POM, did more synching with Action 1 (for better, for worse:)) Modified: struts/action2/trunk/pom.xml Modified: struts/action2/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/pom.xml?rev=404882&r1=404881&r2=404882&view=diff == --- struts/action2/trunk/pom.xml (original) +++ struts/action2/trunk/pom.xml Sun May 7 17:23:47 2006 @@ -1,12 +1,23 @@ http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + + org.apache.struts + struts-parent + 2 + + 4.0.0 org.apache.struts.action2 2.0-SNAPSHOT project pom Struts Action 2 +http://struts.apache.org/struts-action2 + +2006 + Struts Action 2 is a Java web-application development framework. It is built specifically with developer productivity and @@ -15,33 +26,19 @@ internationalization, dynamic form parameter mapping to JavaBeans, robust client and server side validation, and much more. - - -The Apache Software License, Version 2.0 -http://www.apache.org/licenses/LICENSE-2.0.txt -repo - - - -http://struts.apache.org - -Apache Software Foundation -http://www.apache.org - - - scm:svn:http://svn.apache.org/repos/asf/struts/action/trunk - scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk - http://svn.apache.org/viewcvs.cgi/struts/action/trunk + scm:svn:http://svn.apache.org/repos/asf/struts/action2/trunk + scm:svn:https://svn.apache.org/repos/asf/struts/action2/trunk + http://svn.apache.org/viewcvs.cgi/struts/action2/trunk - + JIRA http://issues.apache.org/struts/ - - + + apache-maven-test-builds @@ -54,41 +51,26 @@ - - - -WebWork users list -mailto:[EMAIL PROTECTED] - https://webwork.dev.java.net/servlets/ProjectMailingListList - https://webwork.dev.java.net/servlets/SummarizeList?listName=users - - http://forums.opensymphony.com/forum.jspa?forumID=1 - - - -WebWork developers list -mailto:[EMAIL PROTECTED] - https://webwork.dev.java.net/servlets/ProjectMailingListList - https://webwork.dev.java.net/servlets/SummarizeList?listName=dev - - http://forums.opensymphony.com/forum.jspa?forumID=32 - - - -WebWork cvs commit list -mailto:[EMAIL PROTECTED] - https://webwork.dev.java.net/servlets/ProjectMailingListList - https://webwork.dev.java.net/servlets/SummarizeList?listName=cvs - - http://forums.opensymphony.com/forum.jspa?forumID=9 - - - core extras apps + + + +The Apache Software License, Version 2.0 +http://www.apache.org/licenses/LICENSE-2.0.txt +repo + + + + + +Apache Software Foundation +http://www.apache.org + + snapshots-maven-codehaus @@ -118,6 +100,13 @@ http://cvs.apache.org/repository +apache.snapshots +Apache Maven Repository (Snapshots and Test Builds) +http://cvs.apache.org/maven-snapshot-repository +true +true + + opensymphony opensymphony legacy @@ -160,6 +149,8 @@ + + @@ -202,6 +193,43 @@ + +install + + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +maven-javadoc-plugin + +true + + + +maven-surefire-report-plugin + + + +org.codehaus.mojo +jxr-maven-plugin + + +maven-pmd-plugin + + + + +
svn commit: r404885 - in /struts/action2/trunk: core/pom.xml src/site/xdoc/apidocs/ src/site/xdoc/apidocs/index.xml src/site/xdoc/jxr.xml
Author: mrdon Date: Sun May 7 17:33:04 2006 New Revision: 404885 URL: http://svn.apache.org/viewcvs?rev=404885&view=rev Log: Fixing report links on main site Added: struts/action2/trunk/src/site/xdoc/apidocs/ - copied from r404871, struts/action/trunk/src/site/xdoc/apidocs/ struts/action2/trunk/src/site/xdoc/jxr.xml - copied, changed from r404871, struts/action/trunk/src/site/xdoc/jxr.xml Modified: struts/action2/trunk/core/pom.xml struts/action2/trunk/src/site/xdoc/apidocs/index.xml Modified: struts/action2/trunk/core/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/core/pom.xml?rev=404885&r1=404884&r2=404885&view=diff == --- struts/action2/trunk/core/pom.xml (original) +++ struts/action2/trunk/core/pom.xml Sun May 7 17:33:04 2006 @@ -19,39 +19,6 @@ - - - -org.apache.maven.plugins -maven-project-info-reports-plugin - - -maven-javadoc-plugin - -true - - - -maven-surefire-report-plugin - - - -org.codehaus.mojo -jxr-maven-plugin - - -maven-pmd-plugin - - - -
svn commit: r405220 - in /struts/action/trunk: el/src/site/site.xml extras/src/site/site.xml faces/src/site/site.xml scripting/src/site/site.xml src/site/site.xml taglib/src/site/site.xml tiles/src/si
Author: mrdon Date: Mon May 8 16:29:33 2006 New Revision: 405220 URL: http://svn.apache.org/viewcvs?rev=405220&view=rev Log: Removing Struts Apps links since that site has no real content Modified: struts/action/trunk/el/src/site/site.xml struts/action/trunk/extras/src/site/site.xml struts/action/trunk/faces/src/site/site.xml struts/action/trunk/scripting/src/site/site.xml struts/action/trunk/src/site/site.xml struts/action/trunk/taglib/src/site/site.xml struts/action/trunk/tiles/src/site/site.xml Modified: struts/action/trunk/el/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/el/src/site/site.xml (original) +++ struts/action/trunk/el/src/site/site.xml Mon May 8 16:29:33 2006 @@ -31,9 +31,6 @@ - - Modified: struts/action/trunk/extras/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/extras/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/extras/src/site/site.xml (original) +++ struts/action/trunk/extras/src/site/site.xml Mon May 8 16:29:33 2006 @@ -24,9 +24,6 @@ - - Modified: struts/action/trunk/faces/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/faces/src/site/site.xml (original) +++ struts/action/trunk/faces/src/site/site.xml Mon May 8 16:29:33 2006 @@ -40,9 +40,6 @@ - - Modified: struts/action/trunk/scripting/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/scripting/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/scripting/src/site/site.xml (original) +++ struts/action/trunk/scripting/src/site/site.xml Mon May 8 16:29:33 2006 @@ -28,9 +28,6 @@ - - Modified: struts/action/trunk/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/src/site/site.xml (original) +++ struts/action/trunk/src/site/site.xml Mon May 8 16:29:33 2006 @@ -60,9 +60,6 @@ - - Modified: struts/action/trunk/taglib/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/taglib/src/site/site.xml (original) +++ struts/action/trunk/taglib/src/site/site.xml Mon May 8 16:29:33 2006 @@ -30,9 +30,6 @@ - - Modified: struts/action/trunk/tiles/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/tiles/src/site/site.xml?rev=405220&r1=405219&r2=405220&view=diff == --- struts/action/trunk/tiles/src/site/site.xml (original) +++ struts/action/trunk/tiles/src/site/site.xml Mon May 8 16:29:33 2006 @@ -30,9 +30,6 @@ - -
svn commit: r405612 - /struts/action/trunk/src/site/xdoc/userGuide/building_controller.xml
Author: mrdon Date: Tue May 9 20:33:27 2006 New Revision: 405612 URL: http://svn.apache.org/viewcvs?rev=405612&view=rev Log: Fixing link STR-2872 Modified: struts/action/trunk/src/site/xdoc/userGuide/building_controller.xml Modified: struts/action/trunk/src/site/xdoc/userGuide/building_controller.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/building_controller.xml?rev=405612&r1=405611&r2=405612&view=diff == --- struts/action/trunk/src/site/xdoc/userGuide/building_controller.xml (original) +++ struts/action/trunk/src/site/xdoc/userGuide/building_controller.xml Tue May 9 20:33:27 2006 @@ -1272,7 +1272,7 @@ flexibility, they do not support the same range of syntax available to conventional or DynaActionForms. You might have difficulty referencing -indexed or mapped +indexed or mapped properties using a map-backed ActionForm. The validwhen validator (since Apache Struts 1.2.1) also
svn commit: r405615 - in /struts/action/trunk/src/site/xdoc: index.xml userGuide/building_view.xml userGuide/release-notes-1_2_4.xml
Author: mrdon Date: Tue May 9 20:40:45 2006 New Revision: 405615 URL: http://svn.apache.org/viewcvs?rev=405615&view=rev Log: Fixing several bad links to validator guide Modified: struts/action/trunk/src/site/xdoc/index.xml struts/action/trunk/src/site/xdoc/userGuide/building_view.xml struts/action/trunk/src/site/xdoc/userGuide/release-notes-1_2_4.xml Modified: struts/action/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/index.xml?rev=405615&r1=405614&r2=405615&view=diff == --- struts/action/trunk/src/site/xdoc/index.xml (original) +++ struts/action/trunk/src/site/xdoc/index.xml Tue May 9 20:40:45 2006 @@ -208,7 +208,7 @@ You can specify validations for the ActionForms in an XML descriptor, using the -http://struts.apache.org/struts-taglib/dev_validator.html";> + Struts Validator. A standard extension, http://struts.apache.org/struts-tiles/dev_tiles.html";> Tiles, helps you build pages from smaller fragments. Modified: struts/action/trunk/src/site/xdoc/userGuide/building_view.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/building_view.xml?rev=405615&r1=405614&r2=405615&view=diff == --- struts/action/trunk/src/site/xdoc/userGuide/building_view.xml (original) +++ struts/action/trunk/src/site/xdoc/userGuide/building_view.xml Tue May 9 20:40:45 2006 @@ -580,7 +580,7 @@ For more about the Struts Validator, see the -http://struts.apache.org/struts-taglib/dev_validator.html";> + Developers Guide . Modified: struts/action/trunk/src/site/xdoc/userGuide/release-notes-1_2_4.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/release-notes-1_2_4.xml?rev=405615&r1=405614&r2=405615&view=diff == --- struts/action/trunk/src/site/xdoc/userGuide/release-notes-1_2_4.xml (original) +++ struts/action/trunk/src/site/xdoc/userGuide/release-notes-1_2_4.xml Tue May 9 20:40:45 2006 @@ -222,7 +222,7 @@ ValidWhen - The Struts Validator now supports a ValidWhen rule, so that one validation can be dependant on another. -Details ... +Details ... IntRange now checks select-one and radio fields. Example: This allows populating combo boxes with valid
svn commit: r405629 - /struts/action/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
Author: mrdon
Date: Tue May 9 21:23:13 2006
New Revision: 405629
URL: http://svn.apache.org/viewcvs?rev=405629&view=rev
Log:
Improving an error message when a resource isn't found for a particular
locale
Modified:
struts/action/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
Modified:
struts/action/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java?rev=405629&r1=405628&r2=405629&view=diff
==
---
struts/action/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
(original)
+++
struts/action/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
Tue May 9 21:23:13 2006
@@ -262,7 +262,7 @@
}
} else {
if (log.isWarnEnabled()) {
-log.warn(" Resource Not Found.");
+log.warn(" Resource "+name+" Not Found.");
}
}
svn commit: r405639 - /struts/action/trunk/src/site/xdoc/faqs/validator.xml
Author: mrdon Date: Tue May 9 21:39:45 2006 New Revision: 405639 URL: http://svn.apache.org/viewcvs?rev=405639&view=rev Log: Fixed links to html taglib docs Modified: struts/action/trunk/src/site/xdoc/faqs/validator.xml Modified: struts/action/trunk/src/site/xdoc/faqs/validator.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/faqs/validator.xml?rev=405639&r1=405638&r2=405639&view=diff == --- struts/action/trunk/src/site/xdoc/faqs/validator.xml (original) +++ struts/action/trunk/src/site/xdoc/faqs/validator.xml Tue May 9 21:39:45 2006 @@ -910,7 +910,7 @@ If the - + Javascript Tag is used, the client side Javascript generation looks for a value in @@ -921,7 +921,7 @@ For a more detailed explanation of how the Javascript Validator Tag works, see the -html taglib API +html taglib API reference .
svn commit: r405646 - /struts/action2/trunk/extras/pom.xml
Author: mrdon Date: Tue May 9 22:50:57 2006 New Revision: 405646 URL: http://svn.apache.org/viewcvs?rev=405646&view=rev Log: Marking Jasper reports as provided to prevent the jars from being included in a release Modified: struts/action2/trunk/extras/pom.xml Modified: struts/action2/trunk/extras/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/extras/pom.xml?rev=405646&r1=405645&r2=405646&view=diff == --- struts/action2/trunk/extras/pom.xml (original) +++ struts/action2/trunk/extras/pom.xml Tue May 9 22:50:57 2006 @@ -38,6 +38,7 @@ jasperreports jasperreports 1.2.1 +provided @@ -51,6 +52,7 @@ opensymphony pell-multipart 2.1.5 +provided true
svn commit: r405647 - in /struts/action2/trunk/apps: portlet/pom.xml showcase/pom.xml
Author: mrdon Date: Tue May 9 22:55:59 2006 New Revision: 405647 URL: http://svn.apache.org/viewcvs?rev=405647&view=rev Log: Marking LGPL deps as provided so they aren't included in wars and the release Modified: struts/action2/trunk/apps/portlet/pom.xml struts/action2/trunk/apps/showcase/pom.xml Modified: struts/action2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/pom.xml?rev=405647&r1=405646&r2=405647&view=diff == --- struts/action2/trunk/apps/portlet/pom.xml (original) +++ struts/action2/trunk/apps/portlet/pom.xml Tue May 9 22:55:59 2006 @@ -23,6 +23,7 @@ cewolf cewolf 1.0 +provided gnujaxp Modified: struts/action2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/showcase/pom.xml?rev=405647&r1=405646&r2=405647&view=diff == --- struts/action2/trunk/apps/showcase/pom.xml (original) +++ struts/action2/trunk/apps/showcase/pom.xml Tue May 9 22:55:59 2006 @@ -77,7 +77,13 @@ 1.1-beta-3 true - + +jasperreports +jasperreports +1.2.1 +provided + +
svn commit: r406492 - in /struts/action2/trunk: ./ apps/ apps/portlet/ apps/portlet/src/main/etc/exo/ apps/portlet/src/main/etc/gridsphere/ apps/portlet/src/main/etc/liferay3.6.1/ apps/portlet/src/mai
Author: mrdon Date: Sun May 14 18:01:55 2006 New Revision: 406492 URL: http://svn.apache.org/viewcvs?rev=406492&view=rev Log: Removing empty directories, removing cewolf tag and chart action from portlet webapp, split showcase and extras into "extras" profile, synchronized root pom with action 1 Removed: struts/action2/trunk/apps/portlet/src/main/java/com/ struts/action2/trunk/apps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java Modified: struts/action2/trunk/apps/pom.xml struts/action2/trunk/apps/portlet/pom.xml struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml struts/action2/trunk/pom.xml Modified: struts/action2/trunk/apps/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/pom.xml?rev=406492&r1=406491&r2=406492&view=diff == --- struts/action2/trunk/apps/pom.xml (original) +++ struts/action2/trunk/apps/pom.xml Sun May 14 18:01:55 2006 @@ -15,7 +15,7 @@ blank portlet shopping-cart -showcase + starter @@ -27,6 +27,12 @@ + +extras + +showcase + + hostedqa Modified: struts/action2/trunk/apps/portlet/pom.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/pom.xml?rev=406492&r1=406491&r2=406492&view=diff == --- struts/action2/trunk/apps/portlet/pom.xml (original) +++ struts/action2/trunk/apps/portlet/pom.xml Sun May 14 18:01:55 2006 @@ -20,19 +20,6 @@ -cewolf -cewolf -1.0 -provided - - -gnujaxp -gnujaxp - - - - - javax.servlet servlet-api 2.4 Modified: struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml?rev=406492&r1=406491&r2=406492&view=diff == --- struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml (original) +++ struts/action2/trunk/apps/portlet/src/main/etc/exo/web.xml Sun May 14 18:01:55 2006 @@ -50,16 +50,8 @@ org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper - - CewolfServlet - de.laures.cewolf.CewolfRenderer - - CewolfServlet - /cewolf/* - - dwr /dwr/* @@ -67,10 +59,5 @@ PortletWrapper /PortletWrapper - - - /cewolf - /WEB-INF/tld/cewolf.tld - Modified: struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml?rev=406492&r1=406491&r2=406492&view=diff == --- struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml (original) +++ struts/action2/trunk/apps/portlet/src/main/etc/gridsphere/web.xml Sun May 14 18:01:55 2006 @@ -50,16 +50,8 @@ org.gridlab.gridsphere.provider.portlet.jsr.PortletServlet - - CewolfServlet - de.laures.cewolf.CewolfRenderer - - CewolfServlet - /cewolf/* - - dwr /dwr/* @@ -67,10 +59,5 @@ PortletServlet /jsr/struts-portlet - - - /cewolf - /WEB-INF/tld/cewolf.tld - Modified: struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml URL: http://svn.apache.org/viewcvs/struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml?rev=406492&r1=406491&r2=406492&view=diff == --- struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml (original) +++ struts/action2/trunk/apps/portlet/src/main/etc/liferay3.6.1/web.xml Sun May 14 18:01:55 2006 @@ -62,16 +62,8 @@ dwr uk.ltd.getahead.dwr.DWRServlet - - CewolfServlet - de.laures.cewolf.CewolfRenderer - - Cew
svn commit: r407639 - /struts/action2/trunk/pom.xml
Author: mrdon Date: Thu May 18 14:51:27 2006 New Revision: 407639 URL: http://svn.apache.org/viewvc?rev=407639&view=rev Log: Commenting out assembly module until it is brought in Modified: struts/action2/trunk/pom.xml Modified: struts/action2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/pom.xml?rev=407639&r1=407638&r2=407639&view=diff == --- struts/action2/trunk/pom.xml (original) +++ struts/action2/trunk/pom.xml Thu May 18 14:51:27 2006 @@ -77,7 +77,7 @@ core -assembly + apps
svn commit: r408140 - in /struts/action2/trunk/core/src: main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.j
Author: mrdon
Date: Sat May 20 23:24:37 2006
New Revision: 408140
URL: http://svn.apache.org/viewvc?rev=408140&view=rev
Log:
Fixing jsf setup interceptor to not complain so loudly if jsf isn't present,
fixed freemarker
test to properly extend StrutsTestCase
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
Modified:
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java?rev=408140&r1=408139&r2=408140&view=diff
==
---
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
(original)
+++
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java
Sat May 20 23:24:37 2006
@@ -57,8 +57,17 @@
* Initializes the lifecycle and factories
*/
public void init() {
- facesContextFactory = (FacesContextFactory) FactoryFinder
+ try {
+ facesContextFactory = (FacesContextFactory)
FactoryFinder
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
+ } catch (Exception ex) {
+ log.debug("Unable to initialize faces", ex);
+ }
+
+ if (facesContextFactory == null) {
+ log.info("Unable to initialize jsf interceptors
probably due missing JSF framework initialization");
+ return;
+ }
// Javadoc says: Lifecycle instance is shared across multiple
// simultaneous requests, it must be implemented in a
thread-safe
// manner.
Modified:
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java?rev=408140&r1=408139&r2=408140&view=diff
==
---
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
(original)
+++
struts/action2/trunk/core/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
Sat May 20 23:24:37 2006
@@ -18,16 +18,15 @@
package org.apache.struts.action2.views.freemarker;
import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.StrutsTestCase;
import org.apache.struts.action2.config.Configuration;
import org.apache.struts.action2.views.jsp.StrutsMockServletContext;
-import junit.framework.TestCase;
-
/**
* Test case for FreemarkerManager
*
*/
-public class FreemarkerManagerTest extends TestCase {
+public class FreemarkerManagerTest extends StrutsTestCase {
public void testIfStrutsEncodingIsSetProperty() throws Exception {
Configuration.set(StrutsConstants.STRUTS_I18N_ENCODING,
"UTF-8");
svn commit: r408141 - in /struts/action2/trunk: apps/showcase/pom.xml core/pom.xml
Author: mrdon Date: Sat May 20 23:28:30 2006 New Revision: 408141 URL: http://svn.apache.org/viewvc?rev=408141&view=rev Log: Fixing myfaces dependencies to use 1.1.2 and correct group id Modified: struts/action2/trunk/apps/showcase/pom.xml struts/action2/trunk/core/pom.xml Modified: struts/action2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=408141&r1=408140&r2=408141&view=diff == --- struts/action2/trunk/apps/showcase/pom.xml (original) +++ struts/action2/trunk/apps/showcase/pom.xml Sat May 20 23:28:30 2006 @@ -85,12 +85,12 @@ -myfaces +org.apache.myfaces.core myfaces-impl 1.1.2 -myfaces +org.apache.myfaces.core myfaces-api 1.1.2 Modified: struts/action2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/core/pom.xml?rev=408141&r1=408140&r2=408141&view=diff == --- struts/action2/trunk/core/pom.xml (original) +++ struts/action2/trunk/core/pom.xml Sat May 20 23:28:30 2006 @@ -260,9 +260,9 @@ -myfaces -myfaces-jsf-api -1.0.9 +org.apache.myfaces.core +myfaces-api +1.1.2 provided
svn commit: r408144 - /struts/action2/trunk/apps/showcase/pom.xml
Author: mrdon Date: Sun May 21 00:09:46 2006 New Revision: 408144 URL: http://svn.apache.org/viewvc?rev=408144&view=rev Log: Fixing dwr dep, shouldn't be optional Modified: struts/action2/trunk/apps/showcase/pom.xml Modified: struts/action2/trunk/apps/showcase/pom.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=408144&r1=408143&r2=408144&view=diff == --- struts/action2/trunk/apps/showcase/pom.xml (original) +++ struts/action2/trunk/apps/showcase/pom.xml Sun May 21 00:09:46 2006 @@ -75,7 +75,6 @@ uk.ltd.getahead dwr 1.1-beta-3 -true jasperreports
svn commit: r408480 - in /struts/action2/trunk/apps: pom.xml showcase/pom.xml
Author: mrdon
Date: Sun May 21 13:22:18 2006
New Revision: 408480
URL: http://svn.apache.org/viewvc?rev=408480&view=rev
Log:
Adding the showcase back to the default build with the extras dep removed
WW-1306y
Modified:
struts/action2/trunk/apps/pom.xml
struts/action2/trunk/apps/showcase/pom.xml
Modified: struts/action2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=408480&r1=408479&r2=408480&view=diff
==
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Sun May 21 13:22:18 2006
@@ -15,7 +15,7 @@
blank
portlet
shopping-cart
-
+showcase
starter
Modified: struts/action2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/pom.xml?rev=408480&r1=408479&r2=408480&view=diff
==
--- struts/action2/trunk/apps/showcase/pom.xml (original)
+++ struts/action2/trunk/apps/showcase/pom.xml Sun May 21 13:22:18 2006
@@ -23,11 +23,6 @@
-
-org.apache.struts.action2
-struts-extras
-${pom.version}
-
javax.servlet
svn commit: r408481 - /struts/action2/trunk/apps/pom.xml
Author: mrdon Date: Sun May 21 13:24:41 2006 New Revision: 408481 URL: http://svn.apache.org/viewvc?rev=408481&view=rev Log: Removing showcase profile since it is included in the default build Modified: struts/action2/trunk/apps/pom.xml Modified: struts/action2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/action2/trunk/apps/pom.xml?rev=408481&r1=408480&r2=408481&view=diff == --- struts/action2/trunk/apps/pom.xml (original) +++ struts/action2/trunk/apps/pom.xml Sun May 21 13:24:41 2006 @@ -28,12 +28,6 @@ -showcase - -showcase - - - hostedqa
svn commit: r554122 - in /struts/maven/trunk/struts2-archetype-plugin: pom.xml src/main/resources/archetype-resources/pom.xml
Author: mrdon Date: Fri Jul 6 20:15:48 2007 New Revision: 554122 URL: http://svn.apache.org/viewvc?view=rev&rev=554122 Log: Updating to Struts 2.0.8 Modified: struts/maven/trunk/struts2-archetype-plugin/pom.xml struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml Modified: struts/maven/trunk/struts2-archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/pom.xml?view=diff&rev=554122&r1=554121&r2=554122 == --- struts/maven/trunk/struts2-archetype-plugin/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/pom.xml Fri Jul 6 20:15:48 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-plugin - 2.0.6-SNAPSHOT + 2.0.8-SNAPSHOT maven-plugin Struts 2 Archetypes - Plugin Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml?view=diff&rev=554122&r1=554121&r2=554122 == --- struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml Fri Jul 6 20:15:48 2007 @@ -20,7 +20,7 @@ org.apache.struts struts2-core -2.0.6 +2.0.8
svn commit: r554124 - /struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/
Author: mrdon Date: Fri Jul 6 20:24:28 2007 New Revision: 554124 URL: http://svn.apache.org/viewvc?view=rev&rev=554124 Log: Adding java dir to archetype Added: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/
svn commit: r554125 - in /struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/test: ./ java/ resources/
Author: mrdon Date: Fri Jul 6 20:24:59 2007 New Revision: 554125 URL: http://svn.apache.org/viewvc?view=rev&rev=554125 Log: Adding test dir to archetype Added: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/test/ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/test/java/ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/test/resources/
svn commit: r554126 - /struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
Author: mrdon Date: Fri Jul 6 20:27:56 2007 New Revision: 554126 URL: http://svn.apache.org/viewvc?view=rev&rev=554126 Log: Adding notice, readme, and license to generated plugin Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml?view=diff&rev=554126&r1=554125&r2=554126 == --- struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml Fri Jul 6 20:27:56 2007 @@ -4,6 +4,9 @@ struts2-archetype-plugin src/main/resources/struts-plugin.xml + LICENSE.txt + NOTICE.txt + README.txt
svn commit: r554128 - in /struts/maven/trunk/struts2-archetype-plugin/src/main/resources: META-INF/ archetype-resources/ archetype-resources/src/main/java/ archetype-resources/src/main/resources/ arch
Author: mrdon
Date: Fri Jul 6 20:58:03 2007
New Revision: 554128
URL: http://svn.apache.org/viewvc?view=rev&rev=554128
Log:
Adding a simple result to the archetype
Added:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java
Removed:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/test/
Modified:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
Modified:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml?view=diff&rev=554128&r1=554127&r2=554128
==
---
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/META-INF/archetype.xml
Fri Jul 6 20:58:03 2007
@@ -2,6 +2,9 @@
struts2-archetype-plugin
+
+ src/main/java/MyResult.java
+
src/main/resources/struts-plugin.xml
LICENSE.txt
Modified:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml?view=diff&rev=554128&r1=554127&r2=554128
==
---
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml
Fri Jul 6 20:58:03 2007
@@ -11,18 +11,27 @@
+org.apache.struts
+struts2-core
+2.0.8
+
+
+javax.servlet
+servlet-api
+2.4
+provided
+
+
junit
junit
3.8.1
test
-
-
-org.apache.struts
-struts2-core
-2.0.8
-
-
+
+
+
+install
+
Added:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java?view=auto&rev=554128
==
---
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java
(added)
+++
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/java/MyResult.java
Fri Jul 6 20:58:03 2007
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package $package;
+
+import org.apache.struts2.ServletActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.Writer;
+
+
+/**
+ * An example result that simply returns "hello".
+ *
+ */
+public class MyResult implements Result {
+
+/**
+ * Executes the result.
+ *
+ * @param invocation an encapsulation of the action execution state.
+ * @throws Exception if an error occurs when writing the text to the
servlet output stream.
+ */
+public void execute(ActionInvocation invocation) throws Exception {
+
+HttpServletResponse response = ServletActionContext.getResponse();
+Writer writer = response.getWriter();
+writer.write("Hello");
+writer.flush();
+}
+}
Modified:
struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/res
svn commit: r554151 - in /struts/maven/trunk/struts2-archetype-blank: pom.xml src/main/resources/archetype-resources/pom.xml
Author: mrdon Date: Sat Jul 7 00:15:57 2007 New Revision: 554151 URL: http://svn.apache.org/viewvc?view=rev&rev=554151 Log: Updating to 2.0.8 Modified: struts/maven/trunk/struts2-archetype-blank/pom.xml struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml Modified: struts/maven/trunk/struts2-archetype-blank/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/pom.xml?view=diff&rev=554151&r1=554150&r2=554151 == --- struts/maven/trunk/struts2-archetype-blank/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-blank/pom.xml Sat Jul 7 00:15:57 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-blank - 2.0.5-SNAPSHOT + 2.0.8-SNAPSHOT maven-plugin Struts 2 Archetypes - Blank Modified: struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml?view=diff&rev=554151&r1=554150&r2=554151 == --- struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml Sat Jul 7 00:15:57 2007 @@ -21,13 +21,13 @@ org.springframework spring-mock -2.0.1 +2.0.5 test org.springframework spring-core -2.0.1 +2.0.5 test @@ -48,7 +48,7 @@ org.apache.struts struts2-core -2.0.5 +2.0.8
svn commit: r554201 - /struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml
Author: mrdon Date: Sat Jul 7 06:37:31 2007 New Revision: 554201 URL: http://svn.apache.org/viewvc?view=rev&rev=554201 Log: Fix result-type name Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml Modified: struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml?view=diff&rev=554201&r1=554200&r2=554201 == --- struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml (original) +++ struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/src/main/resources/struts-plugin.xml Sat Jul 7 06:37:31 2007 @@ -40,9 +40,9 @@ In this example, we create a package that defines a result: --> - + - +
svn commit: r556503 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
Author: mrdon
Date: Sun Jul 15 22:11:44 2007
New Revision: 556503
URL: http://svn.apache.org/viewvc?view=rev&rev=556503
Log:
Streamline code to not execute code when an attribute is not null
WW-1959
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java?view=diff&rev=556503&r1=556502&r2=556503
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
Sun Jul 15 22:11:44 2007
@@ -63,24 +63,26 @@
ActionContext ctx = ActionContext.getContext();
Object attribute = super.getAttribute(s);
-boolean alreadyIn = false;
-Boolean b = (Boolean) ctx.get("__requestWrapper.getAttribute");
-if (b != null) {
-alreadyIn = b.booleanValue();
-}
+if (attribute == null) {
+boolean alreadyIn = false;
+Boolean b = (Boolean) ctx.get("__requestWrapper.getAttribute");
+if (b != null) {
+alreadyIn = b.booleanValue();
+}
-// note: we don't let # come through or else a request for
-// #attr.foo or #request.foo could cause an endless loop
-if (!alreadyIn && attribute == null && s.indexOf("#") == -1) {
-try {
-// If not found, then try the ValueStack
-ctx.put("__requestWrapper.getAttribute", Boolean.TRUE);
-ValueStack stack = ctx.getValueStack();
-if (stack != null) {
-attribute = stack.findValue(s);
+// note: we don't let # come through or else a request for
+// #attr.foo or #request.foo could cause an endless loop
+if (!alreadyIn && s.indexOf("#") == -1) {
+try {
+// If not found, then try the ValueStack
+ctx.put("__requestWrapper.getAttribute", Boolean.TRUE);
+ValueStack stack = ctx.getValueStack();
+if (stack != null) {
+attribute = stack.findValue(s);
+}
+} finally {
+ctx.put("__requestWrapper.getAttribute", Boolean.FALSE);
}
-} finally {
-ctx.put("__requestWrapper.getAttribute", Boolean.FALSE);
}
}
return attribute;
svn commit: r556506 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/mapper/ test/java/org/apache/struts2/dispatcher/mapper/
Author: mrdon
Date: Sun Jul 15 22:30:37 2007
New Revision: 556506
URL: http://svn.apache.org/viewvc?view=rev&rev=556506
Log:
Adding ability to add custom action parameter prefixes
WW-1815
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?view=diff&rev=556506&r1=556505&r2=556506
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Sun Jul 15 22:30:37 2007
@@ -235,6 +235,17 @@
}
};
}
+
+/**
+ * Adds a parameter action. Should only be called during initialization
+ *
+ * @param prefix The string prefix to trigger the action
+ * @param parameterAction The parameter action to execute
+ * @since 2.1.0
+*/
+protected void addParameterAction(String prefix, ParameterAction
parameterAction) {
+prefixTrie.put(prefix, parameterAction);
+}
@Inject(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION)
public void setAllowDynamicMethodCalls(String allow) {
@@ -491,11 +502,4 @@
return allowSlashesInActionNames;
}
- /**
- * Defines a parameter action prefix
- */
-interface ParameterAction {
-void execute(String key, ActionMapping mapping);
-}
-
}
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java?view=auto&rev=556506
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
(added)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ParameterAction.java
Sun Jul 15 22:30:37 2007
@@ -0,0 +1,13 @@
+package org.apache.struts2.dispatcher.mapper;
+
+/**
+ * Defines a parameter action prefix. This is executed when the configured
prefix key is matched in a parameter
+ * name, allowing the implementation to manipulate the action mapping
accordingly. For example, if the "action:foo"
+ * parameter name was found, and a ParameterAction implementation was
registered to handle the "action" prefix, the
+ * execute method would be called, allowing the implementation to set the
"method" value on the ActionMapping.
+ *
+ * @since 2.1.0
+ */
+public interface ParameterAction {
+void execute(String key, ActionMapping mapping);
+}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?view=diff&rev=556506&r1=556505&r2=556506
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Sun Jul 15 22:30:37 2007
@@ -302,7 +302,7 @@
assertEquals(actionMapping.getName(), "myAction");
}
-
+
public void testActionPrefix_fromImageButton() throws Exception {
Map parameterMap = new HashMap();
parameterMap.put(DefaultActionMapper.ACTION_PREFIX + "myAction", "");
@@ -381,6 +381,25 @@
assertTrue(result instanceof ServletRedirectResult);
// TODO: need to test location but there's noaccess to the
property/method, unless we use reflection
+}
+
+public void testCustomActionPrefix() throws Exception {
+Map parameterMap = new HashMap();
+parameterMap.put("foo:myAction", "");
+
+StrutsMockHttpServletRequest request = new
StrutsMockHttpServletRequest();
+request.setParameterMap(parameterMap);
+request.setupGetServletPath("/someServletPath.action");
+
+DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+defaultActionMapper.addParameterAction("foo",
svn commit: r556512 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Author: mrdon
Date: Sun Jul 15 23:06:53 2007
New Revision: 556512
URL: http://svn.apache.org/viewvc?view=rev&rev=556512
Log:
Somewhat improving the location variable name
WW-1807
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java?view=diff&rev=556512&r1=556511&r2=556512
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
Sun Jul 15 23:06:53 2007
@@ -143,28 +143,28 @@
}
/**
- * Execute this result, using the specified template location.
+ * Execute this result, using the specified template locationArg.
*
- * The template location has already been interoplated for any variable
substitutions
+ * The template locationArg has already been interoplated for any variable
substitutions
*
* this method obtains the freemarker configuration and the object wrapper
from the provided hooks.
* It them implements the template processing workflow by calling the
hooks for
* preTemplateProcess and postTemplateProcess
*/
-public void doExecute(String location, ActionInvocation invocation) throws
IOException, TemplateException {
-this.location = location;
+public void doExecute(String locationArg, ActionInvocation invocation)
throws IOException, TemplateException {
+this.location = locationArg;
this.invocation = invocation;
this.configuration = getConfiguration();
this.wrapper = getObjectWrapper();
-if (!location.startsWith("/")) {
+if (!locationArg.startsWith("/")) {
ActionContext ctx = invocation.getInvocationContext();
HttpServletRequest req = (HttpServletRequest)
ctx.get(ServletActionContext.HTTP_REQUEST);
String base = ResourceUtil.getResourceBase(req);
-location = base + "/" + location;
+locationArg = base + "/" + locationArg;
}
-Template template = configuration.getTemplate(location,
deduceLocale());
+Template template = configuration.getTemplate(locationArg,
deduceLocale());
TemplateModel model = createModel();
// Give subclasses a chance to hook into preprocessing
svn commit: r556624 - in /struts/struts2/trunk/core/src/test: java/org/apache/struts2/views/jsp/ui/TextfieldTest.java resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt resources/org/apache/str
Author: mrdon
Date: Mon Jul 16 06:35:09 2007
New Revision: 556624
URL: http://svn.apache.org/viewvc?view=rev&rev=556624
Log:
Adding tests to ensure recursive value attribute processing has been disabled
WW-2030
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java?view=diff&rev=556624&r1=556623&r2=556624
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
Mon Jul 16 06:35:09 2007
@@ -148,4 +148,37 @@
verify(TextFieldTag.class.getResource("Textfield-1.txt"));
}
+
+public void testSimple_recursionTest() throws Exception {
+TestAction testAction = (TestAction) action;
+testAction.setFoo("%{1+1}");
+
+TextFieldTag tag = new TextFieldTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setName("myname");
+tag.setValue("%{foo}");
+tag.setSize("10");
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(TextFieldTag.class.getResource("Textfield-5.txt"));
+}
+
+public void testSimple_recursionTestNoValue() throws Exception {
+TestAction testAction = (TestAction) action;
+testAction.setFoo("%{1+1}");
+
+TextFieldTag tag = new TextFieldTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setName("foo");
+tag.setSize("10");
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(TextFieldTag.class.getResource("Textfield-6.txt"));
+}
}
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt?view=auto&rev=556624
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
(added)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt
Mon Jul 16 06:35:09 2007
@@ -0,0 +1,4 @@
+
+mylabel:
+
+
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt?view=auto&rev=556624
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
(added)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt
Mon Jul 16 06:35:09 2007
@@ -0,0 +1,4 @@
+
+mylabel:
+
+
svn commit: r556913 [2/2] - in /struts/sandbox/trunk/struts2-rest-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts2/ src/main/java/
Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$1.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$2.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%242.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$2.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$3.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%243.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$3.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$4.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%244.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$4.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$5.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%245.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$5.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$6.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%246.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$6.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$7.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%247.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$7.class -- svn:mime-type = application/octet-stream Added: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$FooAction.class URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest%24FooAction.class?view=auto&rev=556913 == Binary file - no diff available. Propchange: struts/sandbox/trunk/struts2-rest-plugin/target/test-classes/org/apache/struts2/rest/RestActionInvoicationTest$FooAction.class -- svn:mime-type = application/octet-stream
svn commit: r556917 - in /struts/sandbox/trunk/struts2-rest-plugin: .classpath .project README.txt target/
Author: mrdon Date: Tue Jul 17 05:57:24 2007 New Revision: 556917 URL: http://svn.apache.org/viewvc?view=rev&rev=556917 Log: Removing unnecessary files Removed: struts/sandbox/trunk/struts2-rest-plugin/.classpath struts/sandbox/trunk/struts2-rest-plugin/.project struts/sandbox/trunk/struts2-rest-plugin/README.txt struts/sandbox/trunk/struts2-rest-plugin/target/
svn commit: r556919 - in /struts/sandbox/trunk/struts2-rest-plugin/src: main/java/org/apache/struts2/rest/ main/java/org/apache/struts2/rest/handler/ test/java/org/apache/struts2/rest/
Author: mrdon Date: Tue Jul 17 06:02:12 2007 New Revision: 556919 URL: http://svn.apache.org/viewvc?view=rev&rev=556919 Log: Fixing license headers Modified: struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxy.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/Restful.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/MimeTypeHandler.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamJsonHandler.java struts/sandbox/trunk/struts2-rest-plugin/src/test/java/org/apache/struts2/rest/RestActionInvoicationTest.java Modified: struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java?view=diff&rev=556919&r1=556918&r2=556919 == --- struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java (original) +++ struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java Tue Jul 17 06:02:12 2007 @@ -1,3 +1,23 @@ +/* + * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.struts2.rest; import java.util.List; Modified: struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java?view=diff&rev=556919&r1=556918&r2=556919 == --- struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java (original) +++ struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java Tue Jul 17 06:02:12 2007 @@ -1,6 +1,22 @@ /* - * Copyright (c) 2002-2006 by OpenSymphony - * All rights reserved. + * $Id: Restful2ActionMapper.java 540819 2007-05-23 02:48:36Z mrdon $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.apache.struts2.rest; Modified: struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxy.java URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxy.java?view=diff&rev=556919&r1=556918&r2=556919 == --- struts/sandbox/trunk/struts2-rest-plugin/src/main/java/or
svn commit: r557112 - in /struts/maven/trunk: struts2-archetype-dbportlet/ struts2-archetype-dbportlet/src/main/resources/archetype-resources/ struts2-archetype-portlet/ struts2-archetype-portlet/src/
Author: mrdon Date: Tue Jul 17 18:48:21 2007 New Revision: 557112 URL: http://svn.apache.org/viewvc?view=rev&rev=557112 Log: Updating Struts 2 versions for related archetypes Modified: struts/maven/trunk/struts2-archetype-dbportlet/pom.xml struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-portlet/pom.xml struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-starter/pom.xml struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml Modified: struts/maven/trunk/struts2-archetype-dbportlet/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/pom.xml?view=diff&rev=557112&r1=557111&r2=557112 == --- struts/maven/trunk/struts2-archetype-dbportlet/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-dbportlet/pom.xml Tue Jul 17 18:48:21 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-dbportlet - 2.0.5-SNAPSHOT + 2.0.8-SNAPSHOT maven-plugin Struts 2 Archetypes - Database Portlet Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml?view=diff&rev=557112&r1=557111&r2=557112 == --- struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml Tue Jul 17 18:48:21 2007 @@ -23,13 +23,13 @@ org.apache.struts struts2-core -2.0.5 +2.0.8 org.apache.struts struts2-codebehind-plugin -2.0.5 +2.0.8 commons-lang @@ -41,7 +41,7 @@ org.apache.struts struts2-spring-plugin -2.0.5 +2.0.8 org.springframework Modified: struts/maven/trunk/struts2-archetype-portlet/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-portlet/pom.xml?view=diff&rev=557112&r1=557111&r2=557112 == --- struts/maven/trunk/struts2-archetype-portlet/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-portlet/pom.xml Tue Jul 17 18:48:21 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-portlet - 2.0.5-SNAPSHOT + 2.0.8-SNAPSHOT maven-plugin Struts 2 Archetypes - Portlet Modified: struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml?view=diff&rev=557112&r1=557111&r2=557112 == --- struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml Tue Jul 17 18:48:21 2007 @@ -23,13 +23,13 @@ org.apache.struts struts2-core -2.0.5 +2.0.8 org.apache.struts struts2-codebehind-plugin -2.0.5 +2.0.8 commons-lang Modified: struts/maven/trunk/struts2-archetype-starter/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/pom.xml?view=diff&rev=557112&r1=557111&r2=557112 == --- struts/maven/trunk/struts2-archetype-starter/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-starter/pom.xml Tue Jul 17 18:48:21 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-starter - 2.0.6-SNAPSHOT + 2.0.8-SNAPSHOT maven-plugin Struts 2 Archetypes - Starter Modified: struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml?view=diff&rev=557112&r1=557111&r2=557112 == --- struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml Tue Jul 17 18:48
svn commit: r560043 - in /struts/maven/trunk: struts2-archetype-blank/ struts2-archetype-blank/src/main/resources/archetype-resources/ struts2-archetype-dbportlet/ struts2-archetype-dbportlet/src/main
Author: mrdon Date: Thu Jul 26 17:54:39 2007 New Revision: 560043 URL: http://svn.apache.org/viewvc?view=rev&rev=560043 Log: Updating the archetypes to Struts 2.0.9 Modified: struts/maven/trunk/struts2-archetype-blank/README.txt struts/maven/trunk/struts2-archetype-blank/pom.xml struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-dbportlet/README.txt struts/maven/trunk/struts2-archetype-dbportlet/pom.xml struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-plugin/pom.xml struts/maven/trunk/struts2-archetype-plugin/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-portlet/README.txt struts/maven/trunk/struts2-archetype-portlet/pom.xml struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml struts/maven/trunk/struts2-archetype-starter/README.txt struts/maven/trunk/struts2-archetype-starter/pom.xml struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml Modified: struts/maven/trunk/struts2-archetype-blank/README.txt URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/README.txt?view=diff&rev=560043&r1=560042&r2=560043 == --- struts/maven/trunk/struts2-archetype-blank/README.txt (original) +++ struts/maven/trunk/struts2-archetype-blank/README.txt Thu Jul 26 17:54:39 2007 @@ -20,7 +20,7 @@ -DartifactId=myWebApp \ -DarchetypeGroupId=org.apache.struts \ -DarchetypeArtifactId=struts2-archetype-blank \ - -DarchetypeVersion=2.0.2-SNAPSHOT \ + -DarchetypeVersion=2.0.9-SNAPSHOT \ -DremoteRepositories=http://people.apache.org/repo/m2-snapshot-repository IMPORTANT: Modified: struts/maven/trunk/struts2-archetype-blank/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/pom.xml?view=diff&rev=560043&r1=560042&r2=560043 == --- struts/maven/trunk/struts2-archetype-blank/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-blank/pom.xml Thu Jul 26 17:54:39 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-blank - 2.0.8-SNAPSHOT + 2.0.9-SNAPSHOT maven-plugin Struts 2 Archetypes - Blank Modified: struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml?view=diff&rev=560043&r1=560042&r2=560043 == --- struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml Thu Jul 26 17:54:39 2007 @@ -48,7 +48,7 @@ org.apache.struts struts2-core -2.0.8 +2.0.9 Modified: struts/maven/trunk/struts2-archetype-dbportlet/README.txt URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/README.txt?view=diff&rev=560043&r1=560042&r2=560043 == --- struts/maven/trunk/struts2-archetype-dbportlet/README.txt (original) +++ struts/maven/trunk/struts2-archetype-dbportlet/README.txt Thu Jul 26 17:54:39 2007 @@ -22,7 +22,7 @@ -DartifactId=myWebApp \ -DarchetypeGroupId=org.apache.struts \ -DarchetypeArtifactId=struts2-archetype-dbportlet \ - -DarchetypeVersion=2.0.3-SNAPSHOT \ + -DarchetypeVersion=2.0.9-SNAPSHOT \ -DremoteRepositories=http://people.apache.org/maven-snapshot-repository - to compile, execute Modified: struts/maven/trunk/struts2-archetype-dbportlet/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-dbportlet/pom.xml?view=diff&rev=560043&r1=560042&r2=560043 == --- struts/maven/trunk/struts2-archetype-dbportlet/pom.xml (original) +++ struts/maven/trunk/struts2-archetype-dbportlet/pom.xml Thu Jul 26 17:54:39 2007 @@ -9,7 +9,7 @@ 4.0.0 struts2-archetype-dbportlet - 2.0.8-SNAPSHOT + 2.0.9-SNAPSHOT maven-plugin Struts 2 Archetypes - Database Portlet Modified: struts/maven/trunk/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/s
svn commit: r560720 - in /struts/sandbox/trunk/struts2-osgi-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts2/ src/main/java/org/ap
Author: mrdon
Date: Sun Jul 29 06:45:02 2007
New Revision: 560720
URL: http://svn.apache.org/viewvc?view=rev&rev=560720
Log:
initial import
Added:
struts/sandbox/trunk/struts2-osgi-plugin/
struts/sandbox/trunk/struts2-osgi-plugin/pom.xml
struts/sandbox/trunk/struts2-osgi-plugin/src/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundleAccessor.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundleResourceLoader.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/DefaultBundleAccessor.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/DelegatingObjectFactory.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/PackageLoader.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/StrutsActivator.java
struts/sandbox/trunk/struts2-osgi-plugin/src/main/resources/
struts/sandbox/trunk/struts2-osgi-plugin/src/main/resources/struts-plugin.xml
Added: struts/sandbox/trunk/struts2-osgi-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/pom.xml?view=auto&rev=560720
==
--- struts/sandbox/trunk/struts2-osgi-plugin/pom.xml (added)
+++ struts/sandbox/trunk/struts2-osgi-plugin/pom.xml Sun Jul 29 06:45:02 2007
@@ -0,0 +1,60 @@
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.struts
+struts2-plugins
+2.0.9
+
+org.apache.struts
+struts2-osgi-plugin
+jar
+1.0-SNAPSHOT
+Struts 2 OSGI Plugin
+
+
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-osgi-plugin/
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-osgi-plugin/
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-osgi-plugin/
+
+
+
+
+org.apache.felix
+org.apache.felix.main
+0.9.0-incubator-SNAPSHOT
+
+
+
+org.apache.struts
+struts2-core
+2.0.9
+
+
+
+velocity-tools
+velocity-tools
+1.1
+
+
+
+
+velocity
+velocity
+1.4
+
+
+velocity
+velocity-dep
+1.4
+
+
+
+junit
+junit
+test
+3.8.1
+
+
+
Added:
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundleAccessor.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundleAccessor.java?view=auto&rev=560720
==
---
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundleAccessor.java
(added)
+++
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundleAccessor.java
Sun Jul 29 06:45:02 2007
@@ -0,0 +1,17 @@
+package org.apache.struts2.osgi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+
+public interface BundleAccessor {
+
+void setBundles(Map bundles);
+Class loadClass(String name) throws ClassNotFoundException;
+InputStream loadResourceAsStream(String name) throws IOException;
+URL loadResource(String name);
+
+}
Added:
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java?view=auto&rev=560720
==
---
struts/sandbox/trunk/struts2-osgi-plugin/src/main/java/org/apache/struts2/osgi/BundlePackageLoader.java
(added)
+++
struts/sandbox
svn commit: r560966 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Author: mrdon
Date: Mon Jul 30 06:08:11 2007
New Revision: 560966
URL: http://svn.apache.org/viewvc?view=rev&rev=560966
Log:
Making the mapper easier to extend
WW-2078
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?view=diff&rev=560966&r1=560965&r2=560966
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Mon Jul 30 06:08:11 2007
@@ -162,25 +162,25 @@
*/
public class DefaultActionMapper implements ActionMapper {
-static final String METHOD_PREFIX = "method:";
+protected static final String METHOD_PREFIX = "method:";
-static final String ACTION_PREFIX = "action:";
+protected static final String ACTION_PREFIX = "action:";
-static final String REDIRECT_PREFIX = "redirect:";
+protected static final String REDIRECT_PREFIX = "redirect:";
-static final String REDIRECT_ACTION_PREFIX = "redirect-action:";
+protected static final String REDIRECT_ACTION_PREFIX = "redirect-action:";
-private boolean allowDynamicMethodCalls = true;
+protected boolean allowDynamicMethodCalls = true;
-private boolean allowSlashesInActionNames = false;
+protected boolean allowSlashesInActionNames = false;
-private boolean alwaysSelectFullNamespace = false;
+protected boolean alwaysSelectFullNamespace = false;
-private PrefixTrie prefixTrie = null;
+protected PrefixTrie prefixTrie = null;
-List extensions = new ArrayList() {{ add("action");}};
+protected List extensions = new ArrayList() {{ add("action");}};
-private Container container;
+protected Container container;
public DefaultActionMapper() {
prefixTrie = new PrefixTrie() {
@@ -266,7 +266,16 @@
public void setContainer(Container container) {
this.container = container;
}
-
+
+@Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)
+public void setExtensions(String extensions) {
+if (!"".equals(extensions)) {
+this.extensions = Arrays.asList(extensions.split(","));
+} else {
+this.extensions = null;
+}
+}
+
/*
* (non-Javadoc)
*
@@ -347,7 +356,7 @@
* @param mapping
*The action mapping to populate
*/
-void parseNameAndNamespace(String uri, ActionMapping mapping,
+protected void parseNameAndNamespace(String uri, ActionMapping mapping,
ConfigurationManager configManager) {
String namespace, name;
int lastSlash = uri.lastIndexOf("/");
@@ -401,7 +410,7 @@
*The action name
* @return The action name without its extension
*/
-String dropExtension(String name) {
+protected String dropExtension(String name) {
if (extensions == null) {
return name;
}
@@ -419,7 +428,7 @@
/**
* Returns null if no extension is specified.
*/
-String getDefaultExtension() {
+protected String getDefaultExtension() {
if (extensions == null) {
return null;
} else {
@@ -427,15 +436,6 @@
}
}
-@Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)
-public void setExtensions(String extensions) {
-if (!"".equals(extensions)) {
-this.extensions = Arrays.asList(extensions.split(","));
-} else {
-this.extensions = null;
-}
-}
-
/**
* Gets the uri from the request
*
@@ -443,7 +443,7 @@
*The request
* @return The uri
*/
-String getUri(HttpServletRequest request) {
+protected String getUri(HttpServletRequest request) {
// handle http dispatcher includes.
String uri = (String) request
.getAttribute("javax.servlet.include.servlet_path");
svn commit: r565259 [9/9] - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/views/annotations/ site/resources/tags/
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html?view=diff&rev=565259&r1=565258&r2=565259 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/url.html Mon Aug 13 00:55:18 2007 @@ -31,7 +31,7 @@ action false - true + false String The action to generate the URL for, if not using value @@ -39,7 +39,7 @@ anchor false - true + false String The anchor for this URL @@ -47,7 +47,7 @@ encode false true - true + false Boolean Whether to encode parameters @@ -55,7 +55,7 @@ escapeAmp false true - true + false Boolean Specifies whether to escape ampersand (&) to (&) or not @@ -63,7 +63,7 @@ id false - true + false String id for referencing element. For UI and form tags it will be used as HTML id attribute @@ -71,7 +71,7 @@ includeContext false true - true + false Boolean Whether actual context should be included in URL @@ -79,7 +79,7 @@ includeParams false get - true + false String The includeParams attribute may have the value 'none', 'get' or 'all' @@ -87,7 +87,7 @@ method false - true + false String The method of action to use @@ -95,7 +95,7 @@ namespace false - true + false String The namespace to use @@ -103,7 +103,7 @@ portletMode false - true + false String The resulting portlet mode @@ -111,7 +111,7 @@ portletUrlType false - true + false String Specifies if t
svn commit: r570056 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java
Author: mrdon Date: Mon Aug 27 02:42:54 2007 New Revision: 570056 URL: http://svn.apache.org/viewvc?rev=570056&view=rev Log: Fixing bad javadoc comment Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java?rev=570056&r1=570055&r2=570056&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java Mon Aug 27 02:42:54 2007 @@ -310,7 +310,7 @@ * * * - * tooltipConfig is deprecated, use individual tooltip configuration attributes instead + * tooltipConfig is deprecated, use individual tooltip configuration attributes instead * * Every Form UI component (in xhtml / css_xhtml or any other that extends them) can * have tooltips assigned to them. The Form component's tooltip related attribute, once
svn commit: r571945 - in /struts/struts2/trunk/plugins/config-browser/src/main: java/org/apache/struts2/config_browser/ resources/ resources/config-browser/
Author: mrdon
Date: Sun Sep 2 03:49:26 2007
New Revision: 571945
URL: http://svn.apache.org/viewvc?rev=571945&view=rev
Log:
Added display of constants and beans
WW-2153
Added:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConstantsAction.java
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/showBeans.ftl
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/showConstants.ftl
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/config-styles.css
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=571945&r1=571944&r2=571945&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
Sun Sep 2 03:49:26 2007
@@ -26,6 +26,8 @@
import org.apache.struts2.StrutsConstants;
import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.inject.Inject;
@@ -41,7 +43,14 @@
private String namespace = "";
private Set namespaces;
private String extension;
+
+private ConfigurationHelper configHelper;
+@Inject
+public void setConfigurationHelper(ConfigurationHelper cfg) {
+this.configHelper = cfg;
+}
+
public Set getActionNames() {
return actionNames;
}
@@ -60,7 +69,7 @@
}
public ActionConfig getConfig(String actionName) {
-return ConfigurationHelper.getActionConfig(namespace, actionName);
+return configHelper.getActionConfig(namespace, actionName);
}
public Set getNamespaces() {
@@ -75,7 +84,7 @@
}
public String execute() throws Exception {
-namespaces = ConfigurationHelper.getNamespaces();
+namespaces = configHelper.getNamespaces();
if (namespaces.size() == 0) {
addActionError("There are no namespaces in this configuration");
return ERROR;
@@ -84,7 +93,7 @@
namespace = "";
}
actionNames =
-new TreeSet(ConfigurationHelper.getActionNames(namespace));
+new TreeSet(configHelper.getActionNames(namespace));
return SUCCESS;
}
}
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java?rev=571945&r1=571944&r2=571945&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
Sun Sep 2 03:49:26 2007
@@ -26,25 +26,34 @@
import org.apache.struts2.dispatcher.Dispatcher;
+import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
/**
* ConfigurationHelper
*/
public class ConfigurationHelper {
+
+private Configuration configuration;
-public static Set getNamespaces() {
+@Inject
+public void setConfiguration(Configuration config) {
+this.configuration = config;
+}
+
+public Set getNamespaces() {
Set namespaces = Collections.EMPTY_SET;
-Map allActionConfigs =
Dispatcher.getInstance().getConfigurationManager().getConfiguration().getRuntimeConfigu
svn commit: r571958 - /struts/struts2/trunk/plugins/config-browser/pom.xml
Author: mrdon Date: Sun Sep 2 04:39:33 2007 New Revision: 571958 URL: http://svn.apache.org/viewvc?rev=571958&view=rev Log: Taking the Struts 1.3.5 jar out of the dependency chain WW-1715 Modified: struts/struts2/trunk/plugins/config-browser/pom.xml Modified: struts/struts2/trunk/plugins/config-browser/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/pom.xml?rev=571958&r1=571957&r2=571958&view=diff == --- struts/struts2/trunk/plugins/config-browser/pom.xml (original) +++ struts/struts2/trunk/plugins/config-browser/pom.xml Sun Sep 2 04:39:33 2007 @@ -40,6 +40,7 @@ http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/config-browser/ +
svn commit: r571991 - in /struts/struts2/trunk/plugins/config-browser: ./ src/main/java/org/apache/struts2/config_browser/ src/main/resources/ src/main/resources/config-browser/
Author: mrdon
Date: Sun Sep 2 07:33:15 2007
New Revision: 571991
URL: http://svn.apache.org/viewvc?rev=571991&view=rev
Log:
Adding printing of jar and plugin info
WW-2154
Added:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/showJars.ftl
Modified:
struts/struts2/trunk/plugins/config-browser/pom.xml
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
Modified: struts/struts2/trunk/plugins/config-browser/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/pom.xml?rev=571991&r1=571990&r2=571991&view=diff
==
--- struts/struts2/trunk/plugins/config-browser/pom.xml (original)
+++ struts/struts2/trunk/plugins/config-browser/pom.xml Sun Sep 2 07:33:15 2007
@@ -40,13 +40,4 @@
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/config-browser/
-
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=571991&r1=571990&r2=571991&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
Sun Sep 2 07:33:15 2007
@@ -44,7 +44,7 @@
private Set namespaces;
private String extension;
-private ConfigurationHelper configHelper;
+ConfigurationHelper configHelper;
@Inject
public void setConfigurationHelper(ConfigurationHelper cfg) {
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java?rev=571991&r1=571990&r2=571991&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ConfigurationHelper.java
Sun Sep 2 07:33:15 2007
@@ -20,15 +20,24 @@
*/
package org.apache.struts2.config_browser;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.util.ClassLoaderUtils;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ResolverUtil;
/**
* ConfigurationHelper
@@ -73,5 +82,18 @@
}
}
return config;
+}
+
+public List getJarProperties() throws IOException {
+ResolverUtil resolver = new ResolverUtil();
+List poms = new ArrayList();
+resolver.findNamedResource("pom.properties", "META-INF/maven");
+Set urls = resolver.getResources();
+for (URL url : urls) {
+Properties p = new Properties();
+p.load(url.openStream());
+poms.add(p);
+}
+return poms;
}
}
Added:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java?rev=571991&view=auto
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java
(added)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowJarsAction.java
Sun Sep 2 07:33:15 2007
@@ -0,0 +1,6
svn commit: r572216 - in /struts/struts2/trunk/core/src: main/resources/template/simple/radiomap.ftl test/java/org/apache/struts2/views/jsp/ui/RadioTest.java test/resources/org/apache/struts2/views/js
Author: mrdon
Date: Sun Sep 2 19:39:34 2007
New Revision: 572216
URL: http://svn.apache.org/viewvc?rev=572216&view=rev
Log:
Fixed selection of radio item when value is null
WW-2045
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl?rev=572216&r1=572215&r2=572216&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
Sun Sep 2 19:39:34 2007
@@ -37,7 +37,7 @@
name="${parameters.name?html}"<#rt/>
id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
-<#if tag.contains(parameters.nameValue, itemKeyStr)>
+<#if tag.contains(parameters.nameValue?default(''), itemKeyStr)>
checked="checked"<#rt/>
<#if itemKey?exists>
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=572216&r1=572215&r2=572216&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Sun Sep 2 19:39:34 2007
@@ -75,6 +75,28 @@
verify(RadioTag.class.getResource("Radio-2.txt"));
}
+
+public void testMapCheckedNull() throws Exception {
+TestAction testAction = (TestAction) action;
+testAction.setFoo("bar");
+
+HashMap map = new HashMap();
+map.put("1", "One");
+map.put("2", "Two");
+testAction.setMap(map);
+
+RadioTag tag = new RadioTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setName("myname");
+tag.setValue("%{map['3']}");
+tag.setList("[EMAIL PROTECTED]@{\"1\":\"One\", \"2\":\"Two\",
\"\":\"N/A\"}");
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(RadioTag.class.getResource("Radio-4.txt"));
+}
public void testSimple() throws Exception {
TestAction testAction = (TestAction) action;
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt?rev=572216&view=auto
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
(added)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Sun Sep 2 19:39:34 2007
@@ -0,0 +1,8 @@
+
+mylabel:
+
+Two
+One
+N/A
+
+
svn commit: r572219 - in /struts/struts2/trunk/core/src/test: java/org/apache/struts2/views/jsp/ui/RadioTest.java resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Author: mrdon
Date: Sun Sep 2 19:45:32 2007
New Revision: 572219
URL: http://svn.apache.org/viewvc?rev=572219&view=rev
Log:
Fixing j5-j6 bug in test WW-2045
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=572219&r1=572218&r2=572219&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Sun Sep 2 19:45:32 2007
@@ -90,7 +90,7 @@
tag.setLabel("mylabel");
tag.setName("myname");
tag.setValue("%{map['3']}");
-tag.setList("[EMAIL PROTECTED]@{\"1\":\"One\", \"2\":\"Two\",
\"\":\"N/A\"}");
+tag.setList("[EMAIL PROTECTED]@{\"1\":\"One\", \"2\":\"Two\",
\"\":\"N/A\"}");
tag.doStartTag();
tag.doEndTag();
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt?rev=572219&r1=572218&r2=572219&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Sun Sep 2 19:45:32 2007
@@ -1,8 +1,8 @@
mylabel:
-Two
-One
N/A
+One
+Two
svn commit: r572220 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/resources/template/simple/radiomap.ftl test/java/org/apache/struts2/views/jsp/ui/RadioTest.java test/resources/org/apache/
Author: mrdon
Date: Sun Sep 2 19:46:43 2007
New Revision: 572220
URL: http://svn.apache.org/viewvc?rev=572220&view=rev
Log:
Fixing j5-j6 bug in test WW-2045
Added:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
- copied, changed from r572216,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/radiomap.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/radiomap.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/radiomap.ftl?rev=572220&r1=572219&r2=572220&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/radiomap.ftl
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/radiomap.ftl
Sun Sep 2 19:46:43 2007
@@ -37,7 +37,7 @@
name="${parameters.name?html}"<#rt/>
id="${parameters.id?html}${itemKeyStr?html}"<#rt/>
-<#if tag.contains(parameters.nameValue, itemKeyStr)>
+<#if tag.contains(parameters.nameValue?default(''), itemKeyStr)>
checked="checked"<#rt/>
<#if itemKey?exists>
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java?rev=572220&r1=572219&r2=572220&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/RadioTest.java
Sun Sep 2 19:46:43 2007
@@ -75,6 +75,28 @@
verify(RadioTag.class.getResource("Radio-2.txt"));
}
+
+public void testMapCheckedNull() throws Exception {
+TestAction testAction = (TestAction) action;
+testAction.setFoo("bar");
+
+HashMap map = new HashMap();
+map.put("1", "One");
+map.put("2", "Two");
+testAction.setMap(map);
+
+RadioTag tag = new RadioTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setName("myname");
+tag.setValue("%{map['3']}");
+tag.setList("[EMAIL PROTECTED]@{\"1\":\"One\", \"2\":\"Two\",
\"\":\"N/A\"}");
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(RadioTag.class.getResource("Radio-4.txt"));
+}
public void testSimple() throws Exception {
TestAction testAction = (TestAction) action;
Copied:
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
(from r572216,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt)
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt?p2=struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt&p1=struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt&r1=572216&r2=572220&rev=572220&view=diff
==
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt
Sun Sep 2 19:46:43 2007
@@ -1,8 +1,8 @@
mylabel:
-Two
-One
N/A
+One
+Two
svn commit: r572225 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Author: mrdon
Date: Sun Sep 2 20:24:53 2007
New Revision: 572225
URL: http://svn.apache.org/viewvc?rev=572225&view=rev
Log:
Adding better error message when a Struts tag is used w/o the servlet filter
WW-1969
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?rev=572225&r1=572224&r2=572225&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Sun Sep 2 20:24:53 2007
@@ -38,6 +38,7 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -55,6 +56,11 @@
HttpServletResponse res = (HttpServletResponse)
pageContext.getResponse();
Dispatcher du = Dispatcher.getInstance();
+if (du == null) {
+throw new ConfigurationException("The Struts dispatcher cannot
be found. This is usually caused by "+
+"using Struts tags without the associated filter.
Struts tags are only usable when the request "+
+"has passed through its servlet filter, which
initializes the Struts dispatcher needed for this tag.");
+}
Map extraContext = du.createContextMap(new RequestMap(req),
req.getParameterMap(),
new SessionMap(req),
svn commit: r572226 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Author: mrdon
Date: Sun Sep 2 20:25:47 2007
New Revision: 572226
URL: http://svn.apache.org/viewvc?rev=572226&view=rev
Log:
Added better error message when a Struts tag is used w/o its filter
WW-1969
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java?rev=572226&r1=572225&r2=572226&view=diff
==
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java
Sun Sep 2 20:25:47 2007
@@ -38,6 +38,7 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
@@ -55,6 +56,11 @@
HttpServletResponse res = (HttpServletResponse)
pageContext.getResponse();
Dispatcher du = Dispatcher.getInstance();
+if (du == null) {
+throw new ConfigurationException("The Struts dispatcher cannot
be found. This is usually caused by "+
+"using Struts tags without the associated filter.
Struts tags are only usable when the request "+
+"has passed through its servlet filter, which
initializes the Struts dispatcher needed for this tag.");
+}
Map extraContext = du.createContextMap(new RequestMap(req),
req.getParameterMap(),
new SessionMap(req),
svn commit: r572228 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
Author: mrdon
Date: Sun Sep 2 20:43:57 2007
New Revision: 572228
URL: http://svn.apache.org/viewvc?rev=572228&view=rev
Log:
Switched the injection order to favor application scope WW-2125
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java?rev=572228&r1=572227&r2=572228&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
Sun Sep 2 20:43:57 2007
@@ -137,16 +137,16 @@
((ParameterAware) action).setParameters(context.getParameters());
}
-if (action instanceof RequestAware) {
-((RequestAware) action).setRequest((Map) context.get("request"));
+if (action instanceof ApplicationAware) {
+((ApplicationAware)
action).setApplication(context.getApplication());
}
-
+
if (action instanceof SessionAware) {
((SessionAware) action).setSession(context.getSession());
}
-
-if (action instanceof ApplicationAware) {
-((ApplicationAware)
action).setApplication(context.getApplication());
+
+if (action instanceof RequestAware) {
+((RequestAware) action).setRequest((Map) context.get("request"));
}
if (action instanceof PrincipalAware) {
svn commit: r572239 [3/3] - in /struts/sandbox/trunk/struts2-webwork2-plugin: ./ src/ src/main/ src/main/java/ src/main/java/com/ src/main/java/com/opensymphony/ src/main/java/com/opensymphony/webwork
Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/struts-plugin.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/struts-plugin.xml?rev=572239&view=auto == --- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/struts-plugin.xml (added) +++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/struts-plugin.xml Sun Sep 2 23:55:57 2007 @@ -0,0 +1,11 @@ + + +http://struts.apache.org/dtds/struts-2.0.dtd";> + + + + + + Added: struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/webwork-default.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/webwork-default.xml?rev=572239&view=auto == --- struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/webwork-default.xml (added) +++ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/webwork-default.xml Sun Sep 2 23:55:57 2007 @@ -0,0 +1,11 @@ + + +http://struts.apache.org/dtds/struts-2.0.dtd";> + + + + + + \ No newline at end of file
svn commit: r572239 [1/3] - in /struts/sandbox/trunk/struts2-webwork2-plugin: ./ src/ src/main/ src/main/java/ src/main/java/com/ src/main/java/com/opensymphony/ src/main/java/com/opensymphony/webwork
Author: mrdon Date: Sun Sep 2 23:55:57 2007 New Revision: 572239 URL: http://svn.apache.org/viewvc?rev=572239&view=rev Log: Initial import Added: struts/sandbox/trunk/struts2-webwork2-plugin/ struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt struts/sandbox/trunk/struts2-webwork2-plugin/NOTICE.txt struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml struts/sandbox/trunk/struts2-webwork2-plugin/src/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/webwork/dispatcher/FilterDispatcher.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Action.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionContext.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ActionSupport.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/LocaleProvider.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ModelDriven.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Preparable.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/TextProvider.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/Validateable.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAware.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/ValidationAwareSupport.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/NoParameters.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/com/opensymphony/xwork/interceptor/ParameterNameAware.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/java/org/apache/struts2/webwork2/WebWorkConfigurationProvider.java struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/META-INF/ struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/META-INF/webwork.tld struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/struts-plugin.xml struts/sandbox/trunk/struts2-webwork2-plugin/src/main/resources/webwork-default.xml Added: struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt?rev=572239&view=auto == --- struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt (added) +++ struts/sandbox/trunk/struts2-webwork2-plugin/LICENSE.txt Sun Sep 2 23:55:57 2007 @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permis
svn commit: r572240 - /struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml
Author: mrdon Date: Sun Sep 2 23:57:17 2007 New Revision: 572240 URL: http://svn.apache.org/viewvc?rev=572240&view=rev Log: Adding sitemesh plugin Modified: struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml Modified: struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml?rev=572240&r1=572239&r2=572240&view=diff == --- struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml (original) +++ struts/sandbox/trunk/struts2-webwork2-plugin/pom.xml Sun Sep 2 23:57:17 2007 @@ -21,6 +21,11 @@ 2.0.9 +org.apache.struts +struts2-sitemesh-plugin +2.0.9 + + javax.servlet servlet-api 2.4
svn commit: r572437 - /struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Author: mrdon Date: Mon Sep 3 15:16:49 2007 New Revision: 572437 URL: http://svn.apache.org/viewvc?rev=572437&view=rev Log: Removing the unused struts.configuration.files setting WW-1966 Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=572437&r1=572436&r2=572437&view=diff == --- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original) +++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Mon Sep 3 15:16:49 2007 @@ -180,9 +180,6 @@ ### Set to true for developers and false for production. struts.xslt.nocache=false -### A list of configuration files automatically loaded by Struts -struts.configuration.files=struts-default.xml,struts-plugin.xml,struts.xml - ### Whether to always select the namespace to be everything before the last slash or not struts.mapper.alwaysSelectFullNamespace=false
svn commit: r573454 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/util/ test/java/org/apache/struts2/c
Author: mrdon Date: Thu Sep 6 21:43:05 2007 New Revision: 573454 URL: http://svn.apache.org/viewvc?rev=573454&view=rev Log: Updating classes to match new XWork type conversion API XW-561 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=573454&r1=573453&r2=573454&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Thu Sep 6 21:43:05 2007 @@ -38,6 +38,8 @@ import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationException; import com.opensymphony.xwork2.config.ConfigurationProvider; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.impl.XWorkConverter; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.ContainerBuilder; import com.opensymphony.xwork2.inject.Context; @@ -45,8 +47,6 @@ import com.opensymphony.xwork2.inject.Scope; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.util.LocalizedTextUtil; -import com.opensymphony.xwork2.util.ObjectTypeDeterminer; -import com.opensymphony.xwork2.util.XWorkConverter; import com.opensymphony.xwork2.util.location.LocatableProperties; /** Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=573454&r1=573453&r2=573454&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Thu Sep 6 21:43:05 2007 @@ -59,12 +59,12 @@ import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.config.ConfigurationProvider; import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminerFactory; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.ContainerBuilder; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.LocalizedTextUtil; -import com.opensymphony.xwork2.util.ObjectTypeDeterminer; -import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.util.location.Location; Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java?rev=573454&r1=573453&r2=573454&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTypeConverter.java Thu Sep 6 21:43:05 2007 @@ -22,7 +22,7 @@ import java.util.Map; -import ognl.DefaultTypeConverter; +import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverter; /** * Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java?rev=573454&r1=573453&r2=573454&view=diff == --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java Thu Sep 6 21:43:05 2007 @@ -28,9 +28,9 @@ import org.apache.struts2.util.StrutsTypeConverter; +import com.opensymphony.xwork2.conversion.impl.XWorkConverter; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.uti
svn commit: r573461 - in /struts/struts2/trunk: core/src/main/resources/struts-default.xml plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java
Author: mrdon Date: Thu Sep 6 22:20:55 2007 New Revision: 573461 URL: http://svn.apache.org/viewvc?rev=573461&view=rev Log: Fixing references to xwork type system XW-561 Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=573461&r1=573460&r2=573461&view=diff == --- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original) +++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Thu Sep 6 22:20:55 2007 @@ -33,9 +33,9 @@ - - - + + + @@ -55,8 +55,8 @@ - - + + @@ -65,7 +65,7 @@ - + Modified: struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java?rev=573461&r1=573460&r2=573461&view=diff == --- struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java (original) +++ struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowBeansAction.java Thu Sep 6 22:20:55 2007 @@ -35,10 +35,10 @@ import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.TextProvider; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.impl.XWorkConverter; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ObjectTypeDeterminer; -import com.opensymphony.xwork2.util.XWorkConverter; /** * Shows the beans loaded by the internal Guice container. Only shows beans that are recognized by Struts as official
svn commit: r573609 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Author: mrdon
Date: Fri Sep 7 08:21:38 2007
New Revision: 573609
URL: http://svn.apache.org/viewvc?rev=573609&view=rev
Log:
Fixing test WW-2160
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=573609&r1=573608&r2=573609&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Fri Sep 7 08:21:38 2007
@@ -173,7 +173,9 @@
}
String val =
props.getProperty(StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS);
-props.setProperty("allowStaticMethodAccess", val);
+if (val != null) {
+props.setProperty("allowStaticMethodAccess", val);
+}
// TODO: This should be moved to XWork after 2.0.4
// struts.custom.i18n.resources
svn commit: r573606 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/StrutsConstants.java java/org/apache/struts2/config/BeanSelectionProvider.java resources/org/apache/struts2/defaul
Author: mrdon
Date: Fri Sep 7 08:18:09 2007
New Revision: 573606
URL: http://svn.apache.org/viewvc?rev=573606&view=rev
Log:
Turning off static method access in ognl expressions by default
WW-2160
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=573606&r1=573605&r2=573606&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Fri Sep 7 08:18:09 2007
@@ -161,5 +161,8 @@
/** The name of the parameter to create when mapping an id (used by some
action mappers) */
public static final String STRUTS_ID_PARAMETER_NAME =
"struts.mapper.idParameterName";
+
+ /** The name of the parameter to determine whether static method access
will be allowed in OGNL expressions or not */
+ public static final String STRUTS_ALLOW_STATIC_METHOD_ACCESS =
"struts.ognl.allowStaticMethodAccess";
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=573606&r1=573605&r2=573606&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Fri Sep 7 08:18:09 2007
@@ -172,6 +172,9 @@
props.setProperty("devMode", "false");
}
+String val =
props.getProperty(StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS);
+props.setProperty("allowStaticMethodAccess", val);
+
// TODO: This should be moved to XWork after 2.0.4
// struts.custom.i18n.resources
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=573606&r1=573605&r2=573606&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Fri Sep 7 08:18:09 2007
@@ -183,4 +183,7 @@
### Whether to always select the namespace to be everything before the last
slash or not
struts.mapper.alwaysSelectFullNamespace=false
+### Whether to allow static method access in OGNL expressions or not
+struts.ognl.allowStaticMethodAccess=false
+
### END SNIPPET: complete_file
svn commit: r573790 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/mapper/ main/resources/org/apache/struts2/ test/java/org/apache/struts2/dispatcher/ test/java/org/apach
Author: mrdon
Date: Sat Sep 8 00:07:48 2007
New Revision: 573790
URL: http://svn.apache.org/viewvc?rev=573790&view=rev
Log:
Make it possible to access actions without an extension
WW-2163
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=573790&r1=573789&r2=573790&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Sat Sep 8 00:07:48 2007
@@ -22,11 +22,14 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Scanner;
import java.util.Set;
+import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
@@ -178,7 +181,7 @@
protected PrefixTrie prefixTrie = null;
-protected List extensions = new ArrayList() {{ add("action");}};
+protected List extensions = new ArrayList() {{
add("action"); add("");}};
protected Container container;
@@ -270,7 +273,12 @@
@Inject(StrutsConstants.STRUTS_ACTION_EXTENSION)
public void setExtensions(String extensions) {
if (!"".equals(extensions)) {
-this.extensions = Arrays.asList(extensions.split(","));
+List list = new ArrayList();
+Scanner scanner = new Scanner(extensions).useDelimiter(",");
+while (scanner.hasNext()) {
+list.add(scanner.next());
+}
+this.extensions = Collections.unmodifiableList(list);
} else {
this.extensions = null;
}
@@ -414,13 +422,18 @@
if (extensions == null) {
return name;
}
-Iterator it = extensions.iterator();
-while (it.hasNext()) {
-String extension = "." + (String) it.next();
-if (name.endsWith(extension)) {
-name = name.substring(0, name.length() - extension.length());
-return name;
-}
+for (String ext : extensions) {
+if ("".equals(ext)) {
+if (name.indexOf('.') == -1) {
+return name;
+}
+} else {
+String extension = "." + ext;
+if (name.endsWith(extension)) {
+name = name.substring(0, name.length() -
extension.length());
+return name;
+}
+}
}
return null;
}
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=573790&r1=573789&r2=573790&view=diff
==
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
Sat Sep 8 00:07:48 2007
@@ -73,7 +73,9 @@
### Used by the DefaultActionMapper
### You may provide a comma separated list, e.g.
struts.action.extension=action,jnlp,do
-struts.action.extension=action
+### The blank extension allows you to match directory listings as well as pure
action names
+### without interfering with static resources.
+struts.action.extension=action,,
### Used by FilterDispatcher
### If true then Struts serves static content from inside its jar.
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java?rev=573790&r1=573789&r2=573790&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
(original)
+++
struts/struts2/trunk/core/src/test/ja
svn commit: r573805 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/ main/java/org/apache/struts2/dispatcher/mapper/ test/java/org/apache/struts2/dispatcher/mapper/
Author: mrdon
Date: Sat Sep 8 02:16:43 2007
New Revision: 573805
URL: http://svn.apache.org/viewvc?rev=573805&view=rev
Log:
Fix handling of empty extension during url creation
WW-2163
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java?rev=573805&r1=573804&r2=573805&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
Sat Sep 8 02:16:43 2007
@@ -137,6 +137,13 @@
public void setLocation(String location) {
this.location = location;
}
+
+/**
+ * Gets the location it was created with, mainly for testing
+ */
+public String getLocation() {
+return location;
+}
/**
* Returns the last parsed and encoded location value
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=573805&r1=573804&r2=573805&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Sat Sep 8 02:16:43 2007
@@ -228,7 +228,7 @@
ServletRedirectResult redirect = new
ServletRedirectResult();
container.inject(redirect);
String extension = getDefaultExtension();
-if (extension != null) {
+if (extension != null && extension.length() > 0) {
location += "." + extension;
}
redirect.setLocation(location);
@@ -499,8 +499,11 @@
String extension = getDefaultExtension();
if (extension != null) {
-if (uri.indexOf('.' + extension) == -1) {
-uri.append(".").append(extension);
+
+if (extension.length() == 0 || (extension.length() > 0 &&
uri.indexOf('.' + extension) == -1)) {
+if (extension.length() > 0) {
+uri.append(".").append(extension);
+}
if (params.length() > 0) {
uri.append(params);
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=573805&r1=573804&r2=573805&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Sat Sep 8 02:16:43 2007
@@ -27,6 +27,7 @@
import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.dispatcher.ServletRedirectResult;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
@@ -376,9 +377,34 @@
ActionMapping actionMapping = defaultActionMapper.getMapping(request,
configManager);
-Result result = actionMapping.getResult();
+StrutsResultSupport result = (StrutsResultSupport)
actionMapping.getResult();
assertNotNull(result);
assertTrue(result instanceof ServletRedirectResult);
+
+assertEquals("myAction.action", result.getLocation());
+
+// TODO: need to test location but there's noaccess to the
property/method, unless we use reflection
+}
+
+public void testRedirectActionPrefixWithEmptyExtension() throws Exception {
+Map parameterMap = new HashMap();
+
svn commit: r573816 - in /struts/struts2/trunk/plugins/codebehind/src: main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java test/java/org/apache/struts2/codebehind/CodebehindUnknownHa
Author: mrdon
Date: Sat Sep 8 03:56:10 2007
New Revision: 573816
URL: http://svn.apache.org/viewvc?rev=573816&view=rev
Log:
Adding ability to load templates from classpath, in addition to web context
WW-2146
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?rev=573816&r1=573815&r2=573816&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
Sat Sep 8 03:56:10 2007
@@ -21,6 +21,7 @@
package org.apache.struts2.codebehind;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -32,6 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.util.ClassLoaderUtils;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
@@ -107,7 +109,7 @@
}
String path = string(pathPrefix, actionName, "." , ext);
try {
-if (servletContext.getResource(path) != null) {
+if (locateTemplate(path) != null) {
actionConfig = buildActionConfig(path, namespace,
actionName, resultsByExtension.get(ext));
break;
}
@@ -148,7 +150,7 @@
}
String path = string(pathPrefix, actionName, "-", resultCode, "."
, ext);
try {
-if (servletContext.getResource(path) != null) {
+if (locateTemplate(path) != null) {
result = buildResult(path, resultCode,
resultsByExtension.get(ext), actionContext);
break;
}
@@ -158,7 +160,7 @@
path = string(pathPrefix, actionName, "." , ext);
try {
-if (servletContext.getResource(path) != null) {
+if (locateTemplate(path) != null) {
result = buildResult(path, resultCode,
resultsByExtension.get(ext), actionContext);
break;
}
@@ -209,6 +211,22 @@
}
return prefix + ns;
}
+
+URL locateTemplate(String path) throws MalformedURLException {
+URL template = servletContext.getResource(path);
+if (template != null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Loaded template '" + path + "' from servlet
context.");
+}
+} else {
+template = ClassLoaderUtils.getResource(path, getClass());
+if (template != null && LOG.isDebugEnabled()) {
+LOG.debug("Loaded template '" + path + "' from class path.");
+}
+}
+return template;
+}
+
/**
* Not used
Modified:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java?rev=573816&r1=573815&r2=573816&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
Sat Sep 8 03:56:10 2007
@@ -20,6 +20,8 @@
*/
package org.apache.struts2.codebehind;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.HashMap;
import javax.servlet.ServletContext;
@@ -28,6 +30,7 @@
import org.apache.struts2.config.NullResult;
import org.apache.struts2.dispatcher.ServletDispatcherResult;
+import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
@@ -71,6 +74,22 @@
assertEquals("/foo/", handler.determinePath("/", "/foo"));
assertEquals("/foo/", handler.
svn commit: r577728 [2/2] - in /struts/struts2/trunk: apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/ apps/showcase/src/main/resources/ core/src/main/java/org/apache/struts2/ core/
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java?rev=577728&r1=577727&r2=577728&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java
Thu Sep 20 05:51:41 2007
@@ -27,6 +27,7 @@
import junit.framework.TestCase;
import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.views.jsp.AbstractUITagTest;
import org.apache.struts2.views.jsp.StrutsMockHttpServletResponse;
import org.apache.struts2.views.jsp.StrutsMockServletContext;
@@ -41,7 +42,7 @@
* Test case for PlainTextResult.
*
*/
-public class PlainTextResultTest extends TestCase {
+public class PlainTextResultTest extends StrutsTestCase {
ValueStack stack;
MockActionInvocation invocation;
@@ -133,7 +134,7 @@
response = new StrutsMockHttpServletResponse();
response.setWriter(writer);
servletContext = new StrutsMockServletContext();
-stack = ValueStackFactory.getFactory().createValueStack();
+stack = ActionContext.getContext().getValueStack();
context = new ActionContext(stack.getContext());
context.put(StrutsStatics.HTTP_RESPONSE, response);
context.put(StrutsStatics.SERVLET_CONTEXT, servletContext);
@@ -144,6 +145,7 @@
protected void tearDown() throws Exception {
+super.tearDown();
stack = null;
invocation = null;
context = null;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java?rev=577728&r1=577727&r2=577728&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
Thu Sep 20 05:51:41 2007
@@ -132,6 +132,6 @@
MockActionInvocation ai = new MockActionInvocation();
ai.setInvocationContext(ac);
this.ai = ai;
-ai.setStack(ValueStackFactory.getFactory().createValueStack());
+ai.setStack(ActionContext.getContext().getValueStack());
}
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java?rev=577728&r1=577727&r2=577728&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java
Thu Sep 20 05:51:41 2007
@@ -29,6 +29,7 @@
import junit.framework.TestCase;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsTestCase;
import org.springframework.mock.web.MockHttpServletResponse;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
@@ -42,7 +43,7 @@
* Unit test for [EMAIL PROTECTED] StreamResult}.
*
*/
-public class StreamResultTest extends TestCase {
+public class StreamResultTest extends StrutsTestCase {
private StreamResult result;
private MockHttpServletResponse response;
@@ -166,11 +167,11 @@
}
protected void setUp() throws Exception {
+super.setUp();
response = new MockHttpServletResponse();
result = new StreamResult();
-stack = ValueStackFactory.getFactory().createValueStack();
-ActionContext.getContext().setValueStack(stack);
+stack = ActionContext.getContext().getValueStack();
MyImageAction action = new MyImageAction();
contentLength = (int) action.getContentLength();
@@ -186,7 +187,8 @@
-protected void tearDown() {
+protected void tearDown() throws Exception {
+super.tearDown();
response = null;
result = null;
stack = null;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java?rev=577728&r1=577727&r2=577728&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/StrutsRe
svn commit: r577733 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Author: mrdon Date: Thu Sep 20 06:10:00 2007 New Revision: 577733 URL: http://svn.apache.org/viewvc?rev=577733&view=rev Log: Updating docs on plugin api points WW-1715 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=577733&r1=577732&r2=577733&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Thu Sep 20 06:10:00 2007 @@ -112,8 +112,33 @@ * singleton * Loads and processes Velocity templates * + * + * com.opensymphony.xwork2.validator.ActionValidatorManager + * struts.actionValidatorManager + * singleton + * Main interface for validation managers (regular and annotation based). Handles both the loading of + * configuration and the actual validation (since 2.1) + * + * + * com.opensymphony.xwork2.util.ValueStackFactory + * struts.valueStackFactory + * singleton + * Creates value stacks (since 2.1) + * + * + * com.opensymphony.xwork2.reflection.ReflectionProvider + * struts.reflectionProvider + * singleton + * Provides reflection services, key place to plug in a custom expression language (since 2.1) + * + * + * com.opensymphony.xwork2.reflection.ReflectionContextFactory + * struts.reflectionContextFactory + * singleton + * Creates reflection context maps used for reflection and expression language operations (since 2.1) + * * - * + * * * *
svn commit: r577750 - /struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
Author: mrdon
Date: Thu Sep 20 06:54:31 2007
New Revision: 577750
URL: http://svn.apache.org/viewvc?rev=577750&view=rev
Log:
Fixing blank test
WW-1715
Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java?rev=577750&r1=577749&r2=577750&view=diff
==
--- struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
Thu Sep 20 06:54:31 2007
@@ -21,10 +21,12 @@
package example;
+import org.apache.struts2.StrutsTestCase;
+
import com.opensymphony.xwork2.ActionSupport;
import junit.framework.TestCase;
-public class HelloWorldTest extends TestCase {
+public class HelloWorldTest extends StrutsTestCase {
public void testHelloWorld() throws Exception {
HelloWorld hello_world = new HelloWorld();
svn commit: r577775 - in /struts/struts2/trunk/plugins: portlet/src/test/java/org/apache/struts2/portlet/dispatcher/ portlet/src/test/java/org/apache/struts2/portlet/interceptor/ portlet/src/test/java
Author: mrdon
Date: Thu Sep 20 07:43:38 2007
New Revision: 55
URL: http://svn.apache.org/viewvc?rev=55&view=rev
Log:
Fixing tests
WW-1715
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/struts1/src/test/java/org/apache/struts2/s1/Struts1FactoryTest.java
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java?rev=55&r1=54&r2=55&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/dispatcher/Jsr168DispatcherTest.java
Thu Sep 20 07:43:38 2007
@@ -44,6 +44,7 @@
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.portlet.PortletActionConstants;
+import org.easymock.EasyMock;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
@@ -133,7 +134,7 @@
initPortletConfig(initParams, new HashMap());
initRequest(requestParams, new HashMap(), sessionMap, new HashMap(),
PortletMode.VIEW, WindowState.NORMAL, false, null);
-setupActionFactory("/view", "testAction", "success",
ValueStackFactory.getFactory().createValueStack());
+setupActionFactory("/view", "testAction", "success",
EasyMock.createNiceMock(ValueStack.class));
mockInvocation.expects(once()).method("getStack").will(
returnValue(null));
@@ -165,7 +166,7 @@
initParams.put(StrutsConstants.STRUTS_ALWAYS_SELECT_FULL_NAMESPACE,
"true");
initPortletConfig(initParams, new HashMap());
initRequest(requestParams, new HashMap(), new HashMap(), new
HashMap(), PortletMode.VIEW, WindowState.NORMAL, true, null);
-setupActionFactory("/view", "testAction", "success",
ValueStackFactory.getFactory().createValueStack());
+setupActionFactory("/view", "testAction", "success",
EasyMock.createNiceMock(ValueStack.class));
//mockSession.expects(once()).method("setAttribute").with(new
Constraint[]{eq(PortletActionConstants.LAST_MODE), eq(PortletMode.VIEW)});
try {
dispatcher
@@ -266,7 +267,7 @@
initPortletConfig(initParams, new HashMap());
initRequest(requestParams, new HashMap(), sessionMap, new HashMap(),
mode, WindowState.NORMAL, false, null);
-setupActionFactory("/edit", "default", "success",
ValueStackFactory.getFactory().createValueStack());
+setupActionFactory("/edit", "default", "success",
EasyMock.createNiceMock(ValueStack.class));
mockInvocation.expects(once()).method("getStack").will(
returnValue(null));
Modified:
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java?rev=55&r1=54&r2=55&view=diff
==
---
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java
Thu Sep 20 07:43:38 2007
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
+import org.apache.struts2.StrutsTestCase;
import org.apache.struts2.dispatcher.DefaultActionSupport;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
@@ -38,11 +39,12 @@
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
-public class PortletStateInterceptorTest extends TestCase implements
PortletActionConstants {
+public class PortletStateInterceptorTest extends StrutsTestCase implements
PortletAc
svn commit: r578005 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
Author: mrdon
Date: Fri Sep 21 00:28:45 2007
New Revision: 578005
URL: http://svn.apache.org/viewvc?rev=578005&view=rev
Log:
Minor spelling fixes
WW-2184
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java?rev=578005&r1=578004&r2=578005&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java
Fri Sep 21 00:28:45 2007
@@ -68,9 +68,9 @@
*
* Important: Because the action will be running in a seperate
thread, you can't use ActionContext because it
* is a ThreadLocal. This means if you need to access, for example, session
data, you need to implement SessionAware
- * rather than calling ActionContext.getSesion().
+ * rather than calling ActionContext.getSession().
*
- * The thread kicked off by this interceptor will be named in the form
actionNameBrackgroundProcess.
+ * The thread kicked off by this interceptor will be named in the form
actionNameBackgroundProcess.
* For example, the search action would run as a thread named
searchBackgroundProcess.
*
*
@@ -197,7 +197,6 @@
* Returns the name to associate the background process. Override to
change the way background processes
* are mapped to requests.
*
- * @param actionInvocation The action invocation
* @return the name of the background thread
*/
protected String getBackgroundProcessName(ActionProxy proxy) {
svn commit: r579021 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: config/StrutsXmlConfigurationProvider.java dispatcher/FilterDispatcher.java dispatcher/StrutsRequestWrapper.java
Author: mrdon
Date: Mon Sep 24 17:07:19 2007
New Revision: 579021
URL: http://svn.apache.org/viewvc?rev=579021&view=rev
Log:
Better handling of action context creation
WW-2203
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?rev=579021&r1=579020&r2=579021&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
Mon Sep 24 17:07:19 2007
@@ -162,7 +162,11 @@
@Override
public boolean needsReload() {
ActionContext ctx = ActionContext.getContext();
-return ctx.get(reloadKey) == null && super.needsReload();
+if (ctx != null) {
+return ctx.get(reloadKey) == null && super.needsReload();
+} else {
+return true;
+}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?rev=579021&r1=579020&r2=579021&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Mon Sep 24 17:07:19 2007
@@ -52,6 +52,8 @@
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
import com.opensymphony.xwork2.ActionContext;
@@ -386,6 +388,12 @@
String timerKey = "FilterDispatcher_doFilter: ";
try {
+
+// FIXME: this should be refactored better to not duplicate work
with the action invocation
+ValueStack stack =
dispatcher.getContainer().getInstance(ValueStackFactory.class).createValueStack();
+ActionContext ctx = new ActionContext(stack.getContext());
+ActionContext.setContext(ctx);
+
UtilTimerStack.push(timerKey);
request = prepareDispatcherAndWrapRequest(request, response);
ActionMapping mapping;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java?rev=579021&r1=579020&r2=579021&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/StrutsRequestWrapper.java
Mon Sep 24 17:07:19 2007
@@ -62,26 +62,27 @@
ActionContext ctx = ActionContext.getContext();
Object attribute = super.getAttribute(s);
-
-if (attribute == null) {
-boolean alreadyIn = false;
-Boolean b = (Boolean) ctx.get("__requestWrapper.getAttribute");
-if (b != null) {
-alreadyIn = b.booleanValue();
-}
-
-// note: we don't let # come through or else a request for
-// #attr.foo or #request.foo could cause an endless loop
-if (!alreadyIn && s.indexOf("#") == -1) {
-try {
-// If not found, then try the ValueStack
-ctx.put("__requestWrapper.getAttribute", Boolean.TRUE);
-ValueStack stack = ctx.getValueStack();
-if (stack != null) {
-attribute = stack.findValue(s);
+if (ctx != null) {
+if (attribute == null) {
+boolean alreadyIn = false;
+Boolean b = (Boolean) ctx.get("__requestWrapper.getAttribute");
+if (b != null) {
+alreadyIn = b.booleanValue();
+}
+
+// note: we don't let # come through or
svn commit: r579186 - in /struts/struts2/trunk: core/src/main/java/org/apache/struts2/components/ core/src/main/java/org/apache/struts2/views/freemarker/tags/ core/src/main/java/org/apache/struts2/vie
Author: mrdon
Date: Tue Sep 25 03:39:07 2007
New Revision: 579186
URL: http://svn.apache.org/viewvc?rev=579186&view=rev
Log:
Cleaning up unnecessary dispatcher.getInstance calls, spelling cleanups
WW-1715
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
struts/struts2/trunk/core/src/site/resources/tags/i18n.html
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
struts/struts2/trunk/plugins/struts1/src/main/java/org/apache/struts2/s1/Struts1Action.java
struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java?rev=579186&r1=579185&r2=579186&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java
Tue Sep 25 03:39:07 2007
@@ -33,6 +33,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
import com.opensymphony.xwork2.TextProviderFactory;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.ValueStack;
@@ -86,10 +88,16 @@
public class I18n extends Component {
protected boolean pushed;
protected String name;
+protected Container container;
public I18n(ValueStack stack) {
super(stack);
}
+
+@Inject
+public void setContainer(Container container) {
+this.container = container;
+}
public boolean start(Writer writer) {
boolean result = super.start(writer);
@@ -105,7 +113,7 @@
if (bundle != null) {
final Locale locale = (Locale)
getStack().getContext().get(ActionContext.LOCALE);
TextProviderFactory tpf = new TextProviderFactory();
-Dispatcher.getInstance().getContainer().inject(tpf);
+container.inject(tpf);
getStack().push(tpf.createInstance(bundle, new
LocaleProvider() {
public Locale getLocale() {
return locale;
@@ -129,7 +137,7 @@
return super.end(writer, body);
}
-@StrutsTagAttribute(description="Name of ressource bundle to use (eg
foo/bar/customBundle)", required=true, defaultValue="String")
+@StrutsTagAttribute(description="Name of resource bundle to use (eg
foo/bar/customBundle)", required=true, defaultValue="String")
public void setName(String name) {
this.name = name;
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java?rev=579186&r1=579185&r2=579186&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java
Tue Sep 25 03:39:07 2007
@@ -34,6 +34,7 @@
import org.apache.struts2.components.Component;
import org.apache.struts2.dispatcher.Dispatcher;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
@@ -60,7 +61,7 @@
public Writer getWriter(Writer writer, Map params)
throws TemplateModelException, IOException {
Component bean = getBean();
-Container container =
Dispatcher.getInstance().getConfigurationManager().getConfiguration().getContainer();
+Container container = (Container)
stack.getContext().get(ActionContext.CONTAINER);
container.inject(bean);
Map unwrappedParameters = unwrapParameters(params);
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/compon
svn commit: r579205 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ActionComponent.java test/java/org/apache/struts2/components/ActionComponentTest.java
Author: mrdon
Date: Tue Sep 25 04:23:05 2007
New Revision: 579205
URL: http://svn.apache.org/viewvc?rev=579205&view=rev
Log:
Ensuring parameters in the parameter map will be String arrays
WW-1960
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=579205&r1=579204&r2=579205&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Tue Sep 25 04:23:05 2007
@@ -22,7 +22,9 @@
import java.io.IOException;
import java.io.Writer;
+import java.lang.reflect.Array;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -59,8 +61,8 @@
* id (String) - the id (if specified) to put the action under
stack's context.
* name* (String) - name of the action to be executed (without the
extension suffix eg. .action)
* namespace (String) - default to the namespace where this action
tag is invoked
- * executeResult (Boolean) - default is false. Decides wheather the
result of this action is to be executed or not
- * ignoreContextParams (Boolean) - default to false. Decides wheather
the request parameters are to be included when the action is invoked
+ * executeResult (Boolean) - default is false. Decides whether the
result of this action is to be executed or not
+ * ignoreContextParams (Boolean) - default to false. Decides whether
the request parameters are to be included when the action is invoked
*
*
*
@@ -170,18 +172,8 @@
return end;
}
-private Map createExtraContext() {
-Map parentParams = null;
-
-if (!ignoreContextParams) {
-parentParams = new
ActionContext(getStack().getContext()).getParameters();
-}
-
-Map newParams = (parentParams != null) ? new HashMap(parentParams) :
new HashMap();
-
-if (parameters != null) {
-newParams.putAll(parameters);
-}
+protected Map createExtraContext() {
+Map newParams = createParametersForContext();
ActionContext ctx = new ActionContext(stack.getContext());
ServletContext servletContext = (ServletContext)
ctx.get(ServletActionContext.SERVLET_CONTEXT);
@@ -205,6 +197,40 @@
extraContext.put(ServletActionContext.PAGE_CONTEXT, pageContext);
return extraContext;
+}
+
+/**
+ * Creates parameters map using parameters from the value stack and
component parameters. Any non-String array
+ * values will be converted into a single-value String array.
+ *
+ * @return A map of String[] parameters
+ */
+protected Map createParametersForContext() {
+Map parentParams = null;
+
+if (!ignoreContextParams) {
+parentParams = new
ActionContext(getStack().getContext()).getParameters();
+}
+
+Map newParams = (parentParams != null)
+? new HashMap(parentParams)
+: new HashMap();
+
+if (parameters != null) {
+Map params = new HashMap();
+for (Iterator i = parameters.entrySet().iterator(); i.hasNext(); )
{
+Map.Entry entry = (Map.Entry) i.next();
+String key = (String) entry.getKey();
+Object val = entry.getValue();
+if (val.getClass().isArray() && String.class ==
val.getClass().getComponentType()) {
+params.put(key, (String[])val);
+} else {
+params.put(key, new String[]{val.toString()});
+}
+}
+newParams.putAll(params);
+}
+return newParams;
}
public ActionProxy getProxy() {
Added:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java?rev=579205&view=auto
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
(added)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/ActionComponentTest.java
Tue Sep 25 04:23:05 2007
@@ -0,0 +1,54 @@
+/*
+ * $Id: ComponentTest.java 471756 2006-11-06 15:01:43Z husted $
+ *
+ * Licensed to the Apache Software Found
svn commit: r579210 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Author: mrdon
Date: Tue Sep 25 04:55:37 2007
New Revision: 579210
URL: http://svn.apache.org/viewvc?rev=579210&view=rev
Log:
Hopefully improved method calls for the action tag
WW-2102
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=579210&r1=579209&r2=579210&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java
Tue Sep 25 04:55:37 2007
@@ -279,9 +279,7 @@
try {
proxy = actionProxyFactory.createActionProxy(namespace,
actionName, createExtraContext(), executeResult, true);
-if (null != methodName) {
-proxy.setMethod(methodName);
-}
+proxy.setMethod(methodName);
// set the new stack into the request for the taglib to use
req.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY,
proxy.getInvocation().getStack());
proxy.execute();
svn commit: r579641 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/ config/ dispatcher/ dispatcher/mapper/ dispatcher/multipart/ impl/ interceptor/ interceptor/validation
Author: mrdon Date: Wed Sep 26 05:36:25 2007 New Revision: 579641 URL: http://svn.apache.org/viewvc?rev=579641&view=rev Log: Cleaning up imports WW-2208 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Head.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/I18n.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Include.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptGroup.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Param.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Property.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Push.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/DefaultSettings.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/PropertiesSettings.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/VelocityStrutsUtil.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/ActionModel.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/FormTag.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/UrlHelper.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/AbstractDirective.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java?rev=579641&r1=579640&r2=579641&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ActionComponent.java Wed Sep 26 05:36:25 2007 @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.Writer; -import java.lang.reflect.Array; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -34,12 +33,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsException; import org.apache.struts2.dispatcher.Dispatcher; import org.apache.struts2.dispatcher.RequestMap; +import org.apache.struts2.views.annot
svn commit: r579651 - /struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd
Author: mrdon Date: Wed Sep 26 06:20:34 2007 New Revision: 579651 URL: http://svn.apache.org/viewvc?rev=579651&view=rev Log: Removed unused param element from default definitions WW-2209 Modified: struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd Modified: struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd?rev=579651&r1=579650&r2=579651&view=diff == --- struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd (original) +++ struts/struts2/trunk/core/src/main/resources/struts-2.0.dtd Wed Sep 26 06:20:34 2007 @@ -71,17 +71,17 @@ name CDATA #REQUIRED > - + - + - +
svn commit: r581894 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Author: mrdon Date: Thu Oct 4 06:39:08 2007 New Revision: 581894 URL: http://svn.apache.org/viewvc?rev=581894&view=rev Log: Updating plugin ext points doc WW-2192 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=581894&r1=581893&r2=581894&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Thu Oct 4 06:39:08 2007 @@ -137,6 +137,12 @@ * singleton * Creates reflection context maps used for reflection and expression language operations (since 2.1) * + * + * com.opensymphony.xwork2.config.PackageProvider + * N/A + * singleton + * All beans registered as PackageProvider implementations will be automatically included in configuration building (since 2.1) + * * * *
svn commit: r582626 [3/3] - in /struts/struts2/trunk: apps/mailreader/src/main/java/mailreader2/ apps/showcase/src/main/java/org/apache/struts2/showcase/chat/ core/src/main/java/org/apache/struts2/com
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java?rev=582626&r1=582625&r2=582626&view=diff
==
---
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowValidatorAction.java
Sun Oct 7 06:26:12 2007
@@ -29,10 +29,9 @@
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
import com.opensymphony.xwork2.util.reflection.ReflectionException;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
@@ -45,7 +44,7 @@
public class ShowValidatorAction extends ListValidatorsAction {
private static final long serialVersionUID = 4061534149317835177L;
-private static Log log = LogFactory.getLog(ShowValidatorAction.class);
+private static Logger LOG =
LoggerFactory.getLogger(ShowValidatorAction.class);
Set properties = Collections.EMPTY_SET;
int selected = 0;
@@ -89,7 +88,7 @@
try {
beanInfoFrom = Introspector.getBeanInfo(validator.getClass(),
Object.class);
} catch (IntrospectionException e) {
-log.error("An error occurred", e);
+LOG.error("An error occurred", e);
addActionError("An error occurred while introspecting a
validator of type " + validator.getClass().getName());
return ERROR;
}
@@ -112,7 +111,7 @@
properties.add(new PropertyInfo(name, pd.getPropertyType(),
value));
}
} catch (Exception e) {
-log.warn("Unable to retrieve properties.", e);
+LOG.warn("Unable to retrieve properties.", e);
addActionError("Unable to retrieve properties: " + e.toString());
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java?rev=582626&r1=582625&r2=582626&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
Sun Oct 7 06:26:12 2007
@@ -31,14 +31,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts2.components.UIBean;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
/**
*
@@ -174,7 +174,7 @@
final public static String TEMPLATE = "datetimepicker";
final private static SimpleDateFormat RFC3339_FORMAT = new
SimpleDateFormat(
"-MM-dd'T'HH:mm:ss");
-final protected static Log LOG = LogFactory.getLog(DateTimePicker.class);
+final protected static Logger LOG =
LoggerFactory.getLogger(DateTimePicker.class);
protected String iconPath;
protected String formatLength;
@@ -393,7 +393,7 @@
formats.add(displayFormat);
} catch (Exception e) {
// don't use it then (this attribute is used by Dojo, not
java code)
-LOG.error(e);
+LOG.error("Cannot use attribute", e);
}
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java?rev=582626&r1=582625&r2=582626&view=diff
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/doj
svn commit: r582713 - /struts/struts2/trunk/core/pom.xml
Author: mrdon Date: Sun Oct 7 22:59:39 2007 New Revision: 582713 URL: http://svn.apache.org/viewvc?rev=582713&view=rev Log: Removing commons logging from pom WW-1413 Modified: struts/struts2/trunk/core/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=582713&r1=582712&r2=582713&view=diff == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Sun Oct 7 22:59:39 2007 @@ -326,12 +326,6 @@ 2.6.11 - -commons-logging -commons-logging -1.0.4 - - uk.ltd.getahead
svn commit: r584166 - in /struts/struts2/trunk: apps/showcase/src/main/resources/ core/src/main/java/org/apache/struts2/config/ core/src/main/java/org/apache/struts2/dispatcher/ core/src/test/java/org
Author: mrdon Date: Fri Oct 12 07:07:52 2007 New Revision: 584166 URL: http://svn.apache.org/viewvc?rev=584166&view=rev Log: Moving zero config code into codebehind plugin, minor fix to showcase WW-2247 Added: struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Namespace.java - copied unchanged from r584160, struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ParentPackage.java - copied unchanged from r584160, struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Result.java - copied unchanged from r584160, struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Results.java - copied unchanged from r584160, struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java - copied unchanged from r584160, struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java - copied unchanged from r584160, struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/cltest/ - copied from r584160, struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ Removed: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java struts/struts2/trunk/plugins/codebehind/src/main/resources/struts-plugin.xml struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?rev=584166&r1=584165&r2=584166&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Fri Oct 12 07:07:52 2007 @@ -67,6 +67,8 @@ + + showcase.jsp Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=584166&r1=584165&r2=584166&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java Fri Oct 12 07:07:52 2007 @@ -39,12 +39,9 @@ import org.apache.struts2.StrutsConstants; import org.apache.struts2.StrutsStatics; import org.apache.struts2.config.BeanSelectionProvider; -import org.apache.struts2.config.ClasspathConfigurationProvider; import org.apache.struts2.config.DefaultPropertiesProvider; import org.apache.struts2.config.LegacyPropertiesConfigurationProvider; import org.apache.struts2.config.StrutsXmlCo
svn commit: r584404 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/config/ main/java/org/apache/struts2/interceptor/ main/resources/ test/java/org/apac
Author: mrdon
Date: Sat Oct 13 07:06:08 2007
New Revision: 584404
URL: http://svn.apache.org/viewvc?rev=584404&view=rev
Log:
Adding a wildcard processing plugin point
WW-2250
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=584404&r1=584403&r2=584404&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Sat Oct 13 07:06:08 2007
@@ -176,5 +176,8 @@
/** The [EMAIL PROTECTED]
com.opensymphony.xwork2.reflection.ReflectionContextFactory} implementation
class */
public static final String STRUTS_REFLECTIONCONTEXTFACTORY =
"struts.reflectionContextFactory";
+
+/** The [EMAIL PROTECTED] com.opensymphony.xwork2.util.PatternMatcher}
implementation class */
+public static final String STRUTS_PATTERNMATCHER = "struts.patternMatcher";
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=584404&r1=584403&r2=584404&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Sat Oct 13 07:06:08 2007
@@ -45,6 +45,7 @@
import com.opensymphony.xwork2.inject.Scope;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.PatternMatcher;
import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.logging.Logger;
@@ -143,6 +144,12 @@
* singleton
* All beans registered as PackageProvider implementations will be
automatically included in configuration building (since 2.1)
*
+ *
+ * com.opensymphony.xwork2.util.PatternMatcher
+ * struts.patternMatcher
+ * singleton
+ * Matches patterns, such as action names, generally used in
configuration (since 2.1)
+ *
*
*
*
@@ -200,6 +207,7 @@
alias(ValueStackFactory.class,
StrutsConstants.STRUTS_VALUESTACKFACTORY, builder, props);
alias(ReflectionProvider.class,
StrutsConstants.STRUTS_REFLECTIONPROVIDER, builder, props);
alias(ReflectionContextFactory.class,
StrutsConstants.STRUTS_REFLECTIONCONTEXTFACTORY, builder, props);
+alias(PatternMatcher.class, StrutsConstants.STRUTS_PATTERNMATCHER,
builder, props);
if
("true".equalsIgnoreCase(props.getProperty(StrutsConstants.STRUTS_DEVMODE))) {
props.setProperty(StrutsConstants.STRUTS_I18N_RELOAD, "true");
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java?rev=584404&r1=584403&r2=584404&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
Sat Oct 13 07:06:08 2007
@@ -41,17 +41,17 @@
/**
*
*
- * The aim of this interceptor is to set values in the stack/action based on
cookie name/value
+ * The aim of this intercepter is to set values in the stack/action based on
cookie name/value
* of interest.
*
- * If an asterik is present in cookiesName parameter, it will be assume that
+ * If an asterisk is present in cookiesName parameter, it will be assume that
* all cookies name are to be injected into struts' action, even though
- * cookiesName is comma-separated by other values, eg (cookie1,*,cookie2).
+ * cookiesName is comma-separated by other values, e.g. (cookie1,*,cookie2).
*
* If cookiesName is left empty it will assume that no
svn commit: r584413 - in /struts/struts2/trunk/plugins/codebehind/src: main/java/org/apache/struts2/config/ test/java/org/apache/struts2/config/
Author: mrdon
Date: Sat Oct 13 08:41:39 2007
New Revision: 584413
URL: http://svn.apache.org/viewvc?rev=584413&view=rev
Log:
Adding action annotation
WW-2251
Added:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
Added:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java?rev=584413&view=auto
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
(added)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
Sat Oct 13 08:41:39 2007
@@ -0,0 +1,31 @@
+/*
+ * $Id: Namespace.java 584166 2007-10-12 14:07:52Z mrdon $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.config;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
[EMAIL PROTECTED](RetentionPolicy.RUNTIME)
+public @interface Action {
+public static final String DEFAULT_NAMESPACE = "__default_namespace__";
+String namespace() default DEFAULT_NAMESPACE;
+String name();
+}
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java?rev=584413&r1=584412&r2=584413&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
Sat Oct 13 08:41:39 2007
@@ -246,7 +246,8 @@
public boolean matches(Class type) {
// TODO: should also find annotated classes
return (Action.class.isAssignableFrom(type) ||
-type.getSimpleName().endsWith("Action"));
+type.getSimpleName().endsWith("Action") ||
+
type.getAnnotation(org.apache.struts2.config.Action.class) != null);
}
}, pkgs);
@@ -274,26 +275,53 @@
* @param cls Action or POJO instance to process
* @param pkgs List of packages that were scanned for Actions
*/
-protected void processActionClass(Class cls, String[] pkgs) {
+protected void processActionClass(Class cls, String[] pkgs) {
+ActionConfig actionConfig = new ActionConfig();
String name = cls.getName();
String actionPackage = cls.getPackage().getName();
String actionNamespace = null;
String actionName = null;
-for (String pkg : pkgs) {
-if (name.startsWith(pkg)) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("ClasspathPackageProvider: Processing class
"+name);
-}
-name = name.substring(pkg.length() + 1);
-
+
+org.apache.struts2.config.Action actionAnn =
+(org.apache.struts2.config.Action)
cls.getAnnotation(org.apache.struts2.config.Action.class);
+if (actionAnn != null) {
+actionName = actionAnn.name();
+if
(actionAnn.namespace().equals(org.apache.struts2.config.Action.DEFAULT_NAMESPACE))
{
actionNamespace = "";
-actionName = name;
-int pos = name.lastIndexOf('.');
-if (pos > -1) {
-actionNamespace =
svn commit: r584416 - /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
Author: mrdon
Date: Sat Oct 13 08:50:32 2007
New Revision: 584416
URL: http://svn.apache.org/viewvc?rev=584416&view=rev
Log:
Adding missing test
WW-2251
Added:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
Added:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java?rev=584416&view=auto
==
---
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
(added)
+++
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
Sat Oct 13 08:50:32 2007
@@ -0,0 +1,26 @@
+/*
+ * $Id: CustomNamespaceAction.java 584166 2007-10-12 14:07:52Z mrdon $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.config;
+
[EMAIL PROTECTED](name="myaction2")
+public class AnotherAnnotatedObject {
+
+}
svn commit: r586694 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/mapper/ test/java/org/apache/struts2/config/
Author: mrdon
Date: Sat Oct 20 02:56:20 2007
New Revision: 586694
URL: http://svn.apache.org/viewvc?rev=586694&view=rev
Log:
Making it possible to use multiple extensions simultaneously, improving
reloadability
WW-2267
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?rev=586694&r1=586693&r2=586694&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
Sat Oct 20 02:56:20 2007
@@ -163,7 +163,7 @@
if (ctx != null) {
return ctx.get(reloadKey) == null && super.needsReload();
} else {
-return true;
+return super.needsReload();
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java?rev=586694&r1=586693&r2=586694&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
Sat Oct 20 02:56:20 2007
@@ -36,6 +36,7 @@
private String name;
private String namespace;
private String method;
+private String extension;
private Map params;
private Result result;
@@ -106,6 +107,13 @@
public Result getResult() {
return result;
}
+
+/**
+ * @return The extension used during this request
+ */
+public String getExtension() {
+return extension;
+}
/**
* @param result The result
@@ -140,5 +148,12 @@
*/
public void setParams(Map params) {
this.params = params;
+}
+
+/**
+ * @param extension The extension used in the request
+ */
+public void setExtension(String extension) {
+this.extension = extension;
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=586694&r1=586693&r2=586694&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Sat Oct 20 02:56:20 2007
@@ -32,10 +32,12 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.RequestUtils;
+import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.ServletRedirectResult;
import org.apache.struts2.util.PrefixTrie;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
@@ -292,7 +294,7 @@
ActionMapping mapping = new ActionMapping();
String uri = getUri(request);
-uri = dropExtension(uri);
+uri = dropExtension(uri, mapping);
if (uri == null) {
return null;
}
@@ -415,8 +417,21 @@
* @param name
*The action name
* @return The action name without its extension
+ * @deprecated Since 2.1, use [EMAIL PROTECTED]
#dropExtension(java.lang.String,org.apache.struts2.dispatcher.mapper.ActionMapping)}
instead
*/
protected String dropExtension(String name) {
+return dropExtension(name, new ActionMapping());
+}
+
+/**
+ * Drops the extension from the action name, storing it in the mapping for
later use
+ *
+ * @param name
+ *The action name
+ * @param mapping The action mapping to store the extension in
+ * @return The action na
svn commit: r586696 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Author: mrdon
Date: Sat Oct 20 03:04:53 2007
New Revision: 586696
URL: http://svn.apache.org/viewvc?rev=586696&view=rev
Log:
Adding test for original extension uri building
WW-2267
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=586696&r1=586695&r2=586696&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Sat Oct 20 03:04:53 2007
@@ -196,6 +196,17 @@
assertEquals("/my/namespace/actionName!add.action",
mapper.getUriFromActionMapping(mapping));
}
+
+public void testGetUriWithOriginalExtension() throws Exception {
+ActionMapping mapping = new ActionMapping("actionName", "/ns", null,
new HashMap());
+
+ActionMapping orig = new ActionMapping();
+orig.setExtension("foo");
+ActionContext.getContext().put(ServletActionContext.ACTION_MAPPING,
orig);
+
+DefaultActionMapper mapper = new DefaultActionMapper();
+assertEquals("/ns/actionName.foo",
mapper.getUriFromActionMapping(mapping));
+}
public void testGetMappingWithNoExtension() throws Exception {
req.setupGetParameterMap(new HashMap());
svn commit: r586735 - in /struts/sandbox/trunk/struts2-rest-plugin: ./ src/main/java/org/apache/struts2/rest/ src/main/java/org/apache/struts2/rest/handler/ src/main/resources/ src/test/java/org/apach
Author: mrdon
Date: Sat Oct 20 07:48:27 2007
New Revision: 586735
URL: http://svn.apache.org/viewvc?rev=586735&view=rev
Log:
Redesigned rest plugin to fit in better with Struts 2 apps and work with the
codebehind plugin
Added:
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultRestInfo.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ResourceClasspathPackageProvider.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestInfo.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Removed:
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxy.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/Restful.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/MimeTypeHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/test/java/org/apache/struts2/rest/RestActionInvoicationTest.java
Modified:
struts/sandbox/trunk/struts2-rest-plugin/pom.xml
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionMapper.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamJsonHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/resources/struts-plugin.xml
Modified: struts/sandbox/trunk/struts2-rest-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/pom.xml?rev=586735&r1=586734&r2=586735&view=diff
==
--- struts/sandbox/trunk/struts2-rest-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/pom.xml Sat Oct 20 07:48:27 2007
@@ -2,18 +2,21 @@
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
-
+
+org.apache.struts
+struts2-plugins
+2.1.0-SNAPSHOT
+
org.apache.struts
struts2-rest-plugin
- 1.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
Struts 2 Plugin
-
org.apache.struts
-struts2-core
-2.0.8
+struts2-codebehind-plugin
+${pom.version}
com.thoughtworks.xstream
@@ -42,28 +45,7 @@
3.8.1
test
-
-mockobjects
-mockobjects-core
-0.09
-test
-
-
-
-install
-
-
-
-maven-compiler-plugin
-
- 1.5
- 1.5
-
-
-
-
-
Added:
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java?rev=586735&view=auto
==
---
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
(added)
+++
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
Sat Oct 20 07:48:27 2007
@@ -0,0 +1,49 @@
+package org.apache.struts2.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.rest.handler.ContentTypeHandler;
+
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+
+public class ContentTypeHandlerSelector {
+
+private Map handlers = new
HashMap();
+p
