date:20060506

svn commit: r400334 - in /incubator/webwork2: thirdparty/jasperreports/pom.xml webapps/showcase/pom.xml

2006-05-06 Thread tmjee

Author: tmjee
Date: Sat May  6 09:51:26 2006
New Revision: 400334

URL: http://svn.apache.org/viewcvs?rev=400334&view=rev
Log:
- added dependency on action-jasperreport in showcase's pom, cause some
  example needs jasperreport
- added dependency of jasperreport in thirdparty/jasperreports's pom
  cause the WW/SAF result needs jasperreport
- added jetty6 plugin into showcase, for quick developement. Jetty6
  could be started with just 'mvn jetty6:run'



Modified:
incubator/webwork2/thirdparty/jasperreports/pom.xml
incubator/webwork2/webapps/showcase/pom.xml

Modified: incubator/webwork2/thirdparty/jasperreports/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/thirdparty/jasperreports/pom.xml?rev=400334&r1=400333&r2=400334&view=diff
==
--- incubator/webwork2/thirdparty/jasperreports/pom.xml (original)
+++ incubator/webwork2/thirdparty/jasperreports/pom.xml Sat May  6 09:51:26 2006
@@ -15,6 +15,7 @@
 
 jasperreports
 jasperreports
+1.2.1
 
 
 

Modified: incubator/webwork2/webapps/showcase/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/pom.xml?rev=400334&r1=400333&r2=400334&view=diff
==
--- incubator/webwork2/webapps/showcase/pom.xml (original)
+++ incubator/webwork2/webapps/showcase/pom.xml Sat May  6 09:51:26 2006
@@ -62,5 +62,36 @@
 org.springframework
 spring-web
 
+
+
+jasperreports
+jasperreports
+1.2.1
+
+
+
+   org.apache.struts.action2
+   action-jasperreports
+  
 
+
+
+   
+   
+   org.mortbay.jetty
+   maven-jetty6-plugin
+   
+   10
+   
+   
+   
+   
org.apache.geronimo.specs
+   
geronimo-j2ee_1.4_spec
+   1.0
+   provided
+   
+   
+   
+   
+

svn commit: r400335 - /incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java

2006-05-06 Thread tmjee

Author: tmjee
Date: Sat May  6 10:01:16 2006
New Revision: 400335

URL: http://svn.apache.org/viewcvs?rev=400335&view=rev
Log:
- added comment in the code


Modified:

incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java

Modified: 
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java?rev=400335&r1=400334&r2=400335&view=diff
==
--- 
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java
 (original)
+++ 
incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java
 Sat May  6 10:01:16 2006
