svn commit: r419182 - /struts/struts1/trunk/pom.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Tue Jul  4 23:42:27 2006
New Revision: 419182

URL: http://svn.apache.org/viewvc?rev=419182&view=rev
Log:
Update to struts-master v3 as the parent.
Remove the  section, which is inherited.

Modified:
struts/struts1/trunk/pom.xml

Modified: struts/struts1/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=419182&r1=419181&r2=419182&view=diff
==
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Tue Jul  4 23:42:27 2006
@@ -26,7 +26,7 @@

   org.apache.struts
   struts-master
-  3-SNAPSHOT
+  3

 
 4.0.0
@@ -52,12 +52,8 @@
 
 
 
+
 
-
-   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/1.x/




svn commit: r419162 - /struts/maven/trunk/pom/pom.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Tue Jul  4 21:22:26 2006
New Revision: 419162

URL: http://svn.apache.org/viewvc?rev=419162&view=rev
Log:
Update to version 3 prior to release vote.

Modified:
struts/maven/trunk/pom/pom.xml

Modified: struts/maven/trunk/pom/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/pom/pom.xml?rev=419162&r1=419161&r2=419162&view=diff
==
--- struts/maven/trunk/pom/pom.xml (original)
+++ struts/maven/trunk/pom/pom.xml Tue Jul  4 21:22:26 2006
@@ -26,7 +26,7 @@

org.apache.struts
struts-master
-   3-SNAPSHOT
+   3
pom
Apache Struts





svn commit: r419063 - in /struts/shale/trunk/shale-core/src/main/java/org/apache/shale: application/ dialog/ dialog/faces/ dialog/impl/ faces/ renderer/ util/ view/ view/faces/

2006-07-05 Thread craigmcc
Author: craigmcc
Date: Tue Jul  4 12:16:36 2006
New Revision: 419063

URL: http://svn.apache.org/viewvc?rev=419063&view=rev
Log:
Finish up the first-pass checkstyle cleanups on shale-core (skipping the
org.apache.shale.remote package that is deprecated and will be removed).
That leaves about 100 error messages in five or six major categories to
be reviewed in more detail.

Modified:

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/ActionState.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/EndState.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/impl/StatusImpl.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleVariableResolver.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ValidatorRenderKit.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorCommandRenderer.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorInputRenderer.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/util/ConverterHelper.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractViewController.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandler.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewPhaseListener.java

struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java

Modified: 
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
URL: 
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java?rev=419063&r1=419062&r2=419063&view=diff
==
--- 
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
 (original)
+++ 
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
 Tue Jul  4 12:16:36 2006
@@ -1,12 +1,12 @@
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
- * 
+ *
  * Licensed 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.
@@ -106,11 +106,11 @@
  * Array of regular expression patterns for the includes list.
  */
 private Pattern includesPatterns[] = new Pattern[0];
-
+
 /**
  * Returns an array of regular expression patterns for the includes 
list.
  */
-protected Pattern[] getIncludesPatterns() {return includesPatterns;};
+protected Pattern[] getIncludesPatterns() { return includesPatterns; }
 
 
 // -- 
Properties
@@ -166,6 +166,8 @@
  * against the value returned by the value() method.
  *
  * @param context ShaleWebContext for this request
+ *
+ * @exception Exception if an error occurs
  */
 public boolean execute(Context context) throws Exception {
 
@@ -229,6 +231,8 @@
  * being accepted.  The default implementation does nothing.
  *
  * @param context Context for the current request
+ *
+ * @exception Exception if an error occurs
  */
 protected void accept(ShaleWebContext context) throws Exception {
 
@@ -243,6 +247,8 @@
  * of HttpServletResponse.SC_FORBIDDEN.
  *
  * @param context Context for the current request
+ *
+ * @exception Exception if an error occurs
  */
 protected void reject(ShaleWebContext context) throws Exception {
 
@@ -330,7 +336,7 @@
 try {
 type = st.nextToken();
 } catch (IOException e) {
-// Can not happen
+; // Can not happen
 }
 if (type == StreamToken

svn commit: r419254 - /struts/struts2/trunk/core/pom.xml

2006-07-05 Thread plightbo
Author: plightbo
Date: Wed Jul  5 08:32:15 2006
New Revision: 419254

URL: http://svn.apache.org/viewvc?rev=419254&view=rev
Log:
needs to be in the compile scope now that StrutsTestCase depends on spring mock

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=419254&r1=419253&r2=419254&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Jul  5 08:32:15 2006
@@ -250,7 +250,7 @@
 org.springframework
 spring-mock
 1.2.6
-test
+true
 
 
 




svn commit: r419299 [3/3] - in /struts/shale/trunk: shale-remoting/src/main/java/org/apache/shale/remoting/ shale-remoting/src/main/java/org/apache/shale/remoting/faces/ shale-remoting/src/main/java/o

2006-07-05 Thread craigmcc
Modified: 
struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockSessionMap.java
URL: 
http://svn.apache.org/viewvc/struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockSessionMap.java?rev=419299&r1=419298&r2=419299&view=diff
==
--- 
struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockSessionMap.java
 (original)
+++ 
struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockSessionMap.java
 Wed Jul  5 11:01:09 2006
@@ -1,12 +1,12 @@
 /*
  * Copyright 2004 The Apache Software Foundation.
- * 
+ *
  * Licensed 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.
@@ -41,6 +41,13 @@
 //  
Constructors
 
 
+/**
+ * Construct an instance exposing the attributes of the specified
+ * session.
+ *
+ * @param session Session whose attributes are to be exposed
+ *  as a Map
+ */
 public MockSessionMap(HttpSession session) {
 
 this.session = session;
@@ -54,12 +61,16 @@
 // -- Instance 
Variables
 
 
+/**
+ * The session whose attributes we are exposing as a Map.
+ */
 private HttpSession session = null;
- 
+
 
 // - Map 
Methods
 
 
+/** [EMAIL PROTECTED] */
 public void clear() {
 
 Iterator keys = keySet().iterator();
@@ -70,6 +81,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public boolean containsKey(Object key) {
 
 return session.getAttribute(key(key)) != null;
@@ -77,6 +89,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public boolean containsValue(Object value) {
 
 if (value == null) {
@@ -94,6 +107,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public Set entrySet() {
 
 Set set = new HashSet();
@@ -106,6 +120,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public boolean equals(Object o) {
 
 return session.equals(o);
@@ -113,6 +128,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public Object get(Object key) {
 
 return session.getAttribute(key(key));
@@ -120,6 +136,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public int hashCode() {
 
 return session.hashCode();
@@ -127,6 +144,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public boolean isEmpty() {
 
 return size() < 1;
@@ -134,6 +152,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public Set keySet() {
 
 Set set = new HashSet();
@@ -146,6 +165,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public Object put(Object key, Object value) {
 
 if (value == null) {
@@ -159,6 +179,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public void putAll(Map map) {
 
 Iterator keys = map.keySet().iterator();
@@ -170,6 +191,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public Object remove(Object key) {
 
 String skey = key(key);
@@ -180,6 +202,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public int size() {
 
 int n = 0;
@@ -193,6 +216,7 @@
 }
 
 
+/** [EMAIL PROTECTED] */
 public Collection values() {
 
 List list = new ArrayList();
@@ -208,6 +232,11 @@
 // - Private 
Methods
 
 
+/**
+ * Return the specified key, after converting it to a String.
+ *
+ * @param key Key to be converted
+ */
 private String key(Object key) {
 
 if (key == null) {

Modified: 
struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockStateManager.java
URL: 
http://svn.apache.org/viewvc/struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockStateManager.java?rev=419299&r1=419298&r2=419299&view=diff
==
--- 
struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockStateManager.java
 (original)
+++ 
struts/shale/trunk/shale-test/src/main/java/org/apache/shale/test/mock/MockStateManager.java
 Wed Jul  5 11:01:09 2006
@@ -1,12 +1,12 @@
 /*
  * Copyright 2004 The Apache Software Foundation.
- * 
+ *
  * Licensed 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, s

svn commit: r419337 - in /struts/struts1/trunk: ./ apps/ apps/blank/ apps/cookbook/ apps/examples/ apps/faces-example1/ apps/faces-example2/ apps/mailreader/ apps/scripting-mailreader/ apps/strutsel-e

2006-07-05 Thread mrdon
Author: mrdon
Date: Wed Jul  5 13:45:40 2006
New Revision: 419337

URL: http://svn.apache.org/viewvc?rev=419337&view=rev
Log:
Changed module name prefixes from "Struts 1 -" to just "Struts"
WW-2898

Modified:
struts/struts1/trunk/apps/blank/pom.xml
struts/struts1/trunk/apps/cookbook/pom.xml
struts/struts1/trunk/apps/examples/pom.xml
struts/struts1/trunk/apps/faces-example1/pom.xml
struts/struts1/trunk/apps/faces-example2/pom.xml
struts/struts1/trunk/apps/mailreader/pom.xml
struts/struts1/trunk/apps/pom.xml
struts/struts1/trunk/apps/scripting-mailreader/pom.xml
struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml
struts/struts1/trunk/assembly/pom.xml
struts/struts1/trunk/core/pom.xml
struts/struts1/trunk/el/pom.xml
struts/struts1/trunk/extras/pom.xml
struts/struts1/trunk/faces/pom.xml
struts/struts1/trunk/integration/apps-it/pom.xml
struts/struts1/trunk/integration/pom.xml
struts/struts1/trunk/integration/tg4w/pom.xml
struts/struts1/trunk/mailreader-dao/pom.xml
struts/struts1/trunk/pom.xml
struts/struts1/trunk/scripting/pom.xml
struts/struts1/trunk/taglib/pom.xml
struts/struts1/trunk/tiles/pom.xml

Modified: struts/struts1/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/blank/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/blank/pom.xml (original)
+++ struts/struts1/trunk/apps/blank/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-blank
war
-   Struts 1 - Apps - Blank
+   Struts Apps - Blank


   

Modified: struts/struts1/trunk/apps/cookbook/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/cookbook/pom.xml (original)
+++ struts/struts1/trunk/apps/cookbook/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-cookbook
war
-   Struts 1 - Apps - Cookbook
+   Struts Apps - Cookbook


   

Modified: struts/struts1/trunk/apps/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/examples/pom.xml (original)
+++ struts/struts1/trunk/apps/examples/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-examples
war
-   Struts 1 - Apps - Examples
+   Struts Apps - Examples


   

Modified: struts/struts1/trunk/apps/faces-example1/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/faces-example1/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example1/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-faces-example1
war
-   Struts 1 - Apps - Faces Example 1
+   Struts Apps - Faces Example 1


   

Modified: struts/struts1/trunk/apps/faces-example2/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/faces-example2/pom.xml (original)
+++ struts/struts1/trunk/apps/faces-example2/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-faces-example2
war
-   Struts 1 - Apps - Faces Example 2
+   Struts Apps - Faces Example 2


   

Modified: struts/struts1/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/mailreader/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts1/trunk/apps/mailreader/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-mailreader
war
-   Struts 1 - Apps - Mailreader
+   Struts Apps - Mailreader


   

Modified: struts/struts1/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/pom.xml?rev=419337&r1=419336&r2=419337&view=diff
==
--- struts/struts1/trunk/apps/pom.xml (original)
+++ struts/struts1/trunk/apps/pom.xml Wed Jul  5 13:45:40 2006
@@ -32,7 +32,7 @@
org.apache.struts
struts-apps
pom
-   Struts 1 - Apps
+   Struts Apps
 



Modified: struts/struts1/trunk/apps/scripting-mailreader/pom.xml
URL: 
http://svn.apache.or

svn commit: r419348 - /struts/shale/

2006-07-05 Thread bayard
Author: bayard
Date: Wed Jul  5 14:30:07 2006
New Revision: 419348

URL: http://svn.apache.org/viewvc?rev=419348&view=rev
Log:
Moving Shale to TLP

Removed:
struts/shale/



svn commit: r419349 - /struts/current/

2006-07-05 Thread mrdon
Author: mrdon
Date: Wed Jul  5 14:36:22 2006
New Revision: 419349

URL: http://svn.apache.org/viewvc?rev=419349&view=rev
Log:
Fixing current to not include Shale.  Good luck, Shale folks :)

Modified:
struts/current/   (props changed)

Propchange: struts/current/
--
--- svn:externals (original)
+++ svn:externals Wed Jul  5 14:36:22 2006
@@ -2,5 +2,4 @@
 struts2   https://svn.apache.org/repos/asf/struts/struts2/trunk
 maven https://svn.apache.org/repos/asf/struts/maven/trunk
 sandbox   https://svn.apache.org/repos/asf/struts/sandbox/trunk
-shale https://svn.apache.org/repos/asf/struts/shale/trunk
 site  https://svn.apache.org/repos/asf/struts/site




[Struts Wiki] Update of "ShaleReleasePlans" by TedHusted

2006-07-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/ShaleReleasePlans

The comment on the change is:
Add from Struts wiki

--
  
   *  ShaleRelease100 - ''Shale Version 1.0.0''
   *  ShaleRelease101 - ''Shale Version 1.0.1'' (planning in progress)
+  *  ShaleRelease102 - ''Shale Version 1.0.2'' (planning in progress)
  


[Struts Wiki] Update of "StrutsReleasePlans" by TedHusted

2006-07-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/StrutsReleasePlans

The comment on the change is:
Move to Shale release page

--
   *  StrutsScriptingRelease100 - ''Struts Scripting Version 1.0.0''
   *  StrutsScriptingRelease101 - ''Struts Scripting Version 1.0.1''
  
- = 2. Struts Shale =
- 
-  *  ShaleRelease100 - ''Struts Shale Version 1.0.0''
-  *  ShaleRelease101 - ''Struts Shale Version 1.0.1''
-  *  ShaleRelease102 - ''Struts Shale Version 1.0.2''
- 


[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted

2006-07-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/StrutsActionRelease200

The comment on the change is:
Update nomenclature

--
- = Struts Action 2.0.0 Release =
+ = Struts 2.0.0 Release =
  
  == Info ==
  
@@ -16, +16 @@

  
  == See Also ==
  
-  * [http://issues.apache.org/struts/browse/WW-1349 SAF 2.0.0 omnibus ticket]
+  * [http://issues.apache.org/struts/browse/WW-1349 Struts 2.0.0 omnibus 
ticket]
   * 
[http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&mode=hide&sorter/order=DESC&sorter/field=priority&resolution=-1&pid=10030&fixfor=21510
 Issue Tracker]
   * [http://wiki.apache.org/struts/StrutsTi Struts Ti Proposal]
   * [http://wiki.apache.org/struts/StrutsAction2 Migration Issues]
@@ -26, +26 @@

  
  == Special Issues ==
  
- The Struts Action 2 framework is based on the Web``Work 2.2 codebase. 
Essentially, Struts Action 2.0  will be the technical equivalent of Web``Work 
2.3. (The Web``Work2 codebase was accepted into the Struts project through the 
[http://incubator.apache.org/projects/webwork2.html Apache Incubator].) 
+ Struts 2.0 is based on the Web``Work 2.2 codebase. Essentially, Struts 2.0  
will be the technical equivalent of Web``Work 2.3. (The Web``Work2 codebase was 
accepted into the Struts project through the 
[http://incubator.apache.org/projects/webwork2.html Apache Incubator].) 
  
- For SAF 2.0, the core goals are to repackage the codebase as an Apache Struts 
product and to provide migration resources for SAF 1 and WW 2 developers. A few 
legacy API elements will be removed, and a few new features will be added. 
+ For Struts 2, the core goals are to repackage the codebase as an Apache 
Struts product and to provide migration resources for Struts 1 and WW 2 
developers. A few legacy API elements will be removed, and a few new features 
will be added. 
  
- The SAF 2.0 release is following the [http://wiki.apache.org/struts/StrutsTi 
Struts Ti Proposal]. SAF 2.0 is Phase 1 of the proposal. A subsequent SAF 
release series (either SAF 2.1 or SAF 3.0) will address Phase 2 of the proposal.
+ The Struts 2.0 release is following the 
[http://wiki.apache.org/struts/StrutsTi Struts Ti Proposal]. Struts 2.0 is 
Phase 1 of the proposal. A subsequent Struts release series (either Struts 2.1 
or Struts 3.0) will address Phase 2 of the proposal.
  
- SAF 2.0.0 is targeting August 2006 as a relaxed release date.
+ Struts 2.0.0 is targeting August 2006 as a relaxed release date.
  
- The platform for SAF 2.0.x is Java 1.5, with Java 1.4 compatibity provided by 
[http://retroweaver.sourceforge.net/documentation.html Retroweaver].
+ The platform for Struts 2.0.x is Java 1.5, with Java 1.4 compatibity provided 
by [http://retroweaver.sourceforge.net/documentation.html Retroweaver].
  
  See also StrutsAction2.
  
@@ -43, +43 @@

  || Initial rename of packages and configuration files || Complete ||
  || Pass Web``Work2 codebase through the Incubator || Complete ||
  || [http://issues.apache.org/struts/browse/SITE-3 Setup Nightly Builds] || - 
||
- || [http://issues.apache.org/struts/browse/WW-1340 Update WW2 documentation 
for SAF2] || Step 3 of 4 ||
+ || [http://issues.apache.org/struts/browse/WW-1340 Update WW2 documentation 
for Struts 2] || Step 3 of 4 ||
  || [http://issues.apache.org/struts/browse/WW-1341 Utilize Cookbook format 
for Showcase and add Struts-Examples use cases] || - ||
  || [http://issues.apache.org/struts/browse/WW-1342 Remove deprecated members 
(IoC components)] || Complete ||
  || [http://issues.apache.org/struts/browse/WW-1343 Deprecate selected legacy 
API members (e.g. Around``Interceptor, "do" clause)] || Complete ||
  || [http://issues.apache.org/struts/browse/WW-1344 Update Javadoc to match 
new package and configuration naming] || - ||
  || Implement selected new features and SAF1 features (infra) || - ||
- || [http://issues.apache.org/struts/browse/WW-1345 Add SAF1 and WW2 Migration 
Guides] || Initial draft added ||
+ || [http://issues.apache.org/struts/browse/WW-1345 Add Struts 1 and WW2 
Migration Guides] || Initial draft added ||
  || [http://issues.apache.org/struts/browse/WW-1346 Develop routine for 
exporting wiki to HTML/PDF] || - ||
  || Second documentation review || - ||
  || Complete standard release plan || - ||
@@ -102, +102 @@

   * Work with OGNL to add Java 5 support. (See #31.)
   * Work with OGNL to make it a clear superset of JSTL. (See Gabe #4.)
  
- == SAF1 Features to Implement ==
+ == Struts 1 Features to Implement ==
  
  [http://issues.apache.org/struts/browse/WW-1347 JIRA issue] 
  
@@ -116, +116 @@

  
  == Outstanding Issue Review ==
  
- 
[http://issues.apache.org/struts/secure/IssueNavigator.jspa?reset=true&mode=hide&sorter/order=DESC&sorter/field=priority&resolution=-1&pid=10030&fixfor=21510

[Struts Wiki] Trivial Update of "SAF1RoughSpots" by TedHusted

2006-07-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/SAF1RoughSpots

The comment on the change is:
/s/SAF/Struts (only)

--
- Struts Action 1 (a.k.a. Struts Classic) is a well-known framework. It has its 
deficiencies, but workarounds are known as well. For many, continuing to use 
SAF1 makes sense even after release of SAF2. This page tries to summarize major 
issues with SAF1 and possibilities to fix them or provide better workarounds.
+ Struts 1 (a.k.a. Struts Classic) is a well-known framework. It has its 
deficiencies, but workarounds are known as well. For many, continuing to use 
Struts 1 makes sense even after release of Struts 2. This page tries to 
summarize major issues with Struts 1 and possibilities to fix them or provide 
better workarounds.
  
  == Code Issues ==
  
-   1. '''I/O conversion'''  [MichaelJ] The suckiest part of SAF1 is I/O 
conversion. [https://formdef.dev.java.net/ FormDef] seem to solve most 
conversion/validation issues, so bring !FormDef into Struts core and consider 
using dynaforms with nested business objects as a best practice.
+   1. '''I/O conversion'''  [MichaelJ] The suckiest part of Struts1 is I/O 
conversion. [https://formdef.dev.java.net/ FormDef] seem to solve most 
conversion/validation issues, so bring !FormDef into Struts core and consider 
using dynaforms with nested business objects as a best practice.
  
-   1. '''SAF1 lifecycle'''  [MichaelJ] The lifecycle of SAF1 is quite simple; 
from a user's perspective it includes just reset/populate/validate functions. 
Consider the option to call all lifecycle functions explicitly from an action 
class, no more automatic population.
+   1. '''Struts 1 lifecycle'''  [MichaelJ] The lifecycle of Struts 1 is quite 
simple; from a user's perspective it includes just reset/populate/validate 
functions. Consider the option to call all lifecycle functions explicitly from 
an action class, no more automatic population.
  * [FrankZ] I personally would not want to see the auto-population and 
validation and such go away.  I think them being declarative is a powerful 
notion.  I DO however agree that a developer should be able to turn them off 
declaratively and do it all manually.
  
1. '''Automatic validation'''  [MichaelJ] Deprecate automatic validation, 
newbies always stumble upon the fact that their action class is not called when 
validation fails. Instead, promote explicit validation.
  * [FrankZ] Definite -1 from me.  Again, I'm +1 to being able to turn it 
on and off, but I very much believe it should be there.  Perhaps there is some 
room for better logging in the cases you mention?
  
1. '''Input attribute'''  [MichaelJ] Deprecate "input" attribute of 
"action" tag in struts-config.xml. At least, rename it to "error" or something. 
A frequent misconception is to think that the lifecycle starts with displaying 
an "input" page, which is obviously not true.
- * [FrankZ] +0.  I don't disagree with you at all, and I think there are 
probably other things that could similarly be changed.  However, I think it is 
very important that anything done with SAF1 be evolutionary and take 
backwards-compatibility into consideration in a big way.  I think if you want 
revolution you go for SAF2 (a minor revolution in that it's theoretically still 
compatible) or Shale.
+ * [FrankZ] +0.  I don't disagree with you at all, and I think there are 
probably other things that could similarly be changed.  However, I think it is 
very important that anything done with Struts 1 be evolutionary and take 
backwards-compatibility into consideration in a big way.  I think if you want 
revolution you go for Struts 2 (a minor revolution in that it's theoretically 
still compatible) or Shale.
  
1. '''Form attribute'''  [MichaelJ] Add "form" attribute with the same 
meaning as "name" attribute; deprecate "name".
  * [FrankZ] +0.  Same comment as the above point.
@@ -88, +88 @@

  
  == Best Practices Issues ==
  
-   1. '''Focus on best and most common approaches'''  [MichaelJ] Instead of 
having several ways to do things, SAF1 should focus on one best and the most 
common way, even if it involves a couple more lines of code. Less is more.
+   1. '''Focus on best and most common approaches'''  [MichaelJ] Instead of 
having several ways to do things, Struts 1 should focus on one best and the 
most common way, even if it involves a couple more lines of code. Less is more.
  
-   1. '''Webresource-centered approach'''  [MichaelJ] Up until now SAF1 best 
practices center around a View, usually a JSP page. Instead, best practices 
should teach the webresource-centered approach.
+   1. '''Webresource-centered approach'''  [MichaelJ] Up until now Struts 1 
best practices center around a View, usually a JSP pa

[Struts Wiki] Update of "StrutsReleasePlans" by TedHusted

2006-07-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/StrutsReleasePlans

The comment on the change is:
Update nomenclature only

--
  
  '''NOTE''' For info on cutting a release see 
[http://struts.apache.org/releases.html#Releases Struts Release Guidelines] and 
StrutsMavenRelease.
  
- = 1. Struts Action  =
- == 2.0.x ==
+ = 2.0.x =
   *  StrutsActionRelease200 - ''Struts Version 2.0.0''
+ 
- == 1.3.x ==
+ = 1.3.x =
   *  StrutsClassicRelease130 - ''Struts Version 1.3.0''
   *  StrutsActionRelease131 - ''Struts Action Version 1.3.1'' 
   *  StrutsTaglibRelease131 - ''Struts Taglib Version 1.3.1'' (cancelled)
@@ -17, +17 @@

   *  StrutsActionRelease132 - ''Struts Action Version 1.3.2'' 
   *  StrutsActionRelease133 - ''Struts Action Version 1.3.3'' (Test Build)
   *  StrutsActionRelease134 - ''Struts Action Version 1.3.4'' (Beta)
-  *  StrutsActionRelease135 - ''Struts Action Version 1.3.5''
+  *  StrutsActionRelease135 - ''Struts Version 1.3.5''
+ 
- == 1.2.x ==
+ = 1.2.x =
   *  StrutsRelease122 - ''Struts Version 1.2.2''
   *  StrutsRelease123 - ''Struts Version 1.2.3''
   *  StrutsRelease124 - ''Struts Version 1.2.4''
@@ -27, +28 @@

   *  StrutsRelease127 - ''Struts Version 1.2.7''
   *  StrutsRelease128 - ''Struts Version 1.2.8''
   *  StrutsRelease129 - ''Struts Version 1.2.9''
- == Miscellaneous ==
+ 
+ = Other =
   *  StrutsFacesRelease101 - ''Struts-Faces Version 1.0.1''
   *  StrutsScriptingRelease100 - ''Struts Scripting Version 1.0.0''
   *  StrutsScriptingRelease101 - ''Struts Scripting Version 1.0.1''


svn commit: r419419 - /struts/maven/trunk/struts2-archetype-quickstart/src/main/resources/archetype-resources/pom.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Wed Jul  5 20:10:44 2006
New Revision: 419419

URL: http://svn.apache.org/viewvc?rev=419419&view=rev
Log:
Comment out the JasperReports dependency due to licensing. (Thanks, Ted.)
Update the project name to Struts 2.

Modified:

struts/maven/trunk/struts2-archetype-quickstart/src/main/resources/archetype-resources/pom.xml

Modified: 
struts/maven/trunk/struts2-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-quickstart/src/main/resources/archetype-resources/pom.xml?rev=419419&r1=419418&r2=419419&view=diff
==
--- 
struts/maven/trunk/struts2-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
struts/maven/trunk/struts2-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
 Wed Jul  5 20:10:44 2006
@@ -6,9 +6,9 @@
${artifactId}
war
${version}
-   SAF2 Quickstart Web App Sample
+   Struts 2 Quickstart Web App Sample
http://www.myComp.com
-   Apache Struts Action Framework 2 - Maven Archetype - 
Quickstart
+   Struts 2 - Maven Archetype - Quickstart



@@ -19,7 +19,7 @@
test

 
-   
+   

 org.apache.struts
 struts2-core
@@ -106,14 +106,17 @@
spring-web
1.2.6

-   
-   
-   
+
+
+







svn commit: r419423 - in /struts/maven/trunk/build: LICENSE.CheckStyle LICENSE.txt NOTICE.txt pom.xml src/ struts_checks.xml struts_jalopy.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Wed Jul  5 20:34:53 2006
New Revision: 419423

URL: http://svn.apache.org/viewvc?rev=419423&view=rev
Log:
Flatten the directory structure and remove the pom.
SITE-7

Added:
struts/maven/trunk/build/LICENSE.CheckStyle
  - copied unchanged from r419414, 
struts/maven/trunk/build/src/main/resources/org/apache/struts/build/LICENSE.CheckStyle
struts/maven/trunk/build/LICENSE.txt
  - copied unchanged from r419414, 
struts/maven/trunk/build/src/main/resources/LICENSE.txt
struts/maven/trunk/build/NOTICE.txt
  - copied unchanged from r419414, 
struts/maven/trunk/build/src/main/resources/NOTICE.txt
struts/maven/trunk/build/struts_checks.xml
  - copied unchanged from r419414, 
struts/maven/trunk/build/src/main/resources/org/apache/struts/build/struts_checks.xml
struts/maven/trunk/build/struts_jalopy.xml
  - copied unchanged from r419414, 
struts/maven/trunk/build/src/main/resources/org/apache/struts/build/struts_jalopy.xml
Removed:
struts/maven/trunk/build/pom.xml
struts/maven/trunk/build/src/



svn commit: r419425 - /struts/struts1/trunk/pom.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Wed Jul  5 20:36:26 2006
New Revision: 419425

URL: http://svn.apache.org/viewvc?rev=419425&view=rev
Log:
Change the location of the Checkstyle config file.
SITE-7

Modified:
struts/struts1/trunk/pom.xml

Modified: struts/struts1/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=419425&r1=419424&r2=419425&view=diff
==
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Wed Jul  5 20:36:26 2006
@@ -147,7 +147,7 @@
 
 maven-checkstyle-plugin
 
-  
http://svn.apache.org/repos/asf/struts/maven/trunk/build/src/main/resources/org/apache/struts/build/struts_checks.xml
+  
http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml
 
 
 




svn commit: r419427 - /struts/struts2/trunk/pom.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Wed Jul  5 20:39:10 2006
New Revision: 419427

URL: http://svn.apache.org/viewvc?rev=419427&view=rev
Log:
Remove the struts-build  and fix the location of the  Checkstyle 
config file.
SITE-7

Modified:
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=419427&r1=419426&r2=419427&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Wed Jul  5 20:39:10 2006
@@ -175,14 +175,6 @@
 
 
 
-
-
-org.apache.struts
-struts-build
-1.0.1
-
-
-
 install
 
 
@@ -206,7 +198,7 @@
 
 maven-checkstyle-plugin
 
-  
org/apache/struts/build/struts_checks.xml
+  
http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml
 
 
 -->




svn commit: r419430 - /struts/maven/trunk/build/struts_checks.xml

2006-07-05 Thread wsmoak
Author: wsmoak
Date: Wed Jul  5 21:12:49 2006
New Revision: 419430

URL: http://svn.apache.org/viewvc?rev=419430&view=rev
Log:
Convert LICENSE.CheckStyle to a single line (replacing newlines with \n) and 
add it to struts_checks.xml.
Once again, the double quotes around "AS IS" and "LICENSE" were converted to 
'.' in the regexp.
STR-2853

Modified:
struts/maven/trunk/build/struts_checks.xml

Modified: struts/maven/trunk/build/struts_checks.xml
URL: 
http://svn.apache.org/viewvc/struts/maven/trunk/build/struts_checks.xml?rev=419430&r1=419429&r2=419430&view=diff
==
--- struts/maven/trunk/build/struts_checks.xml (original)
+++ struts/maven/trunk/build/struts_checks.xml Wed Jul  5 21:12:49 2006
@@ -134,9 +134,10 @@
 
 
 
-
+
+http://www\.apache\.org/licenses/LICENSE\-2\.0\n \*\s*\n \*\s*Unless 
required by applicable law or agreed to in writing, software\n \*\s*distributed 
under the License is distributed on an .AS IS. BASIS,\n \*\s*WITHOUT WARRANTIES 
OR CONDITIONS OF ANY KIND, either express or implied\.\n \*\s*See the License 
for the specific language governing permissions and\n \*\s*limitations under 
the License\.\n \*/\s*"/>
+