@@ -210,6 +210,10 @@
 addParameter("id", action);
 }
 } else if (action != null) {
+   // Since we can't find an action alias in the configuration, we 
just assume
+   // the action attribute supplied is the path to be used as the 
uri this 
+   // form is submitting to.
+   
 String result = UrlHelper.buildUrl(action, request, response, 
null);
 addParameter("action", result);

svn commit: r400336 - in /struts/action/trunk/faces: LICENSE-JSF.txt NOTICE.txt README.txt pom.xml src/site/resources/ src/site/resources/README.txt src/site/xdoc/index.xml

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 10:02:20 2006
New Revision: 400336

URL: http://svn.apache.org/viewcvs?rev=400336&view=rev
Log:
Move README into the website and remove mention of release structure and 
example apps.
Modify NOTICE and remove LICENSE-JSF.txt-- the JSF RI is not included in 
Struts-Faces.
Include LICENSE and NOTICE in the jar.
Issue: STR-2846

Added:
struts/action/trunk/faces/src/site/resources/
struts/action/trunk/faces/src/site/resources/README.txt
  - copied, changed from r399940, struts/action/trunk/faces/README.txt
Removed:
struts/action/trunk/faces/LICENSE-JSF.txt
struts/action/trunk/faces/README.txt
Modified:
struts/action/trunk/faces/NOTICE.txt
struts/action/trunk/faces/pom.xml
struts/action/trunk/faces/src/site/xdoc/index.xml   (contents, props 
changed)

Modified: struts/action/trunk/faces/NOTICE.txt
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/faces/NOTICE.txt?rev=400336&r1=400335&r2=400336&view=diff
==
--- struts/action/trunk/faces/NOTICE.txt (original)
+++ struts/action/trunk/faces/NOTICE.txt Sat May  6 10:02:20 2006
@@ -1,9 +1,2 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes the JavaServer Faces reference
-implementation, developed by Sun Microsystems
-(http://java.sun.com/j2ee/javaserverfaces/) and
-redistributed in accordance with license terms found
-in LICENSE-JSF.txt.
-

Modified: struts/action/trunk/faces/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=400336&r1=400335&r2=400336&view=diff
==
--- struts/action/trunk/faces/pom.xml (original)
+++ struts/action/trunk/faces/pom.xml Sat May  6 10:02:20 2006
@@ -54,6 +54,13 @@
**/*.properties
 
  
+  
+ ${basedir}
+ 
+*.txt
+ 
+  
+
   
 
 

Copied: struts/action/trunk/faces/src/site/resources/README.txt (from r399940, 
struts/action/trunk/faces/README.txt)
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/faces/src/site/resources/README.txt?p2=struts/action/trunk/faces/src/site/resources/README.txt&p1=struts/action/trunk/faces/README.txt&r1=399940&r2=400336&rev=400336&view=diff
==
--- struts/action/trunk/faces/README.txt (original)
+++ struts/action/trunk/faces/src/site/resources/README.txt Sat May  6 10:02:20 
2006
@@ -8,11 +8,7 @@
 
 This package contains an add-on library that supports the use of
 JavaServer Faces (JSF) user interface technology in a Struts based web
-application, in place of the Struts custom tag libraries.  As a proof of
-concept, it also includes the canonical "struts-example" example
-web application, converted to use JSF tags, as well as tags from the
-JSP Standard Tag Library (JSTL), version 1.0 or later.  It also includes
-a very basic Tiles based application, modified in a similar manner.
+application, in place of the Struts custom tag libraries.
 
 The Struts-Faces Integration Library should work with any implementation
 of JavaServer Faces, version 1.0 or later.  It has primarily been tested
@@ -26,13 +22,6 @@
 NEW AND REVISED FEATURES:
 
 
-
-Struts-Faces Integration Library (Version 1.0):
---
-
-This release of the Struts-Faces Integration Library (Version 1.0) has the
-following new features relative to the previous (0.4) release:
-
 * As of the nightly build 20040902, the URI for the struts-faces tag library
   has changed.  You should now be using:
 
@@ -103,250 +92,6 @@
 * Integration with the Validator Framework should work properly
   in all cases now.
 
-
-
-CONTENTS OF THIS RELEASE:
-
-
-
-Top Level Directory:

-
-  build.xml -- Ant build script (only required for building from
-   source).
-
-  build.properties.sample
--- Sample "build.properties" file that may be customized
-   (only required for building from source).
-
-  LICENSE.txt   -- The Apache Software License, under which all software
-   included in this bundle is licensed.
-
-  LICENSE-JSF.txt   -- The license for the JavaServer Faces reference
-   impementation, which applies to the included
-   jsf-api.jar and jsf-impl.jar files.
-
-  NOTICE.txt-- Attribution notices for software included in this
-   distribution.
-
-  README.txt-- This README file.
-
-
-Directory "conf":
-
-
-  struts-faces.tld  -- The JSP tag library descriptor file for the
-   Struts-Faces integration tag lib

svn commit: r400339 - in /incubator/webwork2/webapps: blank/pom.xml shopping-cart/pom.xml starter/pom.xml

2006-05-06 Thread tmjee

Author: tmjee
Date: Sat May  6 10:09:33 2006
New Revision: 400339

URL: http://svn.apache.org/viewcvs?rev=400339&view=rev
Log:
- added jetty6 plugin into pom.xml


Modified:
incubator/webwork2/webapps/blank/pom.xml
incubator/webwork2/webapps/shopping-cart/pom.xml
incubator/webwork2/webapps/starter/pom.xml

Modified: incubator/webwork2/webapps/blank/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/blank/pom.xml?rev=400339&r1=400338&r2=400339&view=diff
==
--- incubator/webwork2/webapps/blank/pom.xml (original)
+++ incubator/webwork2/webapps/blank/pom.xml Sat May  6 10:09:33 2006
@@ -13,4 +13,24 @@
 Blank Webapp
 
 
+
+
+   
+   
+   org.mortbay.jetty
+   maven-jetty6-plugin
+   
+   10
+   
+   
+   
+   
org.apache.geronimo.specs
+   
geronimo-j2ee_1.4_spec
+   1.0
+   provided
+   
+   
+   
+   
+
 

Modified: incubator/webwork2/webapps/shopping-cart/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/pom.xml?rev=400339&r1=400338&r2=400339&view=diff
==
--- incubator/webwork2/webapps/shopping-cart/pom.xml (original)
+++ incubator/webwork2/webapps/shopping-cart/pom.xml Sat May  6 10:09:33 2006
@@ -13,4 +13,24 @@
 Shopping Cart Webapp
 
 
+
+
+   
+   
+   org.mortbay.jetty
+   maven-jetty6-plugin
+   
+   10
+   
+   
+   
+   
org.apache.geronimo.specs
+   
geronimo-j2ee_1.4_spec
+   1.0
+   provided
+   
+   
+   
+   
+
 

Modified: incubator/webwork2/webapps/starter/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/starter/pom.xml?rev=400339&r1=400338&r2=400339&view=diff
==
--- incubator/webwork2/webapps/starter/pom.xml (original)
+++ incubator/webwork2/webapps/starter/pom.xml Sat May  6 10:09:33 2006
@@ -13,4 +13,24 @@
 Starter Webapp
 
 
+
+
+   
+   
+   org.mortbay.jetty
+   maven-jetty6-plugin
+   
+   10
+   
+   
+   
+   
org.apache.geronimo.specs
+   
geronimo-j2ee_1.4_spec
+   1.0
+   provided
+   
+   
+   
+   
+

svn commit: r400346 - in /struts/action/trunk: apps/blank/src/main/webapp/WEB-INF/ apps/cookbook/src/main/webapp/WEB-INF/ apps/examples/src/main/webapp/WEB-INF/upload/ apps/examples/src/main/webapp/WE

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 11:09:51 2006
New Revision: 400346

URL: http://svn.apache.org/viewcvs?rev=400346&view=rev
Log:
The Commons Validator dependency was changed to v1.3.0 in r397364.
Change DOCTYPE in validator config files to v1.3.0 for consistency.
Issue:  STR-2860

Modified:
struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml
struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml

struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml

struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml

struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml

struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-type.xml

struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-validwhen.xml

struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation.xml
struts/action/trunk/apps/mailreader/src/main/webapp/WEB-INF/validation.xml

struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/validation.xml

struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml

Modified: struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==
--- struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml 
(original)
+++ struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml Sat 
May  6 11:09:51 2006
@@ -1,8 +1,8 @@
 
 
 http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd";>
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 
1.3.0//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd";>
 
 
 

Modified: 
struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==
--- struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml 
(original)
+++ struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml 
Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 
 http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd";>
+ "-//Apache Software Foundation//DTD Commons Validator Rules 
Configuration 1.3.0//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd";>
 
 
 

Modified: 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==
--- 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml 
(original)
+++ 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml 
Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 
 http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd";>
+"-//Apache Software Foundation//DTD Commons Validator Rules 
Configuration 1.3.0//EN"
+"http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd";>
 
 
 

Modified: 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml?rev=400346&r1=400345&r2=400346&view=diff
==
--- 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml
 (original)
+++ 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml
 Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 
 http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd";>
+  "-//Apache Software Foundation//DTD Commons Validator Rules 
Configuration 1.3.0//EN"
+  "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd";>
 
 
   

Modified: 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml?rev=400346&r1=400345&r2=400346&view=diff
==
--- 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml
 (original)
+++ 
struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml
 Sat May  6

svn commit: r400349 - /struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 11:24:32 2006
New Revision: 400349

URL: http://svn.apache.org/viewcvs?rev=400349&view=rev
Log:
Fix copy/paste error.

Modified:

struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml

Modified: 
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml?rev=400349&r1=400348&r2=400349&view=diff
==
--- 
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
 (original)
+++ 
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
 Sat May  6 11:24:32 2006
@@ -58,7 +58,7 @@
 
 
 
-
+

svn commit: r400350 - in /struts/site/src/site: site.xml xdoc/javadoc.xml

2006-05-06 Thread mrdon

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: r400354 - /struts/action/trunk/src/site/xdoc/apidocs/index.xml

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 12:34:25 2006
New Revision: 400354

URL: http://svn.apache.org/viewcvs?rev=400354&view=rev
Log:
Correct the links to the component Javadoc.
This page will be removed once Maven can aggregate the Javadoc.

Modified:
struts/action/trunk/src/site/xdoc/apidocs/index.xml

Modified: struts/action/trunk/src/site/xdoc/apidocs/index.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/apidocs/index.xml?rev=400354&r1=400353&r2=400354&view=diff
==
--- struts/action/trunk/src/site/xdoc/apidocs/index.xml (original)
+++ struts/action/trunk/src/site/xdoc/apidocs/index.xml Sat May  6 12:34:25 2006
@@ -28,25 +28,25 @@
 
  
 
-   
+   
Struts Action Core
 
-   
+   
Struts EL
 
-   
+   
Struts Extras
 
-   
+   
Struts Faces
 
-   
+   
Struts Scripting
 
-   
+   
Struts Taglib
 
-   
+   
Struts Tiles

svn commit: r400370 - /struts/action/trunk/src/site/xdoc/userGuide/preface.xml

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 14:01:06 2006
New Revision: 400370

URL: http://svn.apache.org/viewcvs?rev=400370&view=rev
Log:
Remove dead links to 'Web Applications in the J2EE Tutorial'.
Update the JSP specification link.
Issue: STR-2741

Modified:
struts/action/trunk/src/site/xdoc/userGuide/preface.xml

Modified: struts/action/trunk/src/site/xdoc/userGuide/preface.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/preface.xml?rev=400370&r1=400369&r2=400370&view=diff
==
--- struts/action/trunk/src/site/xdoc/userGuide/preface.xml (original)
+++ struts/action/trunk/src/site/xdoc/userGuide/preface.xml Sat May  6 14:01:06 
2006
@@ -677,12 +677,6 @@
 
 in The J2EE Tutorial.
 
-
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/WebApp.html";>
-Web Applications
-
-in The J2EE Tutorial.
-
 
 
 
@@ -1188,17 +1182,6 @@
 automatically deployed.
 
 
-
-For more about web applications, see:
-
-
-
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/WebApp.html#76431";>
-Web Applications
-in The J2EE Tutorial
-
-
-
 
 
 
@@ -1213,18 +1196,6 @@
 Java servlet specification.
 
 
-
-For more about the web.xml and application lifecycle
-events, see:
-
-
-
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/WebApp2.html#64550";>
-Web Application Life Cycle
-in The J2EE Tutorial
-
-
-
 
 
 
@@ -1243,16 +1214,6 @@
 information in a database.
 
 
-For more information about container-managed security,
-see:
-
-
-http://java.sun.com/webservices/docs/1.2/tutorial/doc/index.html";>
-Web Application Security (Chapter 24)
-in The J2EE Tutorial
-
-
-
 
 
 
@@ -1302,9 +1263,9 @@
 java.sun.com
 
 
-http://java.sun.com/products/jsp/download.html";>
+http://java.sun.com/products/jsp/reference/api/index.html";>
 The
-JSP 1.1 and 1.2 Specifications
+JSP 1.2 and 2.0 Specifications
 
 download page at
 java.sun.com
@@ -1438,18 +1399,6 @@
 familiar approach.
 
 
-For more about XML configuration files and Java web
-applications, see
-
-
-
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/WebApp4.html#64678";>
-Configuring Web
-Applications
-in The J2EE Tutorial
-
-
-
 
 For more about how XML is used with Java applications
 generally, see the
@@ -1498,14 +1447,7 @@
 
 For more about JAAS, see the Sun Developer Network
 http://java.sun.com/products/jaas";>product
-page
-and the
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/WebAppSecurity.html";>
-Web Application Security
-chapter of
-http://java.sun.com/j2ee/tutorial/1_3-fcs/index.html";>
-The J2EE Tutorial
-.
+page.

svn commit: r400377 - /struts/action/trunk/src/site/xdoc/userGuide/dev_validator.xml

2006-05-06 Thread mrdon

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

2006-05-06 Thread mrdon

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.apache.org/struts-action"; />
+http://struts.apache.org/struts-action2"; />
 http://struts.apache.org/struts-shale"; /> 
-http://struts.apache.org/struts-tiles"; /> 
 
 
 
 
 
+
+
+

svn commit: r400381 - /struts/action/trunk/src/site/xdoc/milestones.xml

2006-05-06 Thread mrdon

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

2006-05-06 Thread mrdon

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/

2006-05-06 Thread mrdon

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

2006-05-06 Thread mrdon

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
 easymockclassextension
+

svn commit: r400412 - /incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java

2006-05-06 Thread mrdon

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

2006-05-06 Thread mrdon

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 = checkWebAppArgs(args);
 programArgs = new String[]{"/" + name,
-"webapps/" + name + "/src/main/webapp",
-"webapps/" +

svn commit: r400423 - in /incubator/webwork2: core/pom.xml src/site/site.xml

2006-05-06 Thread mrdon

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

2006-05-06 Thread mrdon

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: r400432 - /struts/action/trunk/src/site/xdoc/index.xml

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 22:50:27 2006
New Revision: 400432

URL: http://svn.apache.org/viewcvs?rev=400432&view=rev
Log:
Remove another link to the web application tutorial.

Modified:
struts/action/trunk/src/site/xdoc/index.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=400432&r1=400431&r2=400432&view=diff
==
--- struts/action/trunk/src/site/xdoc/index.xml (original)
+++ struts/action/trunk/src/site/xdoc/index.xml Sat May  6 22:50:27 2006
@@ -123,9 +123,7 @@
 
 
 
-A
-http://java.sun.com/webservices/docs/1.0/tutorial/doc/WebApp.html";>
-web application
+A web application
 uses a deployment descriptor to initialize resources
 like
 servlets

svn commit: r401969 - /struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml

2006-05-06 Thread wsmoak

Author: wsmoak
Date: Sat May  6 23:03:07 2006
New Revision: 401969

URL: http://svn.apache.org/viewcvs?rev=401969&view=rev
Log:
Remove the Tiles instructions from the default chain config file.

Modified:

struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml

Modified: 
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml?rev=401969&r1=401968&r2=401969&view=diff
==
--- 
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
 (original)
+++ 
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
 Sat May  6 23:03:07 2006
@@ -205,17 +205,6 @@
 
 
-
-
-
 
 
@@ -239,15 +228,6 @@
 
 
-
-

svn commit: r403550 - /struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java

2006-05-06 Thread mrdon

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: r400334 - in /incubator/webwork2: thirdparty/jasperreports/pom.xml webapps/showcase/pom.xml

svn commit: r400335 - /incubator/webwork2/action/src/main/java/org/apache/struts/action2/components/Form.java

svn commit: r400336 - in /struts/action/trunk/faces: LICENSE-JSF.txt NOTICE.txt README.txt pom.xml src/site/resources/ src/site/resources/README.txt src/site/xdoc/index.xml

svn commit: r400339 - in /incubator/webwork2/webapps: blank/pom.xml shopping-cart/pom.xml starter/pom.xml

svn commit: r400346 - in /struts/action/trunk: apps/blank/src/main/webapp/WEB-INF/ apps/cookbook/src/main/webapp/WEB-INF/ apps/examples/src/main/webapp/WEB-INF/upload/ apps/examples/src/main/webapp/WE

svn commit: r400349 - /struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml

svn commit: r400350 - in /struts/site/src/site: site.xml xdoc/javadoc.xml

svn commit: r400354 - /struts/action/trunk/src/site/xdoc/apidocs/index.xml

svn commit: r400370 - /struts/action/trunk/src/site/xdoc/userGuide/preface.xml

svn commit: r400377 - /struts/action/trunk/src/site/xdoc/userGuide/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

svn commit: r400381 - /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

svn commit: r400383 - /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

svn commit: r400412 - /incubator/webwork2/core/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java

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

svn commit: r400423 - in /incubator/webwork2: core/pom.xml src/site/site.xml

svn commit: r400426 - /struts/action/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java

svn commit: r400432 - /struts/action/trunk/src/site/xdoc/index.xml

svn commit: r401969 - /struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml

svn commit: r403550 - /struts/action/trunk/tiles/src/main/java/org/apache/struts/tiles/taglib/ImportAttributeTag.java

22 matches

Site Navigation

Mail list logo

Footer information