svn commit: r405033 - /struts/site/src/site/site.xml

[husted]

Author: husted
Date: Mon May  8 05:24:16 2006
New Revision: 405033

URL: http://svn.apache.org/viewcvs?rev=405033&view=rev
Log:
action2
* Link to Confluence instance until we are ready to export the HTML

Modified:
struts/site/src/site/site.xml

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewcvs/struts/site/src/site/site.xml?rev=405033&r1=405032&r2=405033&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Mon May  8 05:24:16 2006
@@ -66,7 +66,7 @@
 
 
 http://struts.apache.org/struts-action/index.html"/>
-http://struts.apache.org/struts-action2/index.html"/>
+http://confluence.twdata.org/display/WW/Home"/>
 http://struts.apache.org/struts-shale/index.html"/>
 
 

svn commit: r405051 - in /struts: action2/trunk/STATUS.txt current/STATUS.txt

[husted]

Author: husted
Date: Mon May  8 06:34:41 2006
New Revision: 405051

URL: http://svn.apache.org/viewcvs?rev=405051&view=rev
Log:
STATUS
* Add board report and votes from WebWork2 Incubator STATUS 
* Remove WW2 Incubator STATUS as obsolete
** Update SAF2 wiki with links to ongoing development discussions ("Bleeding 
Edge") 


Removed:
struts/action2/trunk/STATUS.txt
Modified:
struts/current/STATUS.txt

Modified: struts/current/STATUS.txt
URL: 
http://svn.apache.org/viewcvs/struts/current/STATUS.txt?rev=405051&r1=405050&r2=405051&view=diff
==
--- struts/current/STATUS.txt (original)
+++ struts/current/STATUS.txt Mon May  8 06:34:41 2006
@@ -1,14 +1,12 @@
 APACHE STRUTS PROJECT STATUS:
 
 Web site: http://struts.apache.org/
-Wiki: http://wiki.apache.org/struts/
+Moin Mon Wiki: http://wiki.apache.org/struts/
 Mailing Lists: http://struts.apache.org/mail.html
 Issue Tracking: http://issues.apache.org/bugzilla/
 Source Code: http://svn.apache.org/viewcvs.cgi/struts/
 Announcements: http://struts.apache.org/announce.html
 
-WebWork2 Incubation Status: 
http://svn.apache.org/repos/asf/incubator/webwork2/STATUS.txt
-
 PMC Members
 
 * Craig R. McClanahan  (craigmcc at apache.org)
@@ -61,6 +59,42 @@
 
 2006 Board Reports 
 
+April 2006 -- WebWork2 podling
+
+The last quarter has seen the creation of the WebWork 2 podling and rapid 
progress. 
+Our focus has been on migrating code, resources, developers, IP, and community 
over 
+to the ASF.
+
+ - Code: we have imported the code into the Incubator SVN, and have renamed 
packages, 
+   taglib prefixes, and any other eferences to the old WebWork project over to 
the new 
+   Struts Action Framework 2 project, where the final location of the code 
will be.
+
+ - Resources: We've migrated the code to the Apache SVN, setup and migrated 
JIRA 
+   tickets to the new issues.apache.org server, and are in the process of 
migration 
+   wiki documentation.
+
+ - Developers: The core WebWork 2 developers have been given accounts and 
access to 
+   the podling, voted in through the proposal. We plan to vote the remaining 
committers 
+   in one-by-one through the Struts PMC, serving as the IPMC for the podling.
+
+ - IP: The OpenSymphony organization, who owns the copyright on the WebWork 2 
project, 
+   has delivered a code grant allowing us to change the copyright.  
Additionally, we've 
+   removed most of the LGPL source code (usually in the form of Javascript 
libraries) 
+   and have developed an optional build that compiles integration code 
depending on 
+   LGPL jars, in accordance to the draft IP policy document.
+
+ - Community: The WebWork 2 developers have joined the Struts mailing lists 
and have 
+   been very active in participating with both development and user threads. 
They have 
+   been just as, if not more, active committing to the code repository as 
Struts 
+   committers, and when conflicts arise, they are very quick to come to a 
solution in a 
+   positive way. In addition, several Struts committers have joined 
OpenSymphony forums, 
+   chat rooms, and projects further strengthening the relationship.
+
+We are definitely planning on exiting the Incubator this next quarter, 
possibly within 
+weeks. We see a bright future for the Struts Action project, and hope to 
facilitate a 
+new spirit of cooperation within the competitive landscape of Java web 
application 
+frameworks
+
 
 April 2006 
 
@@ -110,17 +144,47 @@
 
 2006 PROJECT VOTES AND DECISIONS
 
+Struts Action Framework v1.3.3 Quality
+* [8 May 2006] (pending)
+
+Release the struts-parent pom v2
+* [6 May 2006] +1 6 (binding)
+
+Accept and Graduate WebWork 2 Podling to Struts
+* [28 Apr 2006] +1 6 (binding), 9 (non-binding); +0 2 (binding), 2 
(non-binding)
+
+Struts Action Framework v1.3.2 Quality
+* [27 Apr 2006] Tally 4 +1 BETA (binding); 1 +1 ALPHA (binding)
+
+Target Java 5 for Action 2
+* [24 Apr 2006] +1 2 (binding); 0 2 (binding); +1 11 (non-binding); 0 2 
(non-binding)
+
+Unsubscribe commits@ from dev@:
+* [25 Apr 2006] Tally 11 +1 (binding); 1 +0 (binding)
+
+Separate lists for notifications vs. discussion
+* [25 Apr 2006] Tally 11 +1 (binding); 2 +0 (binding); 
+
+Target Java 5 for Action 2, support 1.4 through Retroweaver
+* [24 Apr 2006] 4 +1; 2 +0 (binding); 11 +1; 4 +0 (non-binding)
+  
 Standalone Tiles as TLP 
 * [21 Apr 2006] - "The end goal is a standalone Tiles in the Jakarta Web 
 Commons project (to be created),then Struts Action 1 would have a 
 struts-tiles artifact which makes it possible for Struts users to use 
 this standalone Tiles."
 
+In Action 2, rename "webwork.xml" to "struts-action.xml" 
+* [19 Apr 2006] Tally 3 +1 (binding); 5 +1 (non-binding)
+
 Sean Schofield for PMC
 * [17 Apr 2006] Tally 8 +1 (binding)
 
 Greg Reddin for PMC
 * [15 Apr 2006] Tally 7 +1 (binding)
+
+Release the struts-parent pom v1
+

svn commit: r405407 - in /struts/sandbox/trunk/overdrive/Nexus: Core/Helpers/ViewHelper.cs Nexus.sln Test/bin/Debug/PostBuildEvent.bat

[husted]

Author: husted
Date: Tue May  9 05:22:15 2006
New Revision: 405407

URL: http://svn.apache.org/viewcvs?rev=405407&view=rev
Log:
OVR-23
* Trim Search Criteria input

Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Nexus.sln
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat

Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs?rev=405407&r1=405406&r2=405407&view=diff
==
--- struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs Tue May  9 
05:22:15 2006
@@ -58,19 +58,15 @@
if (input == null) return;
ICollection keys = input.Keys;
IDictionary criteria = Criteria;
-   if (nullIfEmpty)
-   foreach (string key in keys)
-   {
-   object value = input[key];
-   string s = value as string;
-   if ((s != null) && (s.Length == 0))
-   criteria.Add(key, null);
-   else
-   criteria.Add(key, value);
-   }
-   else foreach (string key in keys)
+   foreach (string key in keys)
{
-   criteria.Add(key, input[key]);
+   string s = null;
+   string o = (input[key] as string);
+   if (o!=null) s = o.Trim();
+   if ((nullIfEmpty) && (s != null) && (s.Length 
== 0))
+   criteria.Add(key, null);
+   else
+   criteria.Add(key, s);
}
}
 

Modified: struts/sandbox/trunk/overdrive/Nexus/Nexus.sln
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Nexus.sln?rev=405407&r1=405406&r2=405407&view=diff
==
--- struts/sandbox/trunk/overdrive/Nexus/Nexus.sln (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Nexus.sln Tue May  9 05:22:15 2006
@@ -39,6 +39,8 @@
{2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Release.ActiveCfg = 
Release|.NET
{2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Release.Build.0 = 
Release|.NET
EndGlobalSection
+   GlobalSection(SolutionItems) = postSolution
+   EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution

Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat?rev=405407&r1=405406&r2=405407&view=diff
==
--- struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat 
(original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/PostBuildEvent.bat Tue 
May  9 05:22:15 2006
@@ -1,5 +1,5 @@
 @echo off
-E:\projects\Apache\struts\sandbox\overdrive\Nexus\postbuild.bat 
E:\projects\Apache\struts\sandbox\overdrive\Nexus\Test\bin\Debug\  Nexus.Test  
Nexus  E:\projects\Apache\struts\sandbox\overdrive\Nexus\
+E:\projects\Apache\struts-current\sandbox\overdrive\Nexus\postbuild.bat 
E:\projects\Apache\struts-current\sandbox\overdrive\Nexus\Test\bin\Debug\  
Nexus.Test  Nexus  E:\projects\Apache\struts-current\sandbox\overdrive\Nexus\
 if errorlevel 1 goto CSharpReportError
 goto CSharpEnd
 :CSharpReportError

svn commit: r405529 - /struts/action2/trunk/apps/pom.xml

[husted]

Author: husted
Date: Tue May  9 13:47:58 2006
New Revision: 405529

URL: http://svn.apache.org/viewcvs?rev=405529&view=rev
Log:
apps pom.xml
* Add Spring dependency to POM so that applications will deploy. 

Modified:
struts/action2/trunk/apps/pom.xml

Modified: struts/action2/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action2/trunk/apps/pom.xml?rev=405529&r1=405528&r2=405529&view=diff
==
--- struts/action2/trunk/apps/pom.xml (original)
+++ struts/action2/trunk/apps/pom.xml Tue May  9 13:47:58 2006
@@ -103,5 +103,43 @@
 struts-core
 ${pom.version}
 
+
+
+
+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
+
+
+
 
 

svn commit: r407245 - /struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml

[husted]

Author: husted
Date: Wed May 17 06:08:05 2006
New Revision: 407245

URL: http://svn.apache.org/viewcvs?rev=407245&view=rev
Log:
Emphasize link to wiki page for upgraders. 

Modified:
struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml

Modified: struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml?rev=407245&r1=407244&r2=407245&view=diff
==
--- struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml (original)
+++ struts/action/trunk/src/site/xdoc/userGuide/release-notes.xml Wed May 17 
06:08:05 2006
@@ -64,7 +64,7 @@
 Roadmap page
 .
 
-
+
 Notes on upgrading
 are maintained in the
 http://wiki.apache.org/struts/StrutsUpgrade";>Wiki
@@ -74,11 +74,10 @@
 free to add your
 input so that everyone can benefit from the collective
 experience.
-
+
 
 For the version requirements of each library, see the
-Installation chapter
-.
+Installation chapter.
 
 
 

svn commit: r411140 [2/2] - in /struts/action/trunk: el/src/site/ el/src/site/xdoc/ extras/src/site/ extras/src/site/xdoc/ faces/src/site/ faces/src/site/xdoc/ scripting/src/site/ scripting/src/site/x

[husted]

sor, and Plugin classes to
 define a framework where developers may specify the

Modified: struts/action/trunk/tiles/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/site.xml?rev=411140&r1=411139&r2=411140&view=diff
==
--- struts/action/trunk/tiles/src/site/site.xml (original)
+++ struts/action/trunk/tiles/src/site/site.xml Fri Jun  2 05:32:19 2006
@@ -57,9 +57,6 @@
 http://struts.apache.org/"/>
-
 
 ${reports}
 

Modified: struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml?rev=411140&r1=411139&r2=411140&view=diff
==
--- struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/dev_tiles.xml Fri Jun  2 05:32:19 
2006
@@ -166,7 +166,7 @@
 
 
 
-The Tiles framework is bundled with Struts but not enabled by default. To 
enable Tiles you need to:
+The Tiles framework is bundled with Struts Action but not enabled by default. 
To enable Tiles you need to:
 
 
 
@@ -191,7 +191,7 @@
 <%@ taglib uri="http://struts.apache.org/tags-tiles"; prefix="tiles" 
%>
 
 
-  If you plan to use Tiles definitions defined in a centralized file, you need 
to create this file and instruct Struts to load the Tiles plugin which will 
create the factory corresponding to the file. You can have more than one 
definitions file.
+  If you plan to use Tiles definitions defined in a centralized file, you need 
to create this file and instruct Struts Action to load the Tiles plugin which 
will create the factory corresponding to the file. You can have more than one 
definitions file.
 
 
 
@@ -212,7 +212,7 @@
 
 
 
-  Note: This plugin creates one factory for each Struts 
modules. The plugin first reads the factory parameters from 
web.xml and then overloads them with the ones defined in the first 
struts-config.xml file.
+  Note: This plugin creates one factory for each Struts 
Action modules. The plugin first reads the factory parameters from 
web.xml and then overloads them with the ones defined in the first 
struts-config.xml file.
 
 
 
@@ -255,13 +255,13 @@
 http://www.manning.com/getpage.html?project=husted&filename=chapters.html";>
 Developing applications with Tiles by Cedric Dumoulin and 
Ted Husted.
 Sample chapter from
-http://www.amazon.com/exec/obidos/ISBN=1930110502/hitchhikeguidetoA/";>Struts
 in Action; available as a free download (PDF).
+http://www.amazon.com/exec/obidos/ISBN=1930110502/apachesoftwar-20/";>Struts
 in Action; available as a free download (PDF).
 
 
 
 http://www.oreilly.com/catalog/jakarta/chapter/";>
 Using Tiles Sample beta chapter from
-http://www.amazon.com/exec/obidos/ISBN=0596003285/hitchhikeguidetoA/";>Programming
 Jakarta Struts; available as a free download (PDF).
+http://www.amazon.com/exec/obidos/ISBN=0596003285/apachesoftwar-20/";>Programming
 Jakarta Struts; available as a free download (PDF).
 
 
 

Modified: struts/action/trunk/tiles/src/site/xdoc/examples.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/examples.xml?rev=411140&r1=411139&r2=411140&view=diff
==
--- struts/action/trunk/tiles/src/site/xdoc/examples.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/examples.xml Fri Jun  2 05:32:19 
2006
@@ -140,7 +140,7 @@
 
 The scenario above can be avoided by defining Tiles in an XML 
configuration
file.  The file is loaded at servlet startup using the Tiles Servlet or
-   a Struts plugin.  The example below defines the Tile in an XML file and
+   a Struts Action plugin.  The example below defines the Tile in an XML 
file and
uses the Tiles insert tag in a JSP to invoke it.
 
 file: WEB-INF/tiles-defs.xml
@@ -271,7 +271,7 @@
 
 
 
-
+
 
 
 

Modified: struts/action/trunk/tiles/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/action/trunk/tiles/src/site/xdoc/index.xml?rev=411140&r1=411139&r2=411140&view=diff
==
--- struts/action/trunk/tiles/src/site/xdoc/index.xml (original)
+++ struts/action/trunk/tiles/src/site/xdoc/index.xml Fri Jun  2 05:32:19 2006
@@ -18,13 +18,13 @@
 -->
 
 
-  Struts Action 1 - Tiles
+  Struts Action Framework - Tiles
 
 
 
 
 
-Welcome to the Struts Tiles subproject.  Tiles is a templating 
+Welcome to the Struts Tiles component.  Tiles is a templating 
 framework.  It can be used to create a common look & feel for a web 
site or
 application and to create reusable vi

svn commit: r552474 - /struts/site/src/site/xdoc/index.xml

[husted]

Author: husted
Date: Mon Jul  2 04:54:12 2007
New Revision: 552474

URL: http://svn.apache.org/viewvc?view=rev&rev=552474
Log:
Add ApacheCon US banner to site. 

Modified:
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=552474&r1=552473&r2=552474
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Mon Jul  2 04:54:12 2007
@@ -26,7 +26,7 @@
 
 
 
-
+http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"; alt="ApacheCon 
US 2007" hspace="16" align="right"/>
   
   What do people who use Apache Struts have to say about using it?
   Browse the
@@ -34,11 +34,11 @@
   user mailing list,
   and see for yourself.
   
-
   
-http://www.nabble.com/-ANN--%22Starting-with-Struts2%22-Book-tf3811984.html";>"Starting
 with Struts2" Book
-http://www.nabble.com/%7BANNONCE--Akrogen-eclipse-plugin---Struts1.x-tf3812382.html#a10791366";>Akrogen
 Eclipse plugin for Struts 1.x
-http://www.nabble.com/-JSON-plugin--announcement-tf3787472.html#a10710939";>Struts
 2 JSON plugin
+http://www.nabble.com/-ANN--Connext-Graphs-tf3955090.html";>Connext 
Graphs
+http://www.nabble.com/-ANN--YUI-plugin-tf3947362.html";>YUI Plugin
+http://www.nabble.com/-S2--ANN--Unit-Testing-Struts-2-Actions-wired-with-Spring-using-JUnit-article-tf3951518.html";>Unit
 Testing Struts 2 Actions wired with Spring
+http://www.nabble.com/Strecks-1.0.1-released-tf3913404.html";>Strecks 
1.0.1 released
   
 
 
@@ -62,7 +62,7 @@
  (or "Ready for Primetime") quality on 12 June 2007.
 
 
- 
+
 
 
 
@@ -220,8 +220,9 @@

 

+http://opensource.atlassian.com/confluence/oss/display/BOOKS/ISBN-978-1-4303-2033-3";>
  Better yet, turn first to the
- http://www.infoq.com/minibooks/starting-struts2";>
+ http://opensource.atlassian.com/confluence/oss/display/BOOKS/ISBN-978-1-4303-2033-3";>
  Starting with Struts2 book.
  At 122 pages, it's a small book that doesn't try to replicate the
  online Struts 2 Documentation. Instead, the book is a perfect 
complement

svn commit: r554219 - /struts/site/src/site/fml/kickstart.fml

[husted]

Author: husted
Date: Sat Jul  7 08:31:16 2007
New Revision: 554219

URL: http://svn.apache.org/viewvc?view=rev&rev=554219
Log:
Add FAQs for security vulnerabilities and press inquiries. (Of course, we will 
need to update the security@ address when the new [EMAIL PROTECTED] address is 
setup.)

Modified:
struts/site/src/site/fml/kickstart.fml

Modified: struts/site/src/site/fml/kickstart.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?view=diff&rev=554219&r1=554218&r2=554219
==
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Sat Jul  7 08:31:16 2007
@@ -225,9 +225,13 @@
 in your
 email client before posting.
 
+
+  Queries from the press (and ONLY queries from the press, NOT 
support questions or 
+  anything else!) should go to our media relations address: 
[press (at) apache (dot) org].
+
 
 
-
+
 
 Is commercial support available?
 
@@ -269,6 +273,27 @@
 can apply the patch to your copy of the framework and 
still use
 the feature in your own application. (Which is what open
 source is ~really~ all about.)
+
+
+
+
+Is there a press kit for Apache Struts?
+
+
+  No, outside of our announcements 
page, there is not a formal press or media kit for Apache Struts. 
+  Queries from the press (and ONLY queries from the press, NOT 
support questions or 
+  anything else!) should go to our media relations address: 
[press (at) apache (dot) org].
+
+
+
+
+Where can I report a potential security 
vulnerability?
+
+
+  If you believe you've found a security vulnerability in 
Apache Struts, please contact our 
+  security address - any emails not relating to security 
vulnerabilities will be ignored without
+  a reply (all security related information will be kept 
confidential unless otherwise indicated): 
+  [security (at) apache (dot) org].
 
 
 

svn commit: r554267 - in /struts/site/src/site: fml/kickstart.fml resources/doap_Struts.rdf

[husted]

Author: husted
Date: Sat Jul  7 14:13:48 2007
New Revision: 554267

URL: http://svn.apache.org/viewvc?view=rev&rev=554267
Log:
Add anchor links to new FAQs. Update doap file. 

Modified:
struts/site/src/site/fml/kickstart.fml
struts/site/src/site/resources/doap_Struts.rdf

Modified: struts/site/src/site/fml/kickstart.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?view=diff&rev=554267&r1=554266&r2=554267
==
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Sat Jul  7 14:13:48 2007
@@ -225,10 +225,6 @@
 in your
 email client before posting.
 
-
-  Queries from the press (and ONLY queries from the press, NOT 
support questions or 
-  anything else!) should go to our media relations address: 
[press (at) apache (dot) org].
-
 
 
 
@@ -276,17 +272,17 @@
 
 
 
-
+
 Is there a press kit for Apache Struts?
 
 
-  No, outside of our announcements 
page, there is not a formal press or media kit for Apache Struts. 
+  Except for our announcements 
page, there is not a formal press or media kit for Apache Struts. 
   Queries from the press (and ONLY queries from the press, NOT 
support questions or 
   anything else!) should go to our media relations address: 
[press (at) apache (dot) org].
 
 
 
-
+
 Where can I report a potential security 
vulnerability?
 
 

Modified: struts/site/src/site/resources/doap_Struts.rdf
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/resources/doap_Struts.rdf?view=diff&rev=554267&r1=554266&r2=554267
==
--- struts/site/src/site/resources/doap_Struts.rdf (original)
+++ struts/site/src/site/resources/doap_Struts.rdf Sat Jul  7 14:13:48 2007
@@ -19,8 +19,8 @@
 Apache Struts
 http://struts.apache.org"; />
 http://struts.apache.org"; />
-Home of several MVC Web Frameworks
-The goal of the Apache Struts project is to encourage 
application architectures based on the "Model 2" approach, a variation of the 
classic Model-View-Controller (MVC) design paradigm.
+Apache Struts is a free open-source framework for creating Java 
web applications.
+The Apache Struts Project offers two major versions of the 
Struts framework. Struts 1 is recognized as the most popular web application 
framework for Java. Struts 1 is the best choice for teams who value proven 
solutions to common problems. Struts 2 was originally known as WebWork 2. The 
2.x framework is the best choice for teams who value elegant solutions to 
difficult problems.
 http://issues.apache.org/struts/"; />
 http://struts.apache.org/mail.html"; />
 http://struts.apache.org/downloads.html"; />

svn commit: r558690 - in /struts/struts2/branches/STRUTS_2_0_X/backport: retrotranslator-runtime-1.2.0.jar retrotranslator-runtime-1.2.2.jar retrotranslator-transformer-1.2.0.jar retrotranslator-trans

[husted]

Author: husted
Date: Mon Jul 23 04:43:05 2007
New Revision: 558690

URL: http://svn.apache.org/viewvc?view=rev&rev=558690
Log:
WW-1974 Update for latest Retrotranslator.

Added:

struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.2.jar
  - copied, changed from r558587, 
struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.0.jar

struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.2.jar
  - copied, changed from r558587, 
struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.0.jar
Removed:

struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.0.jar

struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.0.jar
Modified:
struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat
struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh

Copied: 
struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.2.jar 
(from r558587, 
struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.0.jar)
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.2.jar?view=diff&rev=558690&p1=struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.0.jar&r1=558587&p2=struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-runtime-1.2.2.jar&r2=558690
==
Binary files - no diff available.

Copied: 
struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.2.jar
 (from r558587, 
struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.0.jar)
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.2.jar?view=diff&rev=558690&p1=struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.0.jar&r1=558587&p2=struts/struts2/branches/STRUTS_2_0_X/backport/retrotranslator-transformer-1.2.2.jar&r2=558690
==
Binary files - no diff available.

Modified: struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat?view=diff&rev=558690&r1=558689&r2=558690
==
--- struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat (original)
+++ struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat Mon Jul 23 
04:43:05 2007
@@ -1,2 +1,2 @@
-java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar 
../lib/struts2-core-2.0.8.jar -destjar struts2-core-j4-2.0.8.jar
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar 
../lib/struts2-core-2.0.9.jar -destjar struts2-core-j4-2.0.9.jar
 java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar 
../lib/xwork-2.0.4.jar -destjar xwork-j4-2.0.4.jar 

Modified: struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh?view=diff&rev=558690&r1=558689&r2=558690
==
--- struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh (original)
+++ struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh Mon Jul 23 
04:43:05 2007
@@ -1,3 +1,3 @@
 #!/bin/sh
-java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar 
../lib/struts2-core-2.0.8.jar -destjar struts2-core-j4-2.0.8.jar
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar 
../lib/struts2-core-2.0.9.jar -destjar struts2-core-j4-2.0.9.jar
 java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar 
../lib/xwork-2.0.4.jar -destjar xwork-j4-2.0.4.jar 

svn commit: r558747 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ apps/showcase/src/main/resources/org/apache/struts2/showcase/validati

[husted]

Author: husted
Date: Mon Jul 23 07:39:55 2007
New Revision: 558747

URL: http://svn.apache.org/viewvc?view=rev&rev=558747
Log:
WW-1974 Update POM for Struts 2.0.9. Small changes to Showcase prompts. See 
issue comment, items (5)-(7)
* The Ajax Hangman isn't "broken" anymore, but it does fail to report when a 
player wins. 
* At Validation/Field Validators 
<http://planetstruts.org/struts2-showcase/validation/showFieldValidatorsExamples.action>,
 the prompt for the date field is still misleading and encourages entry of the 
wrong style. 
* At Validation <http://localhost:8080/struts2-showcase/validation/index.jsp>, 
Validation (ajax) is no longer "broken". 

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml

struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml

struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl

struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/validation/index.jsp
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?view=diff&rev=558747&r1=558746&r2=558747
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Mon Jul 23 07:39:55 
2007
@@ -5,7 +5,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.9-SNAPSHOT
+2.0.9
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?view=diff&rev=558747&r1=558746&r2=558747
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Mon Jul 23 
07:39:55 2007
@@ -5,7 +5,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.9-SNAPSHOT
+  2.0.9
 
 org.apache.struts
 struts2-mailreader

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?view=diff&rev=558747&r1=558746&r2=558747
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Mon Jul 23 07:39:55 2007
@@ -25,7 +25,7 @@
 
 org.apache.struts
 struts2-parent
-2.0.9-SNAPSHOT
+2.0.9
 
 org.apache.struts
 struts2-apps

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?view=diff&rev=558747&r1=558746&r2=558747
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Mon Jul 23 
07:39:55 2007
@@ -5,7 +5,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.9-SNAPSHOT
+  2.0.9
 
 org.apache.struts
 struts2-portlet

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/str

svn commit: r558749 - /struts/struts2/tags/STRUTS_2_0_9/

[husted]

Author: husted
Date: Mon Jul 23 07:43:37 2007
New Revision: 558749

URL: http://svn.apache.org/viewvc?view=rev&rev=558749
Log:
WW-1974 Tag r558747 as Struts 2.0.9

Added:
struts/struts2/tags/STRUTS_2_0_9/
  - copied from r558747, struts/struts2/trunk/

svn commit: r558804 - /struts/struts2/tags/STRUTS_2_0_9/

[husted]

Author: husted
Date: Mon Jul 23 10:24:03 2007
New Revision: 558804

URL: http://svn.apache.org/viewvc?view=rev&rev=558804
Log:
WW-1975 Removing first try at 2.0.9. (Tagged trunk rather than branch!)

Removed:
struts/struts2/tags/STRUTS_2_0_9/

svn commit: r558805 - /struts/struts2/tags/STRUTS_2_0_9/

[husted]

Author: husted
Date: Mon Jul 23 10:24:17 2007
New Revision: 558805

URL: http://svn.apache.org/viewvc?view=rev&rev=558805
Log:
WW-1974 Tag r558747 as Struts 2.0.9

Added:
struts/struts2/tags/STRUTS_2_0_9/
  - copied from r558747, struts/struts2/branches/STRUTS_2_0_X/

svn commit: r558852 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ assembly/ core/ plugins/ plugins/codebehind/ plugins/config-browser/

[husted]

Author: husted
Date: Mon Jul 23 13:18:39 2007
New Revision: 558852

URL: http://svn.apache.org/viewvc?view=rev&rev=558852
Log:
WW-2054 Update POM for Struts 2.0.10-SNAPSHOT.

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?view=diff&rev=558852&r1=558851&r2=558852
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Mon Jul 23 13:18:39 
2007
@@ -5,7 +5,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.9
+2.0.10-SNAPSHOT
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?view=diff&rev=558852&r1=558851&r2=558852
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Mon Jul 23 
13:18:39 2007
@@ -5,7 +5,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.9
+  2.0.10-SNAPSHOT
 
 org.apache.struts
 struts2-mailreader

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?view=diff&rev=558852&r1=558851&r2=558852
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Mon Jul 23 13:18:39 2007
@@ -25,7 +25,7 @@
 
 org.apache.struts
 struts2-parent
-2.0.9
+2.0.10-SNAPSHOT
 
 org.apache.struts
 struts2-apps

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?view=diff&rev=558852&r1=558851&r2=558852
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Mon Jul 23 
13:18:39 2007
@@ -5,7 +5,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.9
+  2.0.10-SNAPSHOT
 
 org.apache.struts
 struts2-portlet

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml?view=diff&rev=558852&r1=558851&r2=558852
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml Mon Jul 23 
13:18:39 2007
@@ -5,7 +5,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.9
+2.0.10-SNAPSHOT
 
 org.apache.struts
 struts2-showcase

Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?view=diff&rev=558852&r1=558851&r2=558852
==
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Mon Jul 23 13:18:39 
200

svn commit: r559057 - in /struts/site/src/site/xdoc: download.xml downloads.xml index.xml

[husted]

Author: husted
Date: Tue Jul 24 07:15:56 2007
New Revision: 559057

URL: http://svn.apache.org/viewvc?view=rev&rev=559057
Log:
WW-1974 Update download links to include time the archives were submitted to 
mirroring (7:30 pm PST). I've tested several links and found 2.0.9 in each one 
tried, so I'll go ahead and post the changes now. 

Modified:
struts/site/src/site/xdoc/download.xml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/xdoc/download.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/download.xml?view=diff&rev=559057&r1=559056&r2=559057
==
--- struts/site/src/site/xdoc/download.xml (original)
+++ struts/site/src/site/xdoc/download.xml Tue Jul 24 07:15:56 2007
@@ -124,7 +124,7 @@
 
 
 
-
+
 Essential Dependencies Only:
 
 

Modified: struts/site/src/site/xdoc/downloads.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=559057&r1=559056&r2=559057
==
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Tue Jul 24 07:15:56 2007
@@ -43,8 +43,8 @@
 General Availability (GA) Releases - 
Ready for Prime Time!
 
 
-http://struts.apache.org/download.cgi#struts208";>
-Struts 2.0.8
+http://struts.apache.org/download.cgi#struts209?update=200707231930";>
+Struts 2.0.9
  ("best available")
 
 

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=559057&r1=559056&r2=559057
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Tue Jul 24 07:15:56 2007
@@ -26,7 +26,7 @@
 
 
 
-http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
+http://struts.apache.org/download.cgi#struts209?update=200707231930";>Apache
 Struts 2.0.9
 includes an important security fix regarding http://struts.apache.org/2.x/docs/s2-001.html";>a remote code 
exploit.
 ALL USERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 
IMMEDIATELY!
 
@@ -63,7 +63,7 @@
 
 
 
-http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
+http://struts.apache.org/download.cgi#struts209?update=200707231930";>Apache
 Struts 2.0.9
 includes an important security fix regarding OGNL expression 
handling.
 ALL USERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 AS SOON 
AS POSSIBLE!
 

svn commit: r559060 - /struts/site/src/site/site.xml

[husted]

Author: husted
Date: Tue Jul 24 07:30:45 2007
New Revision: 559060

URL: http://svn.apache.org/viewvc?view=rev&rev=559060
Log:
WW-1974 Update site menu to point to 2.0.9.

Modified:
struts/site/src/site/site.xml

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?view=diff&rev=559060&r1=559059&r2=559060
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Tue Jul 24 07:30:45 2007
@@ -17,7 +17,7 @@
 href="http://projects.apache.org"; />
 http://struts.apache.org/2.0.8/"; />
+href="http://struts.apache.org/2.0.9/"; />
 http://struts.apache.org/1.3.8/"; />
@@ -55,8 +55,8 @@
 name="Key Technologies"
 href="primer.html" />
 http://struts.apache.org/2.0.8/index.html"; />
+name="Struts 2.0.9"
+href="http://struts.apache.org/2.0.9/index.html"; />
 http://struts.apache.org/1.3.8/index.html"; />

svn commit: r559457 - in /struts/site/src/site/xdoc: announce.xml download.xml index.xml

[husted]

Author: husted
Date: Wed Jul 25 06:52:23 2007
New Revision: 559457

URL: http://svn.apache.org/viewvc?view=rev&rev=559457
Log:
WW-1974 Update file download sizes. Add link to release notes form announcement.

Modified:
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/download.xml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?view=diff&rev=559457&r1=559456&r2=559457
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Wed Jul 25 06:52:23 2007
@@ -34,7 +34,7 @@
 
 http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
 includes an important security fix regarding http://struts.apache.org/2.x/docs/s2-001.html";>a remote code 
exploit.
-ALL USERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 
IMMEDIATELY!
+ALL DEVELOPERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 
IMMEDIATELY!
 
 
 8 July 2007 - Struts Downloads Skyrocket in 
2007

Modified: struts/site/src/site/xdoc/download.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/download.xml?view=diff&rev=559457&r1=559456&r2=559457
==
--- struts/site/src/site/xdoc/download.xml (original)
+++ struts/site/src/site/xdoc/download.xml Wed Jul 25 06:52:23 2007
@@ -108,7 +108,7 @@
 Full Distribution:
 
 
-struts-2.0.9-all.zip
 (43mb)
+struts-2.0.9-all.zip
 (86mb)
 [http://www.apache.org/dist/struts/binaries/struts-2.0.9-all.zip.asc";>PGP]
 [http://www.apache.org/dist/struts/binaries/struts-2.0.9-all.zip.md5";>MD5]
 
@@ -124,7 +124,6 @@
 
 
 
-
 Essential Dependencies Only:
 
 
-struts-2.0.9-lib.zip 
(3mb)
+struts-2.0.9-lib.zip 
(4mb)
 [http://www.apache.org/dist/struts/library/struts-2.0.9-lib.zip.asc";>PGP]
 [http://www.apache.org/dist/struts/library/struts-2.0.9-lib.zip.md5";>MD5]
 
@@ -148,7 +146,7 @@
 Documentation:
 
 
-struts-2.0.9-docs.zip
 (11mb)
+struts-2.0.9-docs.zip
 (55mb)
 [http://www.apache.org/dist/struts/documentation/struts-2.0.9-docs.zip.asc";>PGP]
 [http://www.apache.org/dist/struts/documentation/struts-2.0.9-docs.zip.md5";>MD5]
 
@@ -158,7 +156,7 @@
 Source:
 
 
-struts-2.0.9-src.zip 
(18mb)
+struts-2.0.9-src.zip 
(20mb)
 [http://www.apache.org/dist/struts/source/struts-2.0.9-src.zip.asc";>PGP]
 [http://www.apache.org/dist/struts/source/struts-2.0.9-src.zip.md5";>MD5]
 
@@ -168,7 +166,7 @@
 Alternative Java 4 JARs:
 
 
-struts-2.0.9-j4.zip 
(2mb)
+struts-2.0.9-j4.zip 
(3mb)
 [http://www.apache.org/dist/struts/binaries/struts-2.0.9-j4.zip.asc";>PGP]
 [http://www.apache.org/dist/struts/binaries/struts-2.0.9-j4.zip.md5";>MD5]
 

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=559457&r1=559456&r2=559457
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Wed Jul 25 06:52:23 2007
@@ -26,9 +26,9 @@
 
 
 
-http://struts.apache.org/download.cgi#struts209?update=200707231930";>Apache
 Struts 2.0.9
+http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
 includes an important security fix regarding http://struts.apache.org/2.x/docs/s2-001.html";>a remote code 
exploit.
-  

svn commit: r559463 - in /struts: site/src/site/xdoc/announce.xml struts1/trunk/src/site/xdoc/userGuide/release-notes-1_2_7.xml

[husted]

Author: husted
Date: Wed Jul 25 07:06:51 2007
New Revision: 559463

URL: http://svn.apache.org/viewvc?view=rev&rev=559463
Log:
WW-1974 Add link to release notes form announcement. Correct link in archival 
copy of 1.2.7 release notes. 

Modified:
struts/site/src/site/xdoc/announce.xml
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_2_7.xml

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?view=diff&rev=559463&r1=559462&r2=559463
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Wed Jul 25 07:06:51 2007
@@ -37,6 +37,11 @@
 ALL DEVELOPERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 
IMMEDIATELY!
 
 
+
+For other changes included in Struts 2.0.9,
+see the http://struts.apache.org/2.0.9/docs/release-notes-209.html";>release 
notes.
+
+
 8 July 2007 - Struts Downloads Skyrocket in 
2007
 
 

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_2_7.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_2_7.xml?view=diff&rev=559463&r1=559462&r2=559463
==
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_2_7.xml 
(original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_2_7.xml Wed 
Jul 25 07:06:51 2007
@@ -8,9 +8,9 @@
 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.
@@ -314,7 +314,7 @@
 Martin Cooper
 being
 appointed the
-new PMC chair
+new PMC chair
 , one new committer,
 Hubert Rabago
 , accepted an invitation to join us, and we welcome back

svn commit: r569942 - in /struts/site/src/site: fml/kickstart.fml site.xml xdoc/index.xml xdoc/security.xml

[husted]

Author: husted
Date: Sun Aug 26 18:06:29 2007
New Revision: 569942

URL: http://svn.apache.org/viewvc?rev=569942&view=rev
Log:
Add security page and ApacheCon plugs. 

Added:
struts/site/src/site/xdoc/security.xml
Modified:
struts/site/src/site/fml/kickstart.fml
struts/site/src/site/site.xml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/kickstart.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?rev=569942&r1=569941&r2=569942&view=diff
==
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Sun Aug 26 18:06:29 2007
@@ -289,7 +289,7 @@
   If you believe you've found a security vulnerability in 
Apache Struts, please contact our 
   security address - any emails not relating to security 
vulnerabilities will be ignored without
   a reply (all security related information will be kept 
confidential unless otherwise indicated): 
-  [security (at) apache (dot) org].
+  [security (at) struts (dot) apache (dot) org].
 
 
 

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=569942&r1=569941&r2=569942&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sun Aug 26 18:06:29 2007
@@ -77,6 +77,10 @@
 name="Issue Tracker (JIRA)"
 href="http://issues.apache.org/struts/";
 />
+
 
 
 

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=569942&r1=569941&r2=569942&view=diff
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Sun Aug 26 18:06:29 2007
@@ -32,14 +32,43 @@
 
  
 
+ 
+ http://apachecon.com/";>http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"; alt="ApacheCon 
US 2007" hspace="16" align="right"/>
+
+  Three Struts presentations are scheduled for
+  http://www.us.apachecon.com/";>ApacheCon US 2007,
+  which is being held in Atlanta GA, November 12-16.
+    
+
+
+  http://us.apachecon.com/us2007/program/talk/1883";>Migrating to Ajax 
(Ted Husted), 12 Nov @10a (five-hour training course)
+  http://us.apachecon.com/us2007/program/talk/1880";>Using Groovy with 
Struts 2 (Mark Menard), 13 Nov @10a (five-hour training course)
+  http://us.apachecon.com/us2007/program/talk/2058";>Go Light with Apache 
Struts 2 and REST (Don Brown), 15 Nov @5:30p (one-hour presentation)
+
+
+
+  Also of interest (among many others!):
+
+
+
+  http://us.apachecon.com/us2007/program/talk/2023";>Apache Roller and Blogs 
as a Web Development Platform (Dave Johnson), 14 Nov @10:30a (one hour 
presentation)
+  http://us.apachecon.com/us2007/program/talk/1903";>Apache Harmony - 
Building Java SE in Open source (Geir Magnusson Jr.), 14 Nov @4:30p (one 
hour presentation)
+  http://us.apachecon.com/us2007/program/talk/1994";>Comparing Java Web 
Frameworks (Matt Raible), 15 Nov @9a (one hour presentation)
+
+
+
+  Hope to see you there!
+
+
+ 
+
 
 
-http://apachecon.com/";>http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"; alt="ApacheCon 
US 2007" hspace="16" align="right"/>
   
   What do people who use Apache Struts have to say about using it?
   Browse the
-http://www.nabble.com/Struts---User-f206.html";>
-  user mailing list,
+http://www.nabble.com/Struts---User-f206.html";>
+  user mailing list,
   and see for yourself.
   
   

Added: struts/site/src/site/xdoc/security.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/security.xml?rev=569942&view=auto
==
--- struts/site/src/site/xdoc/security.xml (added)
+++ struts/site/src/site/xdoc/security.xml Sun Aug 26 18:06:29 2007
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+Security Issues
+
+
+
+
+
+
+
+  The Apache Struts project takes a very active st

svn commit: r573043 - in /struts/site/src/site: resources/planetstruts.txt site.xml xdoc/announce.xml xdoc/dev/bylaws.xml xdoc/dev/releases.xml xdoc/dev/site.xml xdoc/dev/volunteers.xml xdoc/index.xml

[husted]

Author: husted
Date: Wed Sep  5 13:09:30 2007
New Revision: 573043

URL: http://svn.apache.org/viewvc?rev=573043&view=rev
Log:
Update site to clarify status of OGNL security issue. Add link to the new 
"Planet Struts" feed that aggregates committer blogs, along with 
planetstruts.txt source file. 

Added:
struts/site/src/site/resources/planetstruts.txt
Modified:
struts/site/src/site/site.xml
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/dev/bylaws.xml
struts/site/src/site/xdoc/dev/releases.xml
struts/site/src/site/xdoc/dev/site.xml
struts/site/src/site/xdoc/dev/volunteers.xml
struts/site/src/site/xdoc/index.xml

Added: struts/site/src/site/resources/planetstruts.txt
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/resources/planetstruts.txt?rev=573043&view=auto
==
--- struts/site/src/site/resources/planetstruts.txt (added)
+++ struts/site/src/site/resources/planetstruts.txt Wed Sep  5 13:09:30 2007
@@ -0,0 +1,30 @@
+[http://themindstorms.blogspot.com/rss.xml]
+name = Alex Popescu
+[http://weblogs.java.net/blog/crazybob/index.rdf]
+name = Bob Lee
+[http://blogs.sun.com/craigmcc/feed/entries/rss]
+name = Craig McClanahan
+[http://www.jroller.com/dgeary/feed/entries/rss]
+name = David Geary
+[http://www.jroller.com/mrdon/feed/entries/rss]
+name = Don Brown
+[http://www.fdar.com/weblog/index.xml]
+name = Ian Roughley (blog)
+[http://www.jroller.com/greddin/feed/entries/rss]
+name = Gred Reddin
+[http://blog.generationjava.com/feed]
+name = Henri Yandell
+[http://www.fdar.com/news/index.xml]
+name = Ian Roughley (news)
+[http://www.jroller.com/jmitchell/feed/entries/rss]
+name = James Mitchell
+[http://www.jroller.com/jcarreira/feed/entries/rss]
+name = Jason Carreira
+[http://blog.germuska.com/feed/]
+name = Joe Germusk
+[http://feeds.feedburner.com/Blogbody]
+name = Patrick Lightbody
+[http://www.jroller.com/TedHusted/feed/entries/rss]
+name = Ted Husted
+[http://blog.wsmoak.net/atom.php?blogid=1]
+name = Wendy Smoak

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=573043&r1=573042&r2=573043&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Wed Sep  5 13:09:30 2007
@@ -109,14 +109,14 @@
 href="dev\releases.html"
 />
 
-
 
+http://struts.apache.org/struts-sandbox/index.html";
 />
@@ -194,8 +194,14 @@
 name="Apache Bookstore"
 href="http://www.ApacheBookstore.com/";
 />
+
+http://people.apache.org/~rubys/planet/struts/";
+/>
+
 http://www.PlanetStruts.org/";
 />
 

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=573043&r1=573042&r2=573043&view=diff
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Wed Sep  5 13:09:30 2007
@@ -56,7 +56,10 @@
 
 http://struts.apache.org/download.cgi#struts209";>Apache Struts 2.0.9
 includes an important security fix regarding http://struts.apache.org/2.x/docs/s2-001.html";>a remote code 
exploit.
-ALL DEVELOPERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 2.0.9 
IMMEDIATELY!
+ALL STRUTS 2 DEVELOPERS ARE STRONGLY ADVISED TO UPDATE TO STRUTS 
2.0.9 IMMEDIATELY!
+
+
+PLEASE NOTE that this bulletin DOES NOT apply to Struts 
1.x!
 
 
 

Modified: struts/site/src/site/xdoc/dev/bylaws.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/bylaws.xml?rev=573043&r1=573042&r2=573043&view=diff
==
--- struts/site/src/site/xdoc/dev/bylaws.xml (original)
+++ struts/site/src/site/xdoc/dev/bylaws.xml Wed Sep  5 13:09:30 2007
@@ -430,6 +430,11 @@
 
 
 
+
+Next:
+Volunteers
+
+
 
 
 

Modified: struts/site/src/site/xdoc/dev/releases.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/releases.xml?rev=573043&r1=573042&r2=573043&view=diff
==
--- struts/site/src/site/xdoc/dev/releases.xml (original)
+++ struts/site/src/site/xdoc/dev/releases.xml Wed Sep  5 13:09:30 2007
@@ -26,7 +26,7 @@
 
 
 This document describes the

svn commit: r574410 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ plugins/ja

[husted]

Author: husted
Date: Mon Sep 10 16:55:54 2007
New Revision: 574410

URL: http://svn.apache.org/viewvc?rev=574410&view=rev
Log:
[maven-release-plugin] prepare release struts2-parent-2.0.10

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?rev=574410&r1=574409&r2=574410&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Mon Sep 10 16:55:54 
2007
@@ -1,11 +1,10 @@
 
-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";>
+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-apps
-2.0.10-SNAPSHOT
+2.0.10
 
 org.apache.struts
 struts2-blank
@@ -13,9 +12,9 @@
 Blank Webapp
 
 
-   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/
-   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/
-   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.0.10
 
 
 

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?rev=574410&r1=574409&r2=574410&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Mon Sep 10 
16:55:54 2007
@@ -1,11 +1,10 @@
 
-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";>
+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-apps
-  2.0.10-SNAPSHOT
+  2.0.10
 
 org.apache.struts
 struts2-mailreader
@@ -13,9 +12,9 @@
 Starter Webapp
 
 
-   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/
-   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/
-   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.0.10
 
 
 

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?rev=574410&r1=574409&r2=574410&view=diff
==

svn commit: r574411 - in /struts/struts2/tags/struts2-parent-2.0.10: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ plugi

[husted]

Author: husted
Date: Mon Sep 10 16:56:07 2007
New Revision: 574411

URL: http://svn.apache.org/viewvc?rev=574411&view=rev
Log:
[maven-scm] copy for tag struts2-parent-2.0.10

Added:
struts/struts2/tags/struts2-parent-2.0.10/
  - copied from r574404, struts/struts2/branches/STRUTS_2_0_X/
struts/struts2/tags/struts2-parent-2.0.10/apps/blank/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/apps/mailreader/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/apps/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/apps/portlet/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/apps/showcase/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/core/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/codebehind/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/config-browser/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/jasperreports/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/jfreechart/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/jsf/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/pell-multipart/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/plexus/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/sitegraph/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/sitemesh/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/spring/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/struts1/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/plugins/tiles/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/tags/struts2-parent-2.0.10/pom.xml
  - copied unchanged from r574410, 
struts/struts2/branches/STRUTS_2_0_X/pom.xml

svn commit: r574412 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ plugins/ja

[husted]

Author: husted
Date: Mon Sep 10 16:56:19 2007
New Revision: 574412

URL: http://svn.apache.org/viewvc?rev=574412&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?rev=574412&r1=574411&r2=574412&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Mon Sep 10 16:56:19 
2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.10
+2.0.11-SNAPSHOT
 
 org.apache.struts
 struts2-blank
@@ -12,9 +12,9 @@
 Blank Webapp
 
 
-   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
-   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
-   
http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.0.10
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/
 
 
 

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?rev=574412&r1=574411&r2=574412&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Mon Sep 10 
16:56:19 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.10
+  2.0.11-SNAPSHOT
 
 org.apache.struts
 struts2-mailreader
@@ -12,9 +12,9 @@
 Starter Webapp
 
 
-   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
-   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
-   
http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.0.10
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/
+   
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/
 
 
 

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?rev=574412&r1=574411&r2=574412&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Mon Sep 10 16:56:19 2007
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.0.10
+2.0.11-SNAPSHOT
 
 org.apache.struts
 struts2-apps
@@ -17,9 +17,9 @@
 
 
 
-   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
-   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.0.10
-   
http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.0.10
+   
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/
+   
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/
+   http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/
 
 
  

Modified: struts/st

svn commit: r575121 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ plugins/ja

[husted]

Author: husted
Date: Wed Sep 12 16:34:52 2007
New Revision: 575121

URL: http://svn.apache.org/viewvc?rev=575121&view=rev
Log:
ww-2054 Update POMs for second 2.0.10 run. Fix portlet artifact name. 

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?rev=575121&r1=575120&r2=575121&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Wed Sep 12 16:34:52 
2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.11-SNAPSHOT
+2.0.10
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?rev=575121&r1=575120&r2=575121&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Wed Sep 12 
16:34:52 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.11-SNAPSHOT
+  2.0.10
 
 org.apache.struts
 struts2-mailreader

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?rev=575121&r1=575120&r2=575121&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Wed Sep 12 16:34:52 2007
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.0.11-SNAPSHOT
+2.0.10
 
 org.apache.struts
 struts2-apps

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?rev=575121&r1=575120&r2=575121&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Wed Sep 12 
16:34:52 2007
@@ -4,10 +4,10 @@
 
   org.apache.struts
   struts2-apps
-  2.0.11-SNAPSHOT
+  2.0.10
 
 org.apache.struts
-struts2-portlet-branch
+struts2-portlet
 war
 Portlet Webapp
 
@@ -61,20 +61,20 @@
 commons-lang
 2.1
 
-   
-   commons-fileupload
-   commons-fileupload
-   1.1.1
-   
-   
-   commons-collections
-   commons-collections
-   3.1
-   
-   
-   log4j
-   log4j
-   1.2.12
-   
+
+  commons-fileupload
+  commons-fileupload
+  1.1.1
+
+
+  commons-collections
+  commons-collections
+  3.1
+
+
+  log4j
+  log4j
+  1.2.12
+
 
 

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml?rev=575121&r1=575120&r2=575121&view=diff
==
--- struts/struts2/branches/

svn commit: r575122 - /struts/struts2/tags/STRUTS_2_0_10/

[husted]

Author: husted
Date: Wed Sep 12 16:36:53 2007
New Revision: 575122

URL: http://svn.apache.org/viewvc?rev=575122&view=rev
Log:
WW-2054 Tag r575121 as Struts 2.0.10 (again)

Added:
struts/struts2/tags/STRUTS_2_0_10/
  - copied from r575121, struts/struts2/trunk/

svn commit: r575137 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/mailreader/src/main/java/ apps/mailreader/src/main/webapp/ apps/portlet/ apps/showcase/ assem

[husted]

Author: husted
Date: Wed Sep 12 18:41:55 2007
New Revision: 575137

URL: http://svn.apache.org/viewvc?rev=575137&view=rev
Log:
ww-2054 Update POMs for Struts 2.0.11-SNAPSHOT. 

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml

struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/struts.xml

struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Login.jsp

struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/MainMenu.jsp

struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Registration.jsp

struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Subscription.jsp

struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/tour.html
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/backport/translate.bat
struts/struts2/branches/STRUTS_2_0_X/backport/translate.sh
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?rev=575137&r1=575136&r2=575137&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Wed Sep 12 18:41:55 
2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.10
+2.0.11-SNAPSHOT
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?rev=575137&r1=575136&r2=575137&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Wed Sep 12 
18:41:55 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.10
+  2.0.11-SNAPSHOT
 
 org.apache.struts
 struts2-mailreader

Modified: 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/struts.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/struts.xml?rev=575137&r1=575136&r2=575137&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/struts.xml 
(original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/struts.xml 
Wed Sep 12 18:41:55 2007
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 

Modified: 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Login.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Login.jsp?rev=575137&r1=575136&r2=575137&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Login.jsp 
(original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/Login.jsp 
Wed Sep 12 18:41:55 2007
@@ -9,13 +9,16 @@
   type="text/css"/>
 
 
-
+
 
 
+
 
 
 
 
+
+
 
 
 

Modified: 
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/MainMenu.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/MainMenu.jsp?rev=575137&r1=575136&r2=575137&view=diff
==
--- 
struts/struts2/

svn commit: r578325 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ assembly/ core/ plugins/ plugins/codebehind/ plugins/config-browser/

[husted]

Author: husted
Date: Fri Sep 21 16:58:16 2007
New Revision: 578325

URL: http://svn.apache.org/viewvc?rev=578325&view=rev
Log:
WW-2054 Update poms for 2.0.11 tag. 

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?rev=578325&r1=578324&r2=578325&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Fri Sep 21 16:58:16 
2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.11-SNAPSHOT
+2.0.11
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?rev=578325&r1=578324&r2=578325&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Fri Sep 21 
16:58:16 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.11-SNAPSHOT
+  2.0.11
 
 org.apache.struts
 struts2-mailreader

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?rev=578325&r1=578324&r2=578325&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Fri Sep 21 16:58:16 2007
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.0.11-SNAPSHOT
+2.0.11
 
 org.apache.struts
 struts2-apps

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?rev=578325&r1=578324&r2=578325&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Fri Sep 21 
16:58:16 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.11-SNAPSHOT
+  2.0.11
 
 org.apache.struts
 struts2-portlet

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml?rev=578325&r1=578324&r2=578325&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml Fri Sep 21 
16:58:16 2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.11-SNAPSHOT
+2.0.11
 
 org.apache.struts
 struts2-showcase

Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?rev=578325&r1=578324&r2=578325&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Fri Sep 21 16:58:16 
200

svn commit: r578329 - /struts/struts2/tags/STRUTS_2_0_11/

[husted]

Author: husted
Date: Fri Sep 21 17:01:43 2007
New Revision: 578329

URL: http://svn.apache.org/viewvc?rev=578329&view=rev
Log:
WW-2054 Tag r578325 as Struts 2.0.11

Added:
struts/struts2/tags/STRUTS_2_0_11/
  - copied from r578325, struts/struts2/branches/STRUTS_2_0_X/

svn commit: r578352 - in /struts/struts2/branches/STRUTS_2_0_X: ./ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ assembly/ core/ plugins/ plugins/codebehind/ plugins/config-browser/

[husted]

Author: husted
Date: Fri Sep 21 18:49:24 2007
New Revision: 578352

URL: http://svn.apache.org/viewvc?rev=578352&view=rev
Log:
WW-2054 Update poms for 2.0.12-SNAPSHOT. 

Modified:
struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
struts/struts2/branches/STRUTS_2_0_X/core/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/codebehind/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/config-browser/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jasperreports/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jfreechart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/jsf/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pell-multipart/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/plexus/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitegraph/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/sitemesh/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/spring/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/struts1/pom.xml
struts/struts2/branches/STRUTS_2_0_X/plugins/tiles/pom.xml
struts/struts2/branches/STRUTS_2_0_X/pom.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml?rev=578352&r1=578351&r2=578352&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/blank/pom.xml Fri Sep 21 18:49:24 
2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.11
+2.0.12-SNAPSHOT
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?rev=578352&r1=578351&r2=578352&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Fri Sep 21 
18:49:24 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.11
+  2.0.12-SNAPSHOT
 
 org.apache.struts
 struts2-mailreader

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml?rev=578352&r1=578351&r2=578352&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/pom.xml Fri Sep 21 18:49:24 2007
@@ -3,7 +3,7 @@
 
 org.apache.struts
 struts2-parent
-2.0.11
+2.0.12-SNAPSHOT
 
 org.apache.struts
 struts2-apps

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml?rev=578352&r1=578351&r2=578352&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/portlet/pom.xml Fri Sep 21 
18:49:24 2007
@@ -4,7 +4,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0.11
+  2.0.12-SNAPSHOT
 
 org.apache.struts
 struts2-portlet

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml?rev=578352&r1=578351&r2=578352&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/pom.xml Fri Sep 21 
18:49:24 2007
@@ -4,7 +4,7 @@
 
 org.apache.struts
 struts2-apps
-2.0.11
+2.0.12-SNAPSHOT
 
 org.apache.struts
 struts2-showcase

Modified: struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml?rev=578352&r1=578351&r2=578352&view=diff
==
--- struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/assembly/pom.xml Fri Sep 21 18:49:24 
200

svn commit: r585986 - in /struts: current/STATUS.txt site/src/site/xdoc/announce-2006.xml site/src/site/xdoc/announce.xml site/src/site/xdoc/dev/volunteers.xml site/src/site/xdoc/index.xml struts2/tru

[husted]

Author: husted
Date: Thu Oct 18 07:47:36 2007
New Revision: 585986

URL: http://svn.apache.org/viewvc?rev=585986&view=rev
Log:
Update status.txt with 2007 board reports and project votes; update 
announcements and ApacheCon programs.

Modified:
struts/current/STATUS.txt
struts/site/src/site/xdoc/announce-2006.xml
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/dev/volunteers.xml
struts/site/src/site/xdoc/index.xml
struts/struts2/trunk/src/site/xdoc/index.xml

Modified: struts/current/STATUS.txt
URL: 
http://svn.apache.org/viewvc/struts/current/STATUS.txt?rev=585986&r1=585985&r2=585986&view=diff
==
--- struts/current/STATUS.txt (original)
+++ struts/current/STATUS.txt Thu Oct 18 07:47:36 2007
@@ -31,30 +31,32 @@
 * Rainer Hermanns (hermanns at apache.org)
 * Toby Jee (tmjee at apache.org)
 * Ian Roughley (roughley at apache.org) 
+* Paul Benedict  (pbenedict at apache.org)
+* Henri Yandell (bayard at apache.org)
+* Antonio Petrelli (apetrelli at apache.org) 
+* Musachy Barroso (musachy at apache.org)
 
 Other Active Committers
 
-* Eddie Bush  (ekbush at apache.org)
-* James Turner (turner at blackbear.com)
-* David Geary (dgeary at apache.org)
-* Laurie Harper (laurieh at apache.org)
-* Richard Feit  (rich at apache.org)
-* Jason Carreira (jcarreira at apache.org)
-* Patrick Lightbody (plightbo at apache.org)
-* Alexandru Popescu (apopescu at apache.org)
-* Rene Gielen (rgielen at apache.org)
-* Rainer Hermanns (hermanns at apache.org)
-* Toby Jee (tmjee at apache.org)
-* Ian Roughley (roughley at apache.org)
+* Michael Jouravlev  (mikus at apache.org)
+* Bob Lee (crazybob at apache.org)
+* Nils-Helge Garli (nilsga at apache.org)
+* David H. DeWolf (ddewolf at apache.org)
+* Philip Luppens (phil at apache.org)
+* Tom Schneider (tschneider at apache.org) 
 
 Emeritus PMC Members
 
 * David M. Karr (dmkarr at apache.org)
 * David Graham (dgraham at apache.org)
 * Steve Raeburn (sraeburn at apache.org)
+* Eddie Bush  (ekbush at apache.org)
 
 Emeritus Committers 
 
+* Richard Feit  (rich at apache.org)
+* David Geary (dgeary at apache.org)
+* James Turner (turner at blackbear.com)
 * Luis Arias
 * Pierre Delilse
 * Michael Schachter
@@ -68,6 +70,184 @@
 
 
 
+2007 Board Reports
+
+October 2007 -- Planet Struts
+
+There has been a lot of activity over the last quarter, especially on
+Struts 2. We released Struts 2.0.9 as GA, which includes an important
+security fix, and released Struts 1.3.9 as Beta. Our registry of Struts 2
+plugins continues to grow, with 30 distinct plugins now registered, many
+written by developers outside the project. The number of authors
+contributing to our official documentation wiki also continues to grow.
+
+On the infrastructure side, the Struts security alias, mentioned in last
+quarter's report, has now been set up, and Planet Struts was the first "PMC
+Planet" to be created, thanks to Sam Ruby and Ted Husted. Prompted by
+infrastructure@, we handed back 1.6GB of disk space on people.a.o that we
+didn't actually need.
+
+At ApacheCon US 2007 in Atlanta next month, two tutorials and one session
+will focus on Struts 2, and we expect at least six Struts committers to be
+in attendance. A session on Struts 2 will also be presented at OS Summit
+Asia 2007.
+
+During this quarter, we have added three new committers (Matt Raible, Dave
+Newton, and Brian Pontarelli) and two new PMC members (Henri Yandell and
+Antonio Petrelli).
+
+
+July 2007 -- [EMAIL PROTECTED]
+
+Things have been running smoothly this last quarter, with little of
+note for the board at this time.
+
+We have had one GA release, of Struts 2.0.8, and a test build of
+Struts 1.3.9 is up for a quality vote at this time. Both Struts
+2.1 and Struts 1.4 are under active development.
+
+Prompted by a user trying to report a security vulnerability in
+Struts, we have requested a [EMAIL PROTECTED] alias, which we hope will
+be set up shortly. (We believe the reported vulnerability had already
+been resolved.)
+
+No new committers or PMC members have been added in the last quarter.
+
+
+March 2007 -- Bamboo online
+
+This quarter, we made up for the absence of releases in the previous
+quarter, with GA releases of both Struts 1.3.8 and Struts 2.0.6. The
+latter is particularly notable, since it is the first GA release of the
+Struts 2 framework, thus marking an important milestone for the project.
+With a GA release in the wild, we hope to see increased adoption of this
+new framework, with a corresponding growth in the community.
+
+Since the Apache Tiles top-level project was established by the board in
+December, our Tiles colleagues have completed their move out of Struts and
+into their own environment. Of course, there 

svn commit: r589447 - in /struts: current/ site/src/site/ site/src/site/xdoc/ site/src/site/xdoc/dev/ struts2/trunk/src/site/ struts2/trunk/src/site/xdoc/

[husted]

Author: husted
Date: Sun Oct 28 17:40:29 2007
New Revision: 589447

URL: http://svn.apache.org/viewvc?rev=589447&view=rev
Log:
WW-1715 Update site for 2.0.11 and prepare for 2.1.0. 

Modified:
struts/current/STATUS.txt
struts/site/src/site/site.xml
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/dev/volunteers.xml
struts/site/src/site/xdoc/download.xml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/index.xml
struts/struts2/trunk/src/site/site.xml
struts/struts2/trunk/src/site/xdoc/index.xml

Modified: struts/current/STATUS.txt
URL: 
http://svn.apache.org/viewvc/struts/current/STATUS.txt?rev=589447&r1=589446&r2=589447&view=diff
==
--- struts/current/STATUS.txt (original)
+++ struts/current/STATUS.txt Sun Oct 28 17:40:29 2007
@@ -32,7 +32,6 @@
 * Toby Jee (tmjee at apache.org)
 * Ian Roughley (roughley at apache.org) 
 * Paul Benedict  (pbenedict at apache.org)
-* Henri Yandell (bayard at apache.org)
 * Antonio Petrelli (apetrelli at apache.org) 
 * Musachy Barroso (musachy at apache.org)
 
@@ -51,6 +50,7 @@
 * David Graham (dgraham at apache.org)
 * Steve Raeburn (sraeburn at apache.org)
 * Eddie Bush  (ekbush at apache.org)
+* Henri Yandell (bayard at apache.org)
 
 Emeritus Committers 
 

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=589447&r1=589446&r2=589447&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sun Oct 28 17:40:29 2007
@@ -16,8 +16,11 @@
 name="Apache"
 href="http://projects.apache.org"; />
 http://struts.apache.org/2.0.9/"; />
+name="Struts 2.1.x"
+href="http://struts.apache.org/2.1.0/"; />
+http://struts.apache.org/2.0.11/"; />
 http://struts.apache.org/1.3.8/"; />
@@ -55,8 +58,11 @@
 name="Key Technologies"
 href="primer.html" />
 http://struts.apache.org/2.0.9/index.html"; />
+name="Struts 2.1.0"
+href="http://struts.apache.org/2.1.0/index.html"; />
+http://struts.apache.org/2.0.11/index.html"; />
 http://struts.apache.org/1.3.9/index.html"; />

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=589447&r1=589446&r2=589447&view=diff
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Sun Oct 28 17:40:29 2007
@@ -29,6 +29,42 @@
 Skip to: Announcements - 2006
 
 
+23 October 2007 - Struts 2.0.11 General 
Availability Release
+
+The Apache Struts group is pleased to announce that Struts 2.0.11 
is
+available as a "General Availability" release. The GA designation 
is
+our highest quality grade.
+
+
+Apache Struts 2 is an elegant, extensible framework for creating
+enterprise-ready Java web applications. The framework is designed 
to
+streamline the full development cycle, from building, to 
deploying, to
+maintaining applications over time.
+
+
+This release includes a number of fixes and improvements since the
+2.0.9 GA release. Struts 2.0.11 is available in a full 
distribution,
+or as separate library, source, example and documentation
+distributions, from the
+http://struts.apache.org/download.cgi#struts2011";>releases page.
+The release is also available through the central Maven repository 
under Group ID
+"org.apache.struts". The
+http://struts.apache.org/2.0.11/docs/release-notes-2011.html";>release 
notes
+are available online.
+
+
+The 2.0.x series of the Apache Struts framework has a minimum
+requirement of the following specification versions: Servlet API 
2.4,
+JSP API 2.0, Java 5, Backported Java 4 JARs are also available.
+
+
+Should any issues arise with your use of any version of the Struts
+framework, please post your comments to the user list, and, if
+appropriate, file a
+https://issues.apache.org/struts/secure/Dashboard.jspa";>tracking 
ticket.

svn commit: r589454 - in /struts/struts2/trunk: ./ api/ apps/ apps/blank/ apps/mailreader/ apps/portlet/ apps/showcase/ assembly/ backport/ core/ plugins/ plugins/codebehind/ plugins/config-browser/ p

[husted]

Author: husted
Date: Sun Oct 28 18:09:07 2007
New Revision: 589454

URL: http://svn.apache.org/viewvc?rev=589454&view=rev
Log:
WW-1715 Update POMs and backport for 2.1.0. 


Added:
struts/struts2/trunk/backport/retrotranslator-runtime-1.2.3.jar
  - copied, changed from r589447, 
struts/struts2/trunk/backport/retrotranslator-runtime-1.2.0.jar
struts/struts2/trunk/backport/retrotranslator-transformer-1.2.3.jar
  - copied, changed from r589447, 
struts/struts2/trunk/backport/retrotranslator-transformer-1.2.0.jar
Removed:
struts/struts2/trunk/backport/retrotranslator-runtime-1.2.0.jar
struts/struts2/trunk/backport/retrotranslator-transformer-1.2.0.jar
Modified:
struts/struts2/trunk/api/pom.xml
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/config-browser/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/jasperreports/pom.xml
struts/struts2/trunk/plugins/jfreechart/pom.xml
struts/struts2/trunk/plugins/jsf/pom.xml
struts/struts2/trunk/plugins/pell-multipart/pom.xml
struts/struts2/trunk/plugins/plexus/pom.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml
struts/struts2/trunk/plugins/tiles/pom.xml
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/api/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=589454&r1=589453&r2=589454&view=diff
==
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Sun Oct 28 18:09:07 2007
@@ -27,7 +27,7 @@
 
 org.apache.struts
 struts2-parent
-2.1.0-SNAPSHOT
+2.1.0
 
 org.apache.struts
 struts2-api

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=589454&r1=589453&r2=589454&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Sun Oct 28 18:09:07 2007
@@ -27,7 +27,7 @@
 
 org.apache.struts
 struts2-apps
-2.1.0-SNAPSHOT
+2.1.0
 
 org.apache.struts
 struts2-blank

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=589454&r1=589453&r2=589454&view=diff
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Sun Oct 28 18:09:07 2007
@@ -27,7 +27,7 @@
 
   org.apache.struts
   struts2-apps
-  2.1.0-SNAPSHOT
+  2.1.0
 
 org.apache.struts
 struts2-mailreader

Modified: struts/struts2/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=589454&r1=589453&r2=589454&view=diff
==
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Sun Oct 28 18:09:07 2007
@@ -28,7 +28,7 @@
 
 org.apache.struts
 struts2-parent
-2.1.0-SNAPSHOT
+2.1.0
 
 org.apache.struts
 struts2-apps

Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=589454&r1=589453&r2=589454&view=diff
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Sun Oct 28 18:09:07 2007
@@ -27,7 +27,7 @@
 
   org.apache.struts
   struts2-apps
-  2.1.0-SNAPSHOT
+  2.1.0
 
 org.apache.struts
 struts2-portlet
@@ -39,38 +39,38 @@

scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/

http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/
 
-   
-   
-   
-   pluto
-   
-   
- 
- 
-   maven-war-plugin
-   
-

svn commit: r589458 - /struts/struts2/tags/STRUTS_2_1_0/

[husted]

Author: husted
Date: Sun Oct 28 18:12:30 2007
New Revision: 589458

URL: http://svn.apache.org/viewvc?rev=589458&view=rev
Log:
WW-1715 Tag r589454 as Struts 2.1.0

Added:
struts/struts2/tags/STRUTS_2_1_0/
  - copied from r589454, struts/struts2/trunk/

svn commit: r590528 - in /struts/struts2/trunk: apps/ apps/blank/ apps/portlet/ apps/showcase/ assembly/ core/ core/src/main/java/org/apache/struts2/views/velocity/ plugins/codebehind/ plugins/dojo/ p

[husted]

Author: husted
Date: Tue Oct 30 18:24:43 2007
New Revision: 590528

URL: http://svn.apache.org/viewvc?rev=590528&view=rev
Log:
WW-1789, WW-2279 Update velocity to 1.5, velocity-tools to 1.3, and Spring to 
2.0.7. Apply one-line change to VelocityManager suggested by Rod Vagg. 

Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/core/pom.xml

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=590528&r1=590527&r2=590528&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Tue Oct 30 18:24:43 2007
@@ -59,7 +59,7 @@
 
 org.springframework
 spring-core
-2.0.1
+2.0.7
 test
 
 

Modified: struts/struts2/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=590528&r1=590527&r2=590528&view=diff
==
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Tue Oct 30 18:24:43 2007
@@ -192,7 +192,7 @@
 
 org.springframework
 spring-mock
-2.0.1
+2.0.7
 test
 
 

Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=590528&r1=590527&r2=590528&view=diff
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Tue Oct 30 18:24:43 2007
@@ -96,13 +96,13 @@
 
 velocity
 velocity
-1.4
+1.5
 
 
 
 velocity-tools
 velocity-tools
-1.1
+1.3
 
 
 commons-digester

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=590528&r1=590527&r2=590528&view=diff
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Oct 30 18:24:43 2007
@@ -120,13 +120,13 @@
 
 velocity
 velocity
-1.4
+1.5
 
 
 
 velocity-tools
 velocity-tools
-1.1
+1.3
 
 
 

Modified: struts/struts2/trunk/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=590528&r1=590527&r2=590528&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Tue Oct 30 18:24:43 2007
@@ -258,14 +258,14 @@
 
 velocity
 velocity
-1.4
+1.5
 provided
 
 
 
 velocity-tools
 velocity-tools
-1.1
+1.3
 provided
 
 
@@ -391,35 +391,35 @@
 
 org.springframework
 spring-beans
-1.2.8
+2.0.7
 provided
 
 
 
 org.springframework
 spring-core
-1.2.8
+2.0.7
 provided
 
 
 
 org.springframework
 spring-context
-1.2.8
+2.0.7
 provided
 
 
 
 org.springframework
 spring-web
-1.2.8
+2.0.7
 provided
 
 
 
 org.springframework
 spring-mock
-1.2.8
+2.0.7
 provided
 
 

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=590528&r1=590527&r2=590528&view=diff
==
--- struts/struts2/trunk/core/pom.x

svn commit: r590970 [1/2] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: struts_dojo.js struts_dojo.js.uncompressed.js

[husted]

Author: husted
Date: Thu Nov  1 04:57:58 2007
New Revision: 590970

URL: http://svn.apache.org/viewvc?rev=590970&view=rev
Log:
WW-2094 Error DateTimePicker when erase input then click again the calendar - 
Apply fix submitted by Benjamin McCann for to issue originally reported by 
Leneveut Michaël.

Modified:

struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js

struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js

Modified: 
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js?rev=590970&r1=590969&r2=590970&view=diff
==
--- 
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
 (original)
+++ 
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
 Thu Nov  1 04:57:58 2007
@@ -1,20 +1,20 @@
 /*
-   Copyright (c) 2004-2006, The Dojo Foundation
-   All Rights Reserved.
+  Copyright (c) 2004-2006, The Dojo Foundation
+  All Rights Reserved.
 
-   Licensed under the Academic Free License version 2.1 or above OR the
-   modified BSD license. For more information on Dojo licensing, see:
+  Licensed under the Academic Free License version 2.1 or above OR the
+  modified BSD license. For more information on Dojo licensing, see:
 
-   http://dojotoolkit.org/community/licensing.shtml
+http://dojotoolkit.org/community/licensing.shtml
 */
 
 /*
-   This is a compiled version of Dojo, built for deployment and not for
-   development. To get an editable version, please visit:
+  This is a compiled version of Dojo, built for deployment and not for
+  development. To get an editable version, please visit:
 
-   http://dojotoolkit.org
+http://dojotoolkit.org
 
-   for documentation and information on getting the source.
+  for documentation and information on getting the source.
 */
 
 if(typeof dojo=="undefined"){
@@ -16928,7 +16928,7 @@
 dojo.debug("adding selectedDate");
 dojo.html.addClass(this.clickedNode,this.classNames.selectedDate);
 this.selectedNode=this.clickedNode;
-}else{
+}else if(this.value){
 this._preInitUI(this.value,false,true);
 }
 this.clickedNode=null;

svn commit: r591174 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/ config/ dispatcher/ interceptor/ interceptor/debugging/ util/ views/xslt/

[husted]

Author: husted
Date: Thu Nov  1 17:31:53 2007
New Revision: 591174

URL: http://svn.apache.org/viewvc?rev=591174&view=rev
Log:
WW-2282 Apply a number of "FindBugs" performance optimizations submitted by 
Giovanni Azua Garcia. Most (or all) of these are line for line substitutions. 

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ListUIBean.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/UIBean.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.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/ApplicationMap.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/Counter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/IteratorFilterSupport.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/MapAdapter.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java?rev=591174&r1=591173&r2=591174&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java 
Thu Nov  1 17:31:53 2007
@@ -231,31 +231,31 @@
 int years = days / 365;
 
 if (years > 0) {
-args.add(new Long(years));
-args.add(new Long(day));
+args.add(Long.valueOf(years));
+args.add(Long.valueOf(day));
 args.add(sb);
 args.add(null);
 sb.append(tp.getText(DATETAG_PROPERTY_YEARS, 
DATETAG_DEFAULT_YEARS, args));
 } else if (day > 0) {
-args.add(new Long(day));
-args.add(new Long(hour));
+args.add(Long.valueOf(day));
+args.add(Long.valueOf(hour));
 args.add(sb);
 args.add(null);
 sb.append(tp.getText(DATETAG_PROPERTY_DAYS, DATETAG_DEFAULT_DAYS, 
args));
 } else if (hour > 0) {
-args.add(new Long(hour));
-args.add(new Long(min));
+args.add(Long.valueOf(hour));
+args.add(Long.valueOf(min));
 args.add(sb);
 args.add(null);
 sb.append(tp.getText(DATETAG_PROPERTY_HOURS, 
DATETAG_DEFAULT_HOURS, args));
 } else if (min > 0) {
-args.add(new Long(min));
-args.add(new Long(sec));
+args.add(Long.valueOf(min));
+args.add(Long.valueOf(sec));
 args.add(sb);
 args.add(null);
 sb.append(tp.getText(DATETAG_PROPERTY_MINUTES, 
DATETAG_DEFAULT_MINUTES, args));
 } else {
-args.add(new Long(sec));
+args.add(Long.valueOf(sec));
 args.add(sb);
 args.add(null);
 sb.append(tp.getText(DATETAG_PROPERTY_SECONDS, 
DATETAG_DEFAULT_SECONDS, args));

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java?rev=591174&r1=591173&r2=591174&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
 Thu Nov  1 17:31:53 2007
@@ -79,7 +79,7 @@
 return result;
 }
 
-private class DebugMapEntry implements Map.Entry {
+private static class DebugMapEntry implements Map.Entry {
 private Object key;
 private Object value;
 

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Double

svn commit: r593863 - in /struts: site/src/site/site.xml struts1/trunk/src/site/site.xml struts2/trunk/src/site/site.xml

[husted]

Author: husted
Date: Sun Nov 11 02:28:03 2007
New Revision: 593863

URL: http://svn.apache.org/viewvc?rev=593863&view=rev
Log:
Include links to ASF Thanks and Sponsorship pages, as directed by the PRC. 

Modified:
struts/site/src/site/site.xml
struts/struts1/trunk/src/site/site.xml
struts/struts2/trunk/src/site/site.xml

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=593863&r1=593862&r2=593863&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sun Nov 11 02:28:03 2007
@@ -3,7 +3,7 @@
 
 Apache Software Foundation
 http://www.apache.org/images/asf-logo.gif
-http://www.apache.org/
+http://apache.org/foundation/sponsorship.html
 
 
 Apache Struts
@@ -14,7 +14,7 @@
 
 http://projects.apache.org"; />
+href="http://apache.org/foundation/sponsorship.html"; />
 http://struts.apache.org/2.1.0/"; />
@@ -50,6 +50,10 @@
 http://people.apache.org/~vgritsenko/stats/projects/struts";
+/>
+http://apache.org/foundation/thanks.html";
 />
 
 

Modified: struts/struts1/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/site.xml?rev=593863&r1=593862&r2=593863&view=diff
==
--- struts/struts1/trunk/src/site/site.xml (original)
+++ struts/struts1/trunk/src/site/site.xml Sun Nov 11 02:28:03 2007
@@ -21,17 +21,17 @@
 
 Apache Software Foundation
 http://www.apache.org/images/asf-logo.gif
-http://www.apache.org/
+http://apache.org/foundation/sponsorship.html
 
 
 Apache Struts
 http://struts.apache.org/images/struts.gif
-http://struts.apache.org/1.x/
+http://struts.apache.org/1.x/index.html
 
 
 
-http://www.apache.org/"; />
-http://struts.apache.org/"; />
+http://apache.org/foundation/sponsorship.html"; />
+http://struts.apache.org/index.html"; />
 
 
 http://struts.apache.org/downloads.html"/>
+http://apache.org/foundation/thanks.html"/>
 
 
 

Modified: struts/struts2/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=593863&r1=593862&r2=593863&view=diff
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Sun Nov 11 02:28:03 2007
@@ -25,16 +25,16 @@
 
 Apache Software Foundation
 http://www.apache.org/images/asf-logo.gif
-http://www.apache.org
+http://apache.org/foundation/sponsorship.html
 
 
 Apache Struts
 images/struts2.png
-http://struts.apache.org/2.x/
+http://struts.apache.org/2.x/index.html
 
 
 
-http://www.apache.org/"; />
+http://apache.org/foundation/sponsorship.html"; />
 http://struts.apache.org/index.html"; />
 
 
@@ -45,6 +45,9 @@
 http://struts.apache.org/downloads.html"/>
+http://apache.org/foundation/thanks.html"/>
 
 
 

svn commit: r593864 - /struts/site/src/site/site.xml

[husted]

Author: husted
Date: Sun Nov 11 03:04:56 2007
New Revision: 593864

URL: http://svn.apache.org/viewvc?rev=593864&view=rev
Log:
Remove links to Struts 2.1.0 since this is not a formal distribution, but only 
a test-build. 

Modified:
struts/site/src/site/site.xml

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=593864&r1=593863&r2=593864&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sun Nov 11 03:04:56 2007
@@ -16,14 +16,11 @@
 name="Apache"
 href="http://apache.org/foundation/sponsorship.html"; />
 http://struts.apache.org/2.1.0/"; />
-http://struts.apache.org/2.0.11/"; />
+name="Struts 2"
+href="http://struts.apache.org/2.0.11/index.html"; />
 http://struts.apache.org/1.3.8/"; />
+href="http://struts.apache.org/1.3.8/index.html"; />
 
 
 
@@ -61,9 +58,6 @@
 
-http://struts.apache.org/2.1.0/index.html"; />
 http://struts.apache.org/2.0.11/index.html"; />

svn commit: r597046 - /struts/site/src/site/xdoc/index.xml

[husted]

Author: husted
Date: Wed Nov 21 03:58:47 2007
New Revision: 597046

URL: http://svn.apache.org/viewvc?rev=597046&view=rev
Log:
Rotate out US 2007 and rotate in EU 2008. 

Modified:
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=597046&r1=597045&r2=597046&view=diff
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Wed Nov 21 03:58:47 2007
@@ -23,36 +23,6 @@
 
 
 
-
- 
- http://apachecon.com/";>http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png"; alt="ApacheCon 
US 2007" hspace="16" align="right"/>
-
-  Two Struts presentations are scheduled for
-  http://www.us.apachecon.com/";>ApacheCon US 2007,
-  which is being held in Atlanta GA, November 12-16.
-
-
-
-  http://us.apachecon.com/us2007/program/talk/1880";>Using Groovy with 
Struts 2 (Mark Menard), 13 Nov @10a (five-hour training course)
-  http://us.apachecon.com/us2007/program/talk/2058";>Go Light with Apache 
Struts 2 and REST (Don Brown), 15 Nov @5:30p (one-hour presentation)
-
-
-
-  Also of interest (among many others!):
-
-
-
-  http://us.apachecon.com/us2007/program/talk/2023";>Apache Roller and Blogs 
as a Web Development Platform (Dave Johnson), 14 Nov @10:30a (one hour 
presentation)
-  http://us.apachecon.com/us2007/program/talk/1903";>Apache Harmony - 
Building Java SE in Open source (Geir Magnusson Jr.), 14 Nov @4:30p (one 
hour presentation)
-  http://us.apachecon.com/us2007/program/talk/1994";>Comparing Java Web 
Frameworks (Matt Raible), 15 Nov @9a (one hour presentation)
-
-
-
-  Hope to see you there!
-
-
- 
-
 
 
   
@@ -61,6 +31,7 @@
 http://www.nabble.com/Struts---User-f206.html";>
   user mailing list,
   and see for yourself.
+  http://apachecon.com/";>http://www.apache.org/ads/ApacheCon/2008-europe-125x125.png"; border="0" 
width="125" height="125" alt="ApacheCon US 2007" style="margin: 3px; display: 
block"align="right"/>
   
   
 http://www.nabble.com/-ANN--Struts-Downloads-Skyrocket-in-2007-tf4044764.html";>Struts
 Downloads Skyrocket in 2007

svn commit: r597200 - /struts/site/src/site/xdoc/index.xml

[husted]

Author: husted
Date: Wed Nov 21 12:28:22 2007
New Revision: 597200

URL: http://svn.apache.org/viewvc?rev=597200&view=rev
Log:
Rotate in some new mailing list post teasers. 

Modified:
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=597200&r1=597199&r2=597200&view=diff
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Wed Nov 21 12:28:22 2007
@@ -34,11 +34,10 @@
   http://apachecon.com/";>http://www.apache.org/ads/ApacheCon/2008-europe-125x125.png"; border="0" 
width="125" height="125" alt="ApacheCon US 2007" style="margin: 3px; display: 
block"align="right"/>
   
   
-http://www.nabble.com/-ANN--Struts-Downloads-Skyrocket-in-2007-tf4044764.html";>Struts
 Downloads Skyrocket in 2007
-http://www.nabble.com/-ANN--Connext-Graphs-tf3955090.html";>Connext 
Graphs
-http://www.nabble.com/-ANN--YUI-plugin-tf3947362.html";>YUI Plugin
-http://www.nabble.com/-S2--ANN--Unit-Testing-Struts-2-Actions-wired-with-Spring-using-JUnit-article-tf3951518.html";>Unit
 Testing Struts 2 Actions wired with Spring
-http://www.nabble.com/Strecks-1.0.1-released-tf3913404.html";>Strecks 
1.0.1 released
+http://www.nabble.com/-ANN--Practical-Apache-Struts2-Web-2.0-Projects-tf4845559.html";>[ANN]
 Practical Apache Struts2 Web 2.0 Projects
+http://www.nabble.com/-s2--REST-and-Plugin-ideas-tf4824844.html";>[s2] 
REST and Plugin ideas
+http://www.nabble.com/The-breadcrumbs-have-been-served%21-tf4619406.html";>The
 breadcrumbs have been served!
+http://www.nabble.com/struts-1.2%3A-calling-an-action-by-javascript-tf4725382.html";>Struts
 1.2: calling an action by javascript
   
 
 

svn commit: r597831 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/ main/java/META-INF/ main/java/action/ main/java/action/user/ main/java/action/user/subscription/ main/java/entity/ main/ja

[husted]

Author: husted
Date: Sat Nov 24 01:41:46 2007
New Revision: 597831

URL: http://svn.apache.org/viewvc?rev=597831&view=rev
Log:
WW-1399 Start to add unit tests. Cleanup some compiler warnings. Add an 
alternative persistence.xml setup for Hibernate. 

Added:
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/UserManagerTest.java
Removed:

struts/sandbox/trunk/jpa-mailreader/src/main/java/xwork-conversion.properties
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerSuperclass.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManagerInterface.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/HelloTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/RetainTest.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml?rev=597831&r1=597830&r2=597831&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
Sat Nov 24 01:41:46 2007
@@ -1,27 +1,38 @@
 
-http://java.sun.com/xml/ns/persistence";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"; version="1.0">
-
-   
+http://java.sun.com/xml/ns/persistence"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; version="1.0" 
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence 
http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd";>
+
+
 
+   
+   org.hibernate.ejb.HibernatePersistence
+entity.EntitySuperclass
+entity.protocol.Protocol
+entity.subscription.Subscription
+entity.user.User
+   
+   
+   
+   
+   
+   
+   
+   
+   
 

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=597831&r1=597830&r2=597831&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Sat Nov 
24 01:41:46 2007
@@ -22,6 +22,9 @@
 import java.util.Map;
 import org.apache.struts2.interceptor.SessionAware;
 import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.conversion.annotations.Conversion;
+import com.opensymphony.xwork2.conversion.annotations.ConversionType;
+import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
 
 /**
  * 
@@ -32,6 +35,11 @@
  * Generic logic should be pushed down to the Entity managers or another 
facade.
  * 
  */
[EMAIL PROTECTED](conversions = {
+@TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.protocol.Protocol", converter = 
"entity.protocol.ProtocolTypeConverter"),
+@TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.subscription.Subscription", converter = 
"entity.subscription.SubscriptionTypeConverter"),
+@TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.user.User", converter = "entity.user.UserTypeConverter") })
[EMAIL PROTECTED]("unchecked")
 public class Index extends ActionSupport implements SessionAware {
 
 //  STATICS 

Modified: 
struts/sandbox/trunk/jpa-ma

svn commit: r598053 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/ main/java/action/ main/java/action/user/ main/java/action/user/subscription/ main/java/entity/ main/java/entity/protocol/

[husted]

Author: husted
Date: Sun Nov 25 13:04:53 2007
New Revision: 598053

URL: http://svn.apache.org/viewvc?rev=598053&view=rev
Log:
WW-1399 Start migration to "session per request" pattern. Implement additional 
tests, modeled on EntityInterceptor. EntityInterceptor itself is untested.

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityInterceptor.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/BootstrapDataTest.java
  - copied, changed from r597831, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/RetainTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityManagerHelperTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntitySuperclassTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityTestCase.java
Removed:
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/RetainTest.java
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Delete.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Update.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerSuperclass.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntitySuperclass.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManagerInterface.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionManagerInterface.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserManagerInterface.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/struts.xml

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/UserManagerTest.java

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=598053&r1=598052&r2=598053&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Sun Nov 
25 13:04:53 2007
@@ -25,6 +25,7 @@
 import com.opensymphony.xwork2.conversion.annotations.Conversion;
 import com.opensymphony.xwork2.conversion.annotations.ConversionType;
 import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
+import org.apache.struts2.config.ParentPackage;
 
 /**
  * 
@@ -40,6 +41,7 @@
 @TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.subscription.Subscription", converter = 
"entity.subscription.SubscriptionTypeConverter"),
 @TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.user.User", converter = "entity.user.UserTypeConverter") })
 @SuppressWarnings("unchecked")
[EMAIL PROTECTED]("entity-default")
 public class Index extends ActionSupport implements SessionAware {
 
 //  STATICS 

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java?rev=598053&r1=598052&r2=598053&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java 
Sun Nov 25 13:04:53 2007
@@ -108,7 +108,8 @@
 
 protected void update() throws Exception {
 User result = getUser();
-if (manager.hasId(result)) {
+boolean exists = (null != manager.find(result.getId()));
+if (exists) {
 manager.update(result);
 } else {
 addActionError(getText(ERROR_CREDENTIALS_MISMATCH));

Modified: 
struts/sandbox/t

svn commit: r598100 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/META-INF/ main/java/action/user/ main/java/action/user/subscription/ main/java/entity/ main/java/entity/protocol/ main/java

[husted]

Author: husted
Date: Sun Nov 25 16:59:04 2007
New Revision: 598100

URL: http://svn.apache.org/viewvc?rev=598100&view=rev
Log:
WW-1399 Refactor EntityManagers to EntityHelpers, and other class naming 
conventions. 

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java
  - copied, changed from r598053, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerSuperclass.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/UuidEntity.java
  - copied, changed from r598053, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntitySuperclass.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java
  - copied, changed from r598053, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManagerInterface.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityHelperTest.java
  - copied, changed from r598053, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntitySuperclassTest.java
Removed:

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerSuperclass.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntitySuperclass.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolManagerInterface.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionManagerInterface.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserManager.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserManagerInterface.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntitySuperclassTest.java
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/UserManagerTest.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml?rev=598100&r1=598099&r2=598100&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
Sun Nov 25 16:59:04 2007
@@ -6,7 +6,6 @@

oracle.toplink.essentials.PersistenceProvider

-entity.EntitySuperclass
 entity.protocol.Protocol
 entity.subscription.Subscription
 entity.user.User
@@ -22,7 +21,6 @@
 

org.hibernate.ejb.HibernatePersistence
-entity.EntitySuperclass
 entity.protocol.Protocol
 entity.subscription.Subscription
 entity.user.User

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java?rev=598100&r1=598099&r2=598100&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java 
Sun Nov 25 16:59:04 2007
@@ -19,8 +19,8 @@
 package action.user;
 
 import entity.user.User;
-import entity.user.UserManager;
-import entity.user.U

svn commit: r598110 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/entity/ main/java/entity/subscription/ main/java/entity/user/ test/java/entity/ test/java/entity/user/

[husted]

Author: husted
Date: Sun Nov 25 18:45:09 2007
New Revision: 598110

URL: http://svn.apache.org/viewvc?rev=598110&view=rev
Log:
WW-1399 Add count method to enhance testing. (Also test rollback using a level 
1 test. Need to setup a separate test scaffold to automate a rollback test.)

Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityTestCase.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/UserManagerTest.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java?rev=598110&r1=598109&r2=598110&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java 
Sun Nov 25 18:45:09 2007
@@ -18,6 +18,7 @@
  */
 package entity;
 
+import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceException;
@@ -47,12 +48,27 @@
 manager.remove(value);
 }
 
-public Object findEntity(String namedQuery, String parameterName,
+@SuppressWarnings("unchecked")
+public List resultList(String namedQuery, String parameterName,
+String value) {
+EntityManager manager = EntityManagerHelper.getEntityManager();
+List result = null;
+Query query = manager.createNamedQuery(namedQuery);
+if (parameterName!=null) query.setParameter(parameterName, value);
+try {
+result = query.getResultList();
+} catch (NoResultException e) {
+result = null;
+}
+return result;
+}
+
+public Object singleResult(String namedQuery, String parameterName,
 String value) {
 EntityManager manager = EntityManagerHelper.getEntityManager();
 Object result = null;
 Query query = manager.createNamedQuery(namedQuery);
-query.setParameter(parameterName, value);
+if (parameterName!=null) query.setParameter(parameterName, value);
 try {
 result = query.getSingleResult();
 } catch (NoResultException e) {

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java?rev=598110&r1=598109&r2=598110&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
 Sun Nov 25 18:45:09 2007
@@ -49,7 +49,7 @@
 }
 
 public Subscription findByName(String value) {
-Subscription result = (Subscription) findEntity(
+Subscription result = (Subscription) singleResult(
 Subscription.FIND_BY_NAME, Subscription.NAME, value);
 return result;
 }

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java?rev=598110&r1=598109&r2=598110&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java Sun 
Nov 25 18:45:09 2007
@@ -46,7 +46,9 @@
 @Entity(name = "APP_USER")
 @NamedQueries( {
 @NamedQuery(name = User.FIND_ALL, query = User.FIND_ALL_QUERY),
-@NamedQuery(name = User.FIND_BY_NAME, query = User.FIND_BY_NAME_QUERY) 
})
+@NamedQuery(name = User.FIND_BY_NAME, query = User.FIND_BY_NAME_QUERY),
+@NamedQuery(name = User.COUNT, query = User.COUNT_QUERY)
+})
 public class User extends UuidEntity implements Serializable {
 
 //  STATICS 
@@ -58,12 +60,7 @@
  */
 static final String FIND_ALL = "User.FIND_ALL";
 
-/**
- * 
- * Query for finding a User by username.
- * 
- */
-static final String FIND_ALL_QUERY = "SELECT u FROM APP_USER u&qu

svn commit: r598128 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/entity/ main/java/entity/protocol/ main/java/entity/subscription/ main/java/entity/user/ test/java/entity/ test/java/entity

[husted]

Author: husted
Date: Sun Nov 25 21:08:19 2007
New Revision: 598128

URL: http://svn.apache.org/viewvc?rev=598128&view=rev
Log:
WW-1399 Add other count methods.

Added:
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/UserHelperTest.java
Removed:

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/UserManagerTest.java
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityTestCase.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java?rev=598128&r1=598127&r2=598128&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java 
Sun Nov 25 21:08:19 2007
@@ -49,12 +49,12 @@
 }
 
 @SuppressWarnings("unchecked")
-public List resultList(String namedQuery, String parameterName,
-String value) {
+public List resultList(String namedQuery, String parameterName, String 
value) {
 EntityManager manager = EntityManagerHelper.getEntityManager();
 List result = null;
 Query query = manager.createNamedQuery(namedQuery);
-if (parameterName!=null) query.setParameter(parameterName, value);
+if (parameterName != null)
+query.setParameter(parameterName, value);
 try {
 result = query.getResultList();
 } catch (NoResultException e) {
@@ -68,7 +68,8 @@
 EntityManager manager = EntityManagerHelper.getEntityManager();
 Object result = null;
 Query query = manager.createNamedQuery(namedQuery);
-if (parameterName!=null) query.setParameter(parameterName, value);
+if (parameterName != null)
+query.setParameter(parameterName, value);
 try {
 result = query.getSingleResult();
 } catch (NoResultException e) {

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java?rev=598128&r1=598127&r2=598128&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java 
(original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java 
Sun Nov 25 21:08:19 2007
@@ -36,18 +36,31 @@
  * 
  */
 @Entity(name = "APP_PROTOCOL")
[EMAIL PROTECTED]( { @NamedQuery(name = Protocol.FIND_ALL, query = "SELECT p 
FROM APP_PROTOCOL p") })
[EMAIL PROTECTED]( {
+@NamedQuery(name = Protocol.COUNT, query = Protocol.COUNT_QUERY),
+@NamedQuery(name = Protocol.FIND_ALL, query = Protocol.FIND_ALL_QUERY) 
})
 public class Protocol extends UuidEntity implements Serializable {
 
 //  STATICS 
 
 /**
  * 
+ * Named query for counting Protocol entities.
+ * 
+ */
+public static final String COUNT = "Protocol.COUNT";
+
+private static final String COUNT_QUERY = "SELECT COUNT(*) FROM 
APP_PROTOCOL";
+
+/**
+ * 
  * Named query for selecting all Protocol instances.
  * 
  */
 public static final String FIND_ALL = "Protocol.FIND_ALL";
 
+private static final String FIND_ALL_QUERY = "SELECT p FROM APP_PROTOCOL 
p";
+
 //  FIELDS 
 
 @Column(nullable = false)
@@ -74,6 +87,11 @@
 super();
 }
 
+/**
+ * 
+ * Instantiate a default Protocol object, and load values.
+ * 
+ */
 public Protocol(String description) {
 super();
 setDescription(description);

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mai

svn commit: r598326 - in /struts/sandbox/trunk/jpa-mailreader/src/main: java/ java/action/ java/action/user/ java/entity/ java/entity/protocol/ java/entity/subscription/ java/entity/user/ webapp/

[husted]

Author: husted
Date: Mon Nov 26 08:03:48 2007
New Revision: 598326

URL: http://svn.apache.org/viewvc?rev=598326&view=rev
Log:
WW-1399 Spruce up some of the JavaDocs. Add exception.jsp to webapp and 
exception handling to struts.xml. 

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/webapp/exception.jsp
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Login.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityInterceptor.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/ExpiredPasswordException.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/UuidEntity.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/struts.xml

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=598326&r1=598325&r2=598326&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Mon Nov 
26 08:03:48 2007
@@ -29,11 +29,14 @@
 
 /**
  * 
- * Provides the Struts-specific Business and Persistance Logic API for the
+ * The top-level Struts-specific business and persistance logic API for the
  * MailReader application.
  * 
  * 
- * Generic logic should be pushed down to the Entity managers or another 
facade.
+ * The application is entity or resource-orientated. Subclasses provide
+ * additional logic specific to each entity or resource. Persistence system
+ * logic is delegated to a helper class for each entity. The Action classes
+ * interact only with the entity helpers, and not the underlying JPA.
  * 
  */
 @Conversion(conversions = {

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Login.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Login.java?rev=598326&r1=598325&r2=598326&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Login.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Login.java 
Mon Nov 26 08:03:48 2007
@@ -1,3 +1,21 @@
+/*
+ * 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 action.user;
 
 import org.apache.struts2.config.Result;

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java?rev=598326&r1=598325&r2=598326&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java 
Mon Nov 26 08:03:48 2007
@@ -1,7 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor licens

svn commit: r598377 - in /struts/sandbox/trunk/jpa-mailreader/src/main: java/ java/META-INF/xfire/ java/entity/protocol/ java/entity/subscription/ java/entity/user/ webapp/ webapp/WEB-INF/

[husted]

Author: husted
Date: Mon Nov 26 10:49:41 2007
New Revision: 598377

URL: http://svn.apache.org/viewvc?rev=598377&view=rev
Log:
WW-1399 Just as an experiment, add an xfire web services configuration. 

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/

struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/services.xml
Modified:

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/struts.xml
struts/sandbox/trunk/jpa-mailreader/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/jpa-mailreader/src/main/webapp/index.html

Added: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/services.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/services.xml?rev=598377&view=auto
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/services.xml 
(added)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/services.xml 
Mon Nov 26 10:49:41 2007
@@ -0,0 +1,21 @@
+
+http://xfire.codehaus.org/config/1.0";>
+ 
+user
+http://struts.apache.org/mailreader/service/user
+entity.user.UserHelper
+entity.user.UserHelperImpl
+  
+ 
+subscription
+
http://struts.apache.org/mailreader/service/subscription
+entity.subscription.SubscriptionHelper
+
entity.subscription.SubscriptionHelperImpl
+  
+ 
+protocol
+http://struts.apache.org/mailreader/service/protocol
+entity.protocol.ProtocolHelper
+
entity.protocol.ProtocolHelperImpl
+  
+
\ No newline at end of file

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java?rev=598377&r1=598376&r2=598377&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java
 Mon Nov 26 10:49:41 2007
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.jws.WebService;
 import javax.persistence.PersistenceException;
 
 /**
@@ -29,6 +30,7 @@
  * object.
  * 
  */
[EMAIL PROTECTED]
 public interface ProtocolHelper {
 
 /**

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java?rev=598377&r1=598376&r2=598377&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
 Mon Nov 26 10:49:41 2007
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.jws.WebService;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 
@@ -34,6 +35,7 @@
  * Default JPA implementation of ProtocolHelper.
  * 
  */
[EMAIL PROTECTED](serviceName = "protocol", endpointInterface = 
"entity.protocol.ProtocolHelper")
 public class ProtocolHelperImpl extends EntityHelper implements ProtocolHelper 
{
 
 public int count() throws PersistenceException {

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java?rev=598377&r1=598376&r2=598377&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java
 Mon Nov 26 10:49:41 2007
@@ -18,6 +18,7 @@
  */
 package entity.subscription;
 
+import javax.jws.WebService;
 import javax.persistence.PersistenceException;
 
 /**
@@ -26,6 +27,7 @@
  * object.
  * 
  */
[EMAIL PROTECTED]
 public interface SubscriptionHelper {
 
 

svn commit: r598449 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/ main/java/META-INF/ main/java/action/ main/java/action/user/ main/java/action/user/subscription/ main/java/entity/ main/ja

[husted]

Author: husted
Date: Mon Nov 26 14:04:05 2007
New Revision: 598449

URL: http://svn.apache.org/viewvc?rev=598449&view=rev
Log:
WW-1399 A few tweaks to get the web application persistence working. The JPA 
support seems honky-dory now :)

Removed:
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/user/
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Update.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityInterceptor.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/struts.xml
struts/sandbox/trunk/jpa-mailreader/src/main/webapp/index.html

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml?rev=598449&r1=598448&r2=598449&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
Mon Nov 26 14:04:05 2007
@@ -29,6 +29,7 @@



+   




Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=598449&r1=598448&r2=598449&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Mon Nov 
26 14:04:05 2007
@@ -20,12 +20,16 @@
 
 import java.util.HashMap;
 import java.util.Map;
+
+import javax.persistence.EntityManager;
+
 import org.apache.struts2.interceptor.SessionAware;
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.conversion.annotations.Conversion;
 import com.opensymphony.xwork2.conversion.annotations.ConversionType;
 import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
 import org.apache.struts2.config.ParentPackage;
+import entity.EntityAware;
 
 /**
  * 
@@ -45,7 +49,7 @@
 @TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.user.User", converter = "entity.user.UserTypeConverter") })
 @SuppressWarnings("unchecked")
 @ParentPackage("entity-default")
-public class Index extends ActionSupport implements SessionAware {
+public class Index extends ActionSupport implements EntityAware, SessionAware {
 
 //  STATICS 
 
@@ -105,28 +109,53 @@
 getSession().put(PROFILE_KEY, value);
 }
 
+private String input = CREATE;
+
 /**
  * 
- * Record the CRUD operation in progress.
+ * Access the CRUD operation token.
  * 
  */
-private String input = CREATE;
-
 public String getInput() {
 return input;
 }
 
+/**
+ * 
+ * Store the CRUD operation in token.
+ * 
+ */
 public void setInput(String value) {
 input = value;
 }
 
+private EntityManager entityManager;
+
 /**
  * 
- * Provide the session context, or its proxy.
+ * Store the session context, or its proxy.
  * 
  */
+public void setEntityManager(EntityManager value) {
+entityManager = value;
+}
+
+/**
+ * 
+ * Access the EntityManager for this thread.
+ * 
+ */
+protected EntityManager getManager() {
+return entityManager;
+}
+
 private Map session;
 
+/**
+ * 
+ * Store the session context, or its proxy.
+ * 
+ */
 public void setSession(Map value) {
 session = value;
 Object profile = getProfile();
@@ -135,6 +164,11 @@
 }
 }
 
+/**
+ * 
+ * Access the session context, or its proxy.
+ *

svn commit: r598465 - in /struts/sandbox/trunk/jpa-mailreader/src/main/java: ./ action/ action/user/ action/user/subscription/ entity/protocol/ entity/subscription/ entity/user/

[husted]

Author: husted
Date: Mon Nov 26 15:46:16 2007
New Revision: 598465

URL: http://svn.apache.org/viewvc?rev=598465&view=rev
Log:
WW-1399 Include sample logging settings. Switch to production mode to be sure 
system doesn't spam logs. (The type converts can be a problem, since they issue 
WARN statements in the normal course.)

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=598465&r1=598464&r2=598465&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Mon Nov 
26 15:46:16 2007
@@ -92,10 +92,6 @@
 
 //  PROPERTIES 
 
-public String getLocation() {
-return "/WEB-INF/results/";
-}
-
 /**
  * 
  * Provide a local cache of client properties.

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java?rev=598465&r1=598464&r2=598465&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java 
Mon Nov 26 15:46:16 2007
@@ -45,11 +45,7 @@
 
 //  PROPERTIES 
 
-UserHelper manager;
-
-public String getLocation() {
-return "/WEB-INF/results/user/";
-}
+private UserHelper manager;
 
 private User user;
 

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java?rev=598465&r1=598464&r2=598465&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java
 Mon Nov 26 15:46:16 2007
@@ -52,11 +52,12 @@
 @ParentPackage("entity-default")
 public class Index extends action.user.Index implements Preparable {
 
-protected static final String ERROR_HOST_UNIQUE = "error.host.unique";
+private static final String ERROR_CREDENTIALS_MISMATCH = 
"error.password.mismatch";
 
-static final String ERROR_CREDENTIALS_MISMATCH = "error.password.mismatch";
+protected static final String ERROR_HOST_UNIQUE = "error.host.unique";
 
 protected SubscriptionHelper manager;
+
 private ProtocolHelper protocolManager;
 
 private Map protocols;

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties?rev=598465&r1=598464&r2=598465&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties 
(original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/commons-logging.properties 
Mon Nov 26 15:46:16 2007
@@ -1 +1,2 @@
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
+# org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java
URL: 
http://svn.apache.org/viewvc/str

svn commit: r598466 - in /struts/sandbox/trunk/jpa-mailreader/src/main/java: log4j.properties.sample log4j.properties.txt

[husted]

Author: husted
Date: Mon Nov 26 15:46:54 2007
New Revision: 598466

URL: http://svn.apache.org/viewvc?rev=598466&view=rev
Log:
WW-1399 Include sample logging settings. Switch to production mode to be sure 
system doesn't spam logs. (The type converts can be a problem, since they issue 
WARN statements in the normal course.)

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.sample
  - copied unchanged from r598465, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt
Removed:
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties.txt

svn commit: r598741 - /struts/struts2/trunk/src/site/xdoc/index.xml

[husted]

Author: husted
Date: Tue Nov 27 11:41:25 2007
New Revision: 598741

URL: http://svn.apache.org/viewvc?rev=598741&view=rev
Log:
Change min-height to height per suggestions by Jim Cushing and Frank W. 
Zammetti.

Modified:
struts/struts2/trunk/src/site/xdoc/index.xml

Modified: struts/struts2/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?rev=598741&r1=598740&r2=598741&view=diff
==
--- struts/struts2/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml Tue Nov 27 11:41:25 2007
@@ -13,7 +13,7 @@
 
 
 
-
+
 
 
 
@@ -33,7 +33,7 @@
 
 
 http://struts.apache.org/download.cgi#struts210";>
-  
+  
 
   version 2.1.0
   
@@ -43,7 +43,7 @@
 
 
 
-  
+  
 
   Get 
Started
 
@@ -51,7 +51,7 @@
 
 
 http://cwiki.apache.org/S2PLUGINS/home.html"; 
style="margin:10px">
-  
+  
 
   Plugin 
Registry
 

svn commit: r599476 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/ main/java/META-INF/ main/java/META-INF/xfire/ main/java/hello/ main/webapp/user/ test/java/hello/

[husted]

Author: husted
Date: Thu Nov 29 07:15:50 2007
New Revision: 599476

URL: http://svn.apache.org/viewvc?rev=599476&view=rev
Log:
WW-1399 Add simple Hello package to demonstrate basic JPA CRUD. Remove XFire 
test configuration for now. Would need to add a EntityFilter to do for Services 
what the EntityInterceptor does for Actions (or use the filter for both). It 
would also need to observe A&A (once we add A&A back in!). 

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/
struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/Message.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java
Removed:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/xfire/
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties
struts/sandbox/trunk/jpa-mailreader/src/main/java/struts.xml
struts/sandbox/trunk/jpa-mailreader/src/main/webapp/user/@form.jsp

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml?rev=599476&r1=599475&r2=599476&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
Thu Nov 29 07:15:50 2007
@@ -20,13 +20,10 @@
 -->
 

-   org.hibernate.ejb.HibernatePersistence
-entity.protocol.Protocol
-entity.subscription.Subscription
-entity.user.User
+   org.hibernate.ejb.HibernatePersistence


-   
+   




Added: struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/Message.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/Message.java?rev=599476&view=auto
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/Message.java (added)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/Message.java Thu 
Nov 29 07:15:50 2007
@@ -0,0 +1,53 @@
+package hello;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToOne;
+
+import entity.user.User;
+
[EMAIL PROTECTED](name = "APP_MESSAGE")
[EMAIL PROTECTED]({
+@NamedQuery(name = Message.COUNT, query = Message.COUNT_QUERY) })
+public class Message {
+
+public static final String COUNT = "Message.COUNT";
+private static final String COUNT_QUERY = "SELECT COUNT(*) FROM 
APP_MESSAGE";
+
+@Id
+@GeneratedValue
+private Long id;
+public Long getId() {
+return id;
+}
+void setId(Long value) {
+id = value;
+}
+
+private String text;
+public String getText() {
+return text;
+}
+public void setText(String value) {
+text = value;
+}
+
+@OneToOne(cascade=CascadeType.ALL)
+private Message message;
+public Message getNextMessage() {
+return message;
+}
+public void setNextMessage(Message value) {
+message = value;
+}
+
+Message() {}
+public Message(String value) {
+text = value;
+}
+
+}
\ No newline at end of file

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties?rev=599476&r1=599475&r2=599476&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/log4j.properties Thu Nov 
29 07:15:50 2007
@@ -1,9 +1,9 @@
 
-# -- production mode --
+# -- development mode --
 
-log4j.rootLogger = error, stdout
+log4j.rootLogger = info, stdout
 log4j.appender.stdout = org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Threshold = error
+log4j.appender.stdout.Threshold = info
 log4j.appender.stdout.Target = System.out
 log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] : 
%m%n

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/struts.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mai

svn commit: r599535 - /struts/struts2/trunk/src/site/xdoc/index.xml

[husted]

Author: husted
Date: Thu Nov 29 10:25:49 2007
New Revision: 599535

URL: http://svn.apache.org/viewvc?rev=599535&view=rev
Log:
Roll back version number on 2.x index page to the current GA release. 

Modified:
struts/struts2/trunk/src/site/xdoc/index.xml

Modified: struts/struts2/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?rev=599535&r1=599534&r2=599535&view=diff
==
--- struts/struts2/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml Thu Nov 29 10:25:49 2007
@@ -35,7 +35,7 @@
 http://struts.apache.org/download.cgi#struts210";>
   
 
-  version 2.1.0
+  version 2.0.11
   
   Download 
Now
 

svn commit: r599722 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/action/ main/java/action/user/ main/java/action/user/subscription/ main/java/entity/ main/java/entity/protocol/ main/java/e

[husted]

Author: husted
Date: Thu Nov 29 23:54:47 2007
New Revision: 599722

URL: http://svn.apache.org/viewvc?rev=599722&view=rev
Log:
WW-1399 Decommission the webservice annotations for now. Rename EntityHelpers 
to EntityServices to clarify role.

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityService.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolService.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolServiceImpl.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionService.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionServiceImpl.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserService.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityServiceTest.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityHelperTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/ProtocolServiceTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/SubscriptionServiceTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/UserServiceTest.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/UserHelperTest.java
Removed:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserHelperImpl.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityHelperTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/UserHelperTest.java
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Create.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/action/user/subscription/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityInterceptor.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserTypeConverter.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/hello/Message.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/BootstrapDataTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/EntityManagerHelperTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=599722&r1=599721&r2=599722&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Thu Nov 
29 23:54:47 2007
@@ -23,12 +23,14 @@
 
 import javax.persistence.EntityManager;
 
+import org.apache.struts2.config.ParentPackage;
 import or

svn commit: r600483 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/META-INF/ main/java/action/ main/java/entity/ main/java/entity/protocol/ main/java/entity/subscription/ main/java/entity/us

[husted]

Author: husted
Date: Mon Dec  3 03:18:37 2007
New Revision: 600483

URL: http://svn.apache.org/viewvc?rev=600483&view=rev
Log:
WW-1399 Add interfaces for the entity objects, mainly to separate the concerns 
of API and JavaDoc from the grunge work of the implementation, but also to 
annoy Tom :)

Added:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/UuidEntity.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
  - copied, changed from r599722, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java
  - copied, changed from r599470, 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/BootstrapDataTest.java
  - copied, changed from r599722, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/BootstrapDataTest.java
Removed:

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/Protocol.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/Subscription.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/User.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/BootstrapDataTest.java
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityInterceptor.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityService.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolService.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolServiceImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionServiceImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserTypeConverter.java

struts/sandbox/trunk/jpa-mailreader/src/test/java/entity/UserServiceTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml?rev=600483&r1=600482&r2=600483&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/META-INF/persistence.xml 
Mon Dec  3 03:18:37 2007
@@ -20,15 +20,18 @@
 -->
 

-   org.hibernate.ejb.HibernatePersistence
-   
-   
-   
-   
-   
-   
-   
-   
+   org.hibernate.ejb.HibernatePersistence
+   
+   
+   
+   
+   
+   
+   
+   

-   
+
 

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=600483&r1=600482&r2=600483&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Mon Dec 
 3 03:18:37 2007
@@ -41,7 +41,7 @@
  * 
  * The application is entity or resource-orientated. Subclasses provide
  * additional logic specific to each entity or resource. Persistence system
- * logic is delegated to a helper class for each entity. The Action classes
+ * logic is delegated to a service class for each entity. The Action classes
  * interact only with the entity helpers, and not the underlying JPA.
  * 
  */

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityAware.java?rev=60048

svn commit: r600484 - /struts/sandbox/trunk/jpa-mailreader/STATUS.txt

[husted]

Author: husted
Date: Mon Dec  3 03:20:11 2007
New Revision: 600484

URL: http://svn.apache.org/viewvc?rev=600484&view=rev
Log:
WW-1399 Update overview of application design

Modified:
struts/sandbox/trunk/jpa-mailreader/STATUS.txt

Modified: struts/sandbox/trunk/jpa-mailreader/STATUS.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/STATUS.txt?rev=600484&r1=600483&r2=600484&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/STATUS.txt (original)
+++ struts/sandbox/trunk/jpa-mailreader/STATUS.txt Mon Dec  3 03:20:11 2007
@@ -8,7 +8,7 @@
 The JPA MailReader is a best-practices example of using Struts 2 with 
 the Java Persistence API with a standard SQL database. 
 
-The example is based on the original MailReader Demonstration 
+The example descends from the original MailReader Demonstration 
 Application and uses a modified version of the MailReader JPA package 
 developed for the Apache Shale Example. 
 
@@ -17,24 +17,36 @@
 together using convention over configuration. In some cases, 
 Result annotations are used to move between workflows. 
 
-This implementaion expresses the business classes in an "entity" 
-package. The business classes are designed from the ground-up to be 
-used with the JPA. Sufficient annotation is provided so that a SQL 
-database schema can be generated from the entity classes. (See 
-RetainTest to bootstrap a database.)
-
-The persistence logic is contained in a "Manager" class that is 
-associated with each entity class. Essentially, the manager classes 
-are data access objects. The Managers extend a superclass which 
-provides data access code that can be shared within the persistence 
-unit. Most manager methods are type-safe wrappers around shared 
-methods. 
+This implementation expresses the business classes in an "entity" 
+package. (Business classes are also referred to as "domain" classes 
+or "model" classes.) 
+
+The business classes are designed from the ground-up to be used with 
+the JPA. Sufficient annotation is provided with the entity 
+implementations so that a SQL database schema can be generated from 
+the entity classes, just by running the application, or a unit test. 
+(See the entity.BootStrapDataTest for an example.)
+
+The persistence logic is contained in a "Service" class that is 
+associated with each entity class. The service classes are backed by 
+a static, singleton EntityManagerHelper class that provides the 
+service implementations with "data access object" functionality. 
+
+The inter-object and inter-layer logic is also contained in the 
+Service classes. Any code that is not dependant on a Struts Action is 
+pushed to the service layer, where it is easier to test and reuse. 
 
 Each business class also has an XWork type converter. Most often, 
 the converters use a substitute key for the conversion ID, rather than 
 the primary key. (Exposing the primary key to the user interface layer 
 is considered a bad practice in DBA circles.) 
 
+The type converters do make use of the services to perform database 
+lookups, as needed. An EntityInterceptor opens and closes a transaction
+for each request (OpenSessionInView), and the type converters share 
+that transaction and a persistence context with the Actions. (The 
+retrieved object is not detached.)
+
 To provide maximum portability, the internal primary keys are UUIDs. 
 The entities are based on a mapper superclass which provides shared 
 code for creating and managing the primary keys.
@@ -44,38 +56,51 @@
 sub-package is a resource container that encapsulates all of the 
 entity's data and behavior. 
 
+An interface and default implementation is provided for each 
+entity and service. Since all of these are one-off implementations, 
+the interface is not strictly needed, but interfaces are 
+still useful containers for JavaDocs, and encourage correct thinking.
+
 The Action packaging follows a similar strategy, but also creates 
-a resource heirarchy from the entites. The "root" action package 
+a resource heirarchy from the entities. The "root" action package 
 contains the "welcome" resources. The "action.user" package encapsulates
 the "user" resources, and the "action.user.subscription" package 
 encapsulates the "subscription" resources. The nesting of subscription 
 within user reflects the one-to-many relationship between a user 
 resource and and its subscriptions. 
 
-Since the CodeBehind package is being utilized, the folder structure
-for the JSP templates follows the package structure. 
+Essentially, each package/namespace represents a distinct "resource" 
+from the REST perspective.
 
 Each package/namespace has an Index Action, which is usually the 
-superclass for other Actions in the same package. Th

svn commit: r600489 - /struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java

[husted]

Author: husted
Date: Mon Dec  3 03:30:02 2007
New Revision: 600489

URL: http://svn.apache.org/viewvc?rev=600489&view=rev
Log:
WW-1399 Minor JavaDoc update. 

Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=600489&r1=600488&r2=600489&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Mon Dec 
 3 03:30:02 2007
@@ -44,6 +44,14 @@
  * logic is delegated to a service class for each entity. The Action classes
  * interact only with the entity helpers, and not the underlying JPA.
  * 
+ * 
+ * Any helper method that is not physically bound the the UI API should be 
+ * moved to the service layer! In most cases, the remaining Action methods 
+ * will either call ActionErrors, return a result value meaningful only to 
+ * the UI, or retain state used by other Action helper methods. (A generic 
+ * ServiceError class with an ActionError adapter might allow us to move 
+ * 3/4 of the Action helper methods to the service layer.)   
+ * 
  */
 @Conversion(conversions = {
 @TypeConversion(type = ConversionType.APPLICATION, key = 
"entity.protocol.Protocol", converter = 
"entity.protocol.ProtocolTypeConverter"),

svn commit: r601031 - in /struts/sandbox/trunk/jpa-mailreader/src/main/java: action/Index.java entity/protocol/ProtocolImpl.java entity/subscription/SubscriptionImpl.java entity/user/UserImpl.java

[husted]

Author: husted
Date: Tue Dec  4 10:42:34 2007
New Revision: 601031

URL: http://svn.apache.org/viewvc?rev=601031&view=rev
Log:
WW-1399 Add Table annotations. 

Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java

Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=601031&r1=601030&r2=601031&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java 
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Tue Dec 
 4 10:42:34 2007
@@ -45,12 +45,12 @@
  * interact only with the entity helpers, and not the underlying JPA.
  * 
  * 
- * Any helper method that is not physically bound the the UI API should be 
- * moved to the service layer! In most cases, the remaining Action methods 
- * will either call ActionErrors, return a result value meaningful only to 
- * the UI, or retain state used by other Action helper methods. (A generic 
- * ServiceError class with an ActionError adapter might allow us to move 
- * 3/4 of the Action helper methods to the service layer.)   
+ * Any helper method that is not physically bound the the UI API should be 
moved
+ * to the service layer! In most cases, the remaining Action methods will 
either
+ * call ActionErrors, return a result value meaningful only to the UI, or 
retain
+ * state used by other Action helper methods. (A generic ServiceError class 
with
+ * an ActionError adapter might allow us to move 3/4 of the Action helper
+ * methods to the service layer.)
  * 
  */
 @Conversion(conversions = {

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java?rev=601031&r1=601030&r2=601031&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
 Tue Dec  4 10:42:34 2007
@@ -24,6 +24,7 @@
 import javax.persistence.Entity;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 
 import entity.UuidEntity;
 
@@ -34,7 +35,8 @@
  * development). The annotation mode is by field.
  * 
  */
[EMAIL PROTECTED](name = "APP_PROTOCOL")
[EMAIL PROTECTED](name = "PROTOCOL")
[EMAIL PROTECTED](name = "APP_PROTOCOL")
 @NamedQueries( {
 @NamedQuery(name = ProtocolImpl.COUNT, query = 
ProtocolImpl.COUNT_QUERY),
 @NamedQuery(name = ProtocolImpl.FIND_ALL, query = 
ProtocolImpl.FIND_ALL_QUERY) })
@@ -49,7 +51,7 @@
  */
 public static final String COUNT = "Protocol.COUNT";
 
-private static final String COUNT_QUERY = "SELECT COUNT(*) FROM 
APP_PROTOCOL";
+private static final String COUNT_QUERY = "SELECT COUNT(*) FROM PROTOCOL";
 
 /**
  * 
@@ -58,7 +60,7 @@
  */
 public static final String FIND_ALL = "Protocol.FIND_ALL";
 
-private static final String FIND_ALL_QUERY = "SELECT p FROM APP_PROTOCOL 
p";
+private static final String FIND_ALL_QUERY = "SELECT p FROM PROTOCOL p";
 
 //  FIELDS 
 

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java?rev=601031&r1=601030&r2=601031&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
 Tue Dec  4 10:42:34 2007
@@ -27,6 +27,7 @@
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
 import entity.UuidEntity;
 import entity.protocol.Protocol;
@@ -45,17 +46,18 @@
 @NamedQuery(name = Subscription.COUNT, query = 
SubscriptionImpl.COUNT_QUERY),
 @NamedQuery(name = Subscription.FIND_ALL, query = 
SubscriptionImpl.FIND_ALL_QUERY),
 @NamedQuery(name = Subscription.FIND_BY_NAME, query = 
SubscriptionImpl.FIND_BY_NAME_QUERY) })
[EMAIL PROTECTED](name = "APP_SUBS

svn commit: r602851 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/entity/ main/java/entity/user/ test/java/action/user/ test/java/hello/

[husted]

Author: husted
Date: Mon Dec 10 02:41:53 2007
New Revision: 602851

URL: http://svn.apache.org/viewvc?rev=602851&view=rev
Log:
WW-1399 

Added:

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java
  - copied, changed from r599722, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java
  - copied, changed from r600483, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java
Removed:

struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
Modified:

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java

struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java?rev=602851&r1=602850&r2=602851&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
 Mon Dec 10 02:41:53 2007
@@ -50,12 +50,12 @@
  */
 static final String PERSISTENCE_UNIT = "entity";
 
-private static final EntityManagerFactory emf;
+private static final EntityManagerFactory factory;
 private static final ThreadLocal threadLocal;
 private static final Log logger;
 
 static {
-emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT);
+factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT);
 threadLocal = new ThreadLocal();
 logger = LogFactory.getLog(EntityManagerHelper.class);
 }
@@ -74,7 +74,7 @@
 public static EntityManager getEntityManager() {
 EntityManager manager = threadLocal.get();
 if (manager == null || !manager.isOpen()) {
-manager = emf.createEntityManager();
+manager = factory.createEntityManager();
 threadLocal.set(manager);
 }
 return manager;

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java?rev=602851&r1=602850&r2=602851&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
 Mon Dec 10 02:41:53 2007
@@ -50,9 +50,9 @@
 return result;
 }
 
-public UserImpl findByName(String value) {
-UserImpl result = (UserImpl) singleResult(UserImpl.FIND_BY_NAME,
-UserImpl.NAME, value);
+public User findByName(String value) {
+UserImpl result = (UserImpl) singleResult(User.FIND_BY_NAME,
+User.NAME, value);
 return result;
 }
 

Copied: 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java
 (from r599722, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java)
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java?p2=struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java&p1=struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java&r1=599722&r2=602851&rev=602851&view=diff
==
--- 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java
 Mon Dec 10 02:41:53 2007
@@ -5,7 +5,7 @@
 import entity.user.UserService;
 import entity.user.UserServiceImpl;
 
-public class autenticateTest extends TestCase {
+public class AuthenticateTest extends TestCase {
 
 UserService helper;
 

Copied: 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java 
(from r600483, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java)
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java?p2=struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java&p1=struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java&r1=600483&r2=602851&rev=602851&view=diff
==
--- struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest

svn commit: r611829 - /struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml

[husted]

Author: husted
Date: Mon Jan 14 07:23:36 2008
New Revision: 611829

URL: http://svn.apache.org/viewvc?rev=611829&view=rev
Log:
WW-2421 Move devMode true setting from web.xml in REST showcase application to 
the documentation page. 

Experience shows that if we set such things in examples, people will monkey 
them in production applications (and then blame the framework for poor 
performance). I strongly suggest that we try to make all examples both 
production-quality and production-ready. 

Modified:
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml

Modified: 
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml?rev=611829&r1=611828&r2=611829&view=diff
==
--- struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml 
(original)
+++ struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml Mon 
Jan 14 07:23:36 2008
@@ -1,34 +1,30 @@
 
 
-http://java.sun.com/xml/ns/j2ee"; 
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
+http://java.sun.com/xml/ns/j2ee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
-   
-   Struts 2 Rest Example
-   
-   
-   
-   
+
+  Struts 2 Rest Example
+
+
+  
+  
 
 action2
 
org.apache.struts2.dispatcher.FilterDispatcher
 
-   actionPackages
-   org.apache.struts2.rest.example
-
-
-   struts.devMode
-   true
+  actionPackages
+  org.apache.struts2.rest.example
 
 
 
-   
+
 
 action2
 /*
 
-   
+
 
 
 index.jsp

svn commit: r611995 [1/2] - in /struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo: struts_dojo.js struts_dojo.js.uncompressed.js

[husted]

Author: husted
Date: Mon Jan 14 18:23:31 2008
New Revision: 611995

URL: http://svn.apache.org/viewvc?rev=611995&view=rev
Log:
WW-2094 Reapply patch submitted by Benjamin McCann that was previously applied 
in r590970 and somehow rolled back by r591003. 

Modified:

struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js

struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js

Modified: 
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js?rev=611995&r1=611994&r2=611995&view=diff
==
--- 
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
 (original)
+++ 
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
 Mon Jan 14 18:23:31 2008
@@ -1,20 +1,20 @@
 /*
-   Copyright (c) 2004-2006, The Dojo Foundation
-   All Rights Reserved.
+  Copyright (c) 2004-2006, The Dojo Foundation
+  All Rights Reserved.
 
-   Licensed under the Academic Free License version 2.1 or above OR the
-   modified BSD license. For more information on Dojo licensing, see:
+  Licensed under the Academic Free License version 2.1 or above OR the
+  modified BSD license. For more information on Dojo licensing, see:
 
-   http://dojotoolkit.org/community/licensing.shtml
+http://dojotoolkit.org/community/licensing.shtml
 */
 
 /*
-   This is a compiled version of Dojo, built for deployment and not for
-   development. To get an editable version, please visit:
+  This is a compiled version of Dojo, built for deployment and not for
+  development. To get an editable version, please visit:
 
-   http://dojotoolkit.org
+http://dojotoolkit.org
 
-   for documentation and information on getting the source.
+  for documentation and information on getting the source.
 */
 
 if(typeof dojo=="undefined"){
@@ -16928,7 +16928,7 @@
 dojo.debug("adding selectedDate");
 dojo.html.addClass(this.clickedNode,this.classNames.selectedDate);
 this.selectedNode=this.clickedNode;
-}else{
+}else if(this.value){
 this._preInitUI(this.value,false,true);
 }
 this.clickedNode=null;

svn commit: r611998 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2: components/ComboBox.java impl/StrutsObjectFactory.java views/jsp/iterator/IteratorGeneratorTag.java views/jsp/iter

[husted]

Author: husted
Date: Mon Jan 14 19:05:26 2008
New Revision: 611998

URL: http://svn.apache.org/viewvc?rev=611998&view=rev
Log:
WW-2285 Apply FIXBUG patches supplied by Giovanni Azua Garcia.

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/SubsetIteratorTag.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java?rev=611998&r1=611997&r2=611998&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ComboBox.java
 Mon Jan 14 19:05:26 2008
@@ -137,17 +137,8 @@
 Map tmp = (Map) value;
 addParameter("list", MakeIterator.convert(tmp));
 addParameter("listKey", "key");
-addParameter("listValue", "value");
-} else if (value.getClass().isArray()) {
-Iterator i = MakeIterator.convert(value);
-addParameter("list", i);
-if (listKey != null) {
-addParameter("listKey", listKey);
-}
-if (listValue != null) {
-addParameter("listValue", listValue);
-}
-} else {
+addParameter("listValue", "value");
+} else { // also covers "if (value.getClass().isArray())"
 Iterator i = MakeIterator.convert(value);
 addParameter("list", i);
 if (listKey != null) {

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java?rev=611998&r1=611997&r2=611998&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
 Mon Jan 14 19:05:26 2008
@@ -44,7 +44,6 @@
 params.putAll(typeParams);
 if (refParams != null && !refParams.isEmpty())
 params.putAll(refParams);
-params.putAll(refParams);
 
 try {
 // interceptor instances are long-lived and used across user 
sessions, so don't try to pass in any extra

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java?rev=611998&r1=611997&r2=611998&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/iterator/IteratorGeneratorTag.java
 Mon Jan 14 19:05:26 2008
@@ -125,7 +125,7 @@
  *
  * @see org.apache.struts2.util.IteratorGenerator
  */
[EMAIL PROTECTED](name="generator", 
tldTagClass="org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag", 
[EMAIL PROTECTED](name="generator", 
tldTagClass="org.apache.struts2.views.jsp.iterator.IteratorGeneratorTag",
 description="Generate an iterator for a iterable source.")
 public class IteratorGeneratorTag extends StrutsBodyTagSupport {
 
@@ -175,7 +175,7 @@
 public void setId(String string) {
 setVar(string);
 }
-
+
 @StrutsTagAttribute(description="The name to store the resultant iterator 
into page context, if such name is supplied")
 public void setVar(String var) {
 this.var = var;
@@ -197,17 +197,8 @@
 int count = 0;
 if (countAttr != null && countAttr.length() > 0) {
 Object countObj = findValue(countAttr);
-if (countObj instanceof Integer) {
-count = ((Integer)countObj).intValue();
-}
-else if (countObj instanceof Float) {
-count = ((Float)countObj).intValue();
-}
-else if (count

svn commit: r611999 - in /struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components: AbstractRemoteBean.java Autocompleter.java DateTimePicker.java Submit.java TabbedPanel.jav

[husted]

Author: husted
Date: Mon Jan 14 19:06:41 2008
New Revision: 611999

URL: http://svn.apache.org/viewvc?rev=611999&view=rev
Log:
WW-2286 Apply FIXBUG patches supplied by Giovanni Azua Garcia.

Modified:

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TextArea.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java

struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TreeNode.java

Modified: 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java?rev=611999&r1=611998&r2=611999&view=diff
==
--- 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
 (original)
+++ 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
 Mon Jan 14 19:06:41 2008
@@ -34,6 +34,8 @@
  */
 public abstract class AbstractRemoteBean extends ClosingUIBean implements 
RemoteBean {
 
+final private static transient Random RANDOM = new Random();
+
 protected String href;
 protected String errorText;
 protected String executeScripts;
@@ -111,8 +113,11 @@
 boolean generateId = 
!(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
 addParameter("pushId", generateId);
 if ((this.id == null || this.id.length() == 0) && generateId) {
-Random random = new Random();
-this.id = "widget_" + Math.abs(random.nextInt());
+// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs 
+// 
http://findbugs.sourceforge.net/bugDescriptions.html#RV_ABSOLUTE_VALUE_OF_RANDOM_INT
+int nextInt = RANDOM.nextInt();
+nextInt = nextInt == Integer.MIN_VALUE ? Integer.MAX_VALUE : 
Math.abs(nextInt);  
+this.id = "widget_" + String.valueOf(nextInt);
 addParameter("id", this.id);
 }
 }

Modified: 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java?rev=611999&r1=611998&r2=611999&view=diff
==
--- 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
 (original)
+++ 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
 Mon Jan 14 19:06:41 2008
@@ -200,6 +200,7 @@
 public class Autocompleter extends ComboBox {
 public static final String TEMPLATE = "autocompleter";
 final private static String COMPONENT_NAME = Autocompleter.class.getName();
+private final static transient Random RANDOM = new Random();
 
 protected String forceValidOption;
 protected String searchType;
@@ -229,7 +230,7 @@
 protected String transport;
 protected String preload;
 protected String keyValue;
-
+
 public Autocompleter(ValueStack stack, HttpServletRequest request,
 HttpServletResponse response) {
 super(stack, request, response);
@@ -326,9 +327,11 @@
 boolean generateId = 
!(Boolean)stack.getContext().get(Head.PARSE_CONTENT);
 addParameter("pushId", generateId);
 if ((this.id == null || this.id.length() == 0) && generateId) {
-Random random = new Random();
-this.id = "widget_" + Math.abs(random.nextInt());
-addParameter("id", this.id);
+// resolves Math.abs(Integer.MIN_VALUE) issue reported by FindBugs 
+// 
http://findbugs.sourceforge.net/bugDescriptions.html#RV_ABSOLUTE_VALUE_OF_RANDOM_INT
+int nextInt = RANDOM.nextInt();
+nextInt = nextInt == Integer.MIN_VALUE ? Integer.MAX_VALUE : 
Math.abs(nextInt);  
+this.id = "widget_" + String.valueOf(nextInt);
 }
 }
 

Modified: 
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/com

svn commit: r612104 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ExecuteAndWaitInterceptor.java

[husted]

Author: husted
Date: Tue Jan 15 04:41:14 2008
New Revision: 612104

URL: http://svn.apache.org/viewvc?rev=612104&view=rev
Log:
WW-1741 make ExecuteAndWaitInterceptor token aware - Apply patch provided by 
Thomas Micheline.

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=612104&r1=612103&r2=612104&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
 Tue Jan 15 04:41:14 2008
@@ -30,6 +30,7 @@
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptor;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.util.TokenHelper;
 
 
 /**
@@ -195,13 +196,13 @@
 /**
  * Returns the name to associate the background process.  Override to 
change the way background processes
  * are mapped to requests.
- * 
+ *
  * @return the name of the background thread
  */
 protected String getBackgroundProcessName(ActionProxy proxy) {
 return proxy.getActionName();
 }
-
+
 /* (non-Javadoc)
  * @see 
com.opensymphony.xwork2.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork2.ActionInvocation)
  */
@@ -246,6 +247,10 @@
 .addParams(Collections.singletonMap("location", 
"/org/apache/struts2/interceptor/wait.ftl"))
 .build();
 results.put(WAIT, rc);
+}
+
+if (TokenHelper.getToken() != null) {
+session.put(TokenHelper.getTokenName(), 
TokenHelper.getToken());
 }
 
 return WAIT;

svn commit: r612335 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java

[husted]

Author: husted
Date: Tue Jan 15 18:30:21 2008
New Revision: 612335

URL: http://svn.apache.org/viewvc?rev=612335&view=rev
Log:
ww-2310 Extra option to make redirectAction supress empty parameters - Apply 
patch submitted by Dale Newfield

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?rev=612335&r1=612334&r2=612335&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 Tue Jan 15 18:30:21 2008
@@ -62,6 +62,9 @@
  * namespace - used to determine which namespace the action is in 
that we're redirecting to . If namespace is
  * null, this defaults to the current namespace
  *
+ * supressEmptyParameters - optional boolean (defaults to false) 
that can prevent parameters with no values
+ * from being included in the redirect URL.
+ *
  * 
  *
  * 
@@ -104,6 +107,8 @@
  *  <param name="reportType">pie</param>
  *  <param name="width">100</param>
  *  <param name="height">100</param>
+ *  <param name="empty"></param>
+ *  <param name="supressEmptyParameters">true</param>
  *   </result>
  *</action>
  * </package>
@@ -119,12 +124,13 @@
 
 /** The default parameter */
 public static final String DEFAULT_PARAM = "actionName";
-
+
 private static final Logger LOG = 
LoggerFactory.getLogger(ServletActionRedirectResult.class);
 
 protected String actionName;
 protected String namespace;
 protected String method;
+protected boolean supressEmptyParameters = false;
 
 private Map requestParameters = new LinkedHashMap();
 
@@ -146,10 +152,10 @@
 this.actionName = actionName;
 this.method = method;
 }
-
+
 protected List prohibitedResultParam = Arrays.asList(new String[] {
 DEFAULT_PARAM, "namespace", "method", "encode", "parse", 
"location",
-"prependServletContext" });
+"prependServletContext", "supressEmptyParameters" });
 
 /**
  * @see 
com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
@@ -179,6 +185,10 @@
 requestParameters.put(e.getKey().toString(),
 e.getValue() == null ? "":
 conditionalParse(e.getValue().toString(), 
invocation));
+String potentialValue = e.getValue() == null ? "": 
conditionalParse(e.getValue().toString(), invocation);
+if (!supressEmptyParameters || ((potentialValue != null) 
&& (potentialValue.length() > 0))) {
+  requestParameters.put(e.getKey().toString(), 
potentialValue);
+}
 }
 }
 }
@@ -216,6 +226,15 @@
  */
 public void setMethod(String method) {
 this.method = method;
+}
+
+/**
+ * Sets the supressEmptyParameters option
+ *
+ * @param suppress The new value for this option
+ */
+public void setSupressEmptyParameters(boolean supressEmptyParameters) {
+this.supressEmptyParameters = supressEmptyParameters;
 }
 
 /**

svn commit: r612336 - /struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl

[husted]

Author: husted
Date: Tue Jan 15 18:31:47 2008
New Revision: 612336

URL: http://svn.apache.org/viewvc?rev=612336&view=rev
Log:
WW-2383 option transfer select .ftl is brittle - Apply patch submitted by Dale 
Newfield 

Modified:

struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl?rev=612336&r1=612335&r2=612336&view=diff
==
--- 
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
 Tue Jan 15 18:31:47 2008
@@ -261,9 +261,7 @@
 <#t/>
 <#assign doubleItemKeyStr = doubleItemKey.toString() /><#t/>
 <#if parameters.doubleListValue?exists><#t/>
-<#if stack.findString(parameters.doubleListValue)?has_content><#t/>
-<#assign doubleItemValue = 
stack.findString(parameters.doubleListValue) /><#t/>
-<#t/>
+<#assign doubleItemValue = 
stack.findString(parameters.doubleListValue)!"" /><#t/>
 <#else><#t/>
 <#assign doubleItemValue = stack.findString('top') /><#t/>
 <#t/>
@@ -290,4 +288,4 @@
 
 
 
-
\ No newline at end of file
+

svn commit: r612481 - in /struts/struts2/trunk: apps/blank/ apps/showcase/ core/ plugins/codebehind/ plugins/dojo/ plugins/portlet/ plugins/sitegraph/ plugins/sitemesh/ plugins/spring/ plugins/struts1

[husted]

Author: husted
Date: Wed Jan 16 07:24:54 2008
New Revision: 612481

URL: http://svn.apache.org/viewvc?rev=612481&view=rev
Log:
WW-2423, WW-2425, WW-2426 Update Spring, DWR, Freemarker, and SiteMesh 
dependencies per patch provided by Al Sutton. 

Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/sitegraph/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
struts/struts2/trunk/plugins/struts1/pom.xml

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=612481&r1=612480&r2=612481&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Wed Jan 16 07:24:54 2008
@@ -59,7 +59,7 @@
 
 org.springframework
 spring-core
-2.0.7
+2.0.8
 test
 
 

Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=612481&r1=612480&r2=612481&view=diff
==
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Wed Jan 16 07:24:54 2008
@@ -133,12 +133,12 @@
 
 opensymphony
 sitemesh
-2.2.1
+2.3
 
 
 uk.ltd.getahead
 dwr
-1.1-beta-3
+1.1.1
 
 
 log4j

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=612481&r1=612480&r2=612481&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Jan 16 07:24:54 2008
@@ -240,7 +240,7 @@
 
 org.freemarker
 freemarker
-2.3.10
+2.3.11
 
 
 
@@ -267,7 +267,7 @@
 
 uk.ltd.getahead
 dwr
-1.1-beta-3
+1.1.1
 true
 
 
@@ -311,14 +311,14 @@
 
 org.springframework
 spring-mock
-2.0.7
+2.0.8
 true
 
 
 
 org.springframework
 spring-core
-2.0.7
+2.0.8
 test
 
 

Modified: struts/struts2/trunk/plugins/codebehind/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?rev=612481&r1=612480&r2=612481&view=diff
==
--- struts/struts2/trunk/plugins/codebehind/pom.xml (original)
+++ struts/struts2/trunk/plugins/codebehind/pom.xml Wed Jan 16 07:24:54 2008
@@ -56,13 +56,13 @@
 
 org.springframework
 spring-mock
-2.0.7
+2.0.8
 test
 
 
 org.springframework
 spring-core
-2.0.7
+2.0.8
 test
 
 

Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=612481&r1=612480&r2=612481&view=diff
==
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Wed Jan 16 07:24:54 2008
@@ -241,14 +241,14 @@
 
 org.springframework
 spring-mock
-2.0.7
+2.0.8
 true
 
 
 
 org.springframework
 spring-core
-2.0.7
+2.0.8
 test
 
 

Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=612481&r1=612480&r2=612481&view=diff
==
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Wed Jan 16 07:24:54 2008
@@ -123,25 +123,25 @@
 
 org.springframework
 spring-mock
-2.0.7
-   test
+2.0.8
+  test
 
-   
-   org.springframework
-   spring-portlet
-   2.0.7
-   

svn commit: r612695 - /struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl

[husted]

Author: husted
Date: Wed Jan 16 19:19:54 2008
New Revision: 612695

URL: http://svn.apache.org/viewvc?rev=612695&view=rev
Log:
WW-2236 doublemultiple doesn't work in doubleselect - Apply change suggested by 
Annie Wang. 

Modified:

struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?rev=612695&r1=612694&r2=612695&view=diff
==
--- 
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl 
(original)
+++ 
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl 
Wed Jan 16 19:19:54 2008
@@ -56,6 +56,9 @@
 <#if parameters.get("doubleSize")?exists>
  size="${parameters.get("doubleSize")?html}"<#rt/>
 
+<#if parameters.doubleMultiple?default(false)>
+ multiple="multiple"<#rt/>
+ 
 >
 
 

svn commit: r612799 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/config/BeanSelectionProvider.java resources/struts-default.xml

[husted]

Author: husted
Date: Thu Jan 17 03:56:38 2008
New Revision: 612799

URL: http://svn.apache.org/viewvc?rev=612799&view=rev
Log:
WW-2226 "TextProvider.class should not be registered as a Singleton" Apply 
patch provided by Darren Shepherd.

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml

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=612799&r1=612798&r2=612799&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 Jan 17 03:56:38 2008
@@ -117,7 +117,7 @@
  * com.opensymphony.xwork2.validator.ActionValidatorManager
  * struts.actionValidatorManager
  * singleton
- * Main interface for validation managers (regular and annotation 
based).  Handles both the loading of 
+ * Main interface for validation managers (regular and annotation 
based).  Handles both the loading of
  * configuration and the actual validation (since 2.1)
  *   
  *   
@@ -151,7 +151,7 @@
  * Matches patterns, such as action names, generally used in 
configuration (since 2.1)
  *   
  * 
- * 
+ *
  * 
  * 
  * 
@@ -174,7 +174,7 @@
 public class BeanSelectionProvider implements ConfigurationProvider {
 public static final String DEFAULT_BEAN_NAME = "struts";
 private static final Logger LOG = 
LoggerFactory.getLogger(BeanSelectionProvider.class);
-
+
 public void destroy() {
 // NO-OP
 }
@@ -182,10 +182,10 @@
 public void loadPackages() throws ConfigurationException {
 // NO-OP
 }
-
+
 public void init(Configuration configuration) throws 
ConfigurationException {
 // NO-OP
-
+
 }
 
 public boolean needsReload() {
@@ -195,7 +195,7 @@
 public void register(ContainerBuilder builder, LocatableProperties props) {
 alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY, 
builder, props);
 alias(XWorkConverter.class, StrutsConstants.STRUTS_XWORKCONVERTER, 
builder, props);
-alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, 
builder, props);
+alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, 
builder, props, Scope.DEFAULT);
 alias(ActionProxyFactory.class, 
StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
 alias(ObjectTypeDeterminer.class, 
StrutsConstants.STRUTS_OBJECTTYPEDETERMINER, builder, props);
 alias(ActionMapper.class, StrutsConstants.STRUTS_MAPPER_CLASS, 
builder, props);
@@ -208,7 +208,7 @@
 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");
 props.setProperty(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, 
"true");
@@ -218,21 +218,21 @@
 } else {
 props.setProperty("devMode", "false");
 }
-
+
 String val = 
props.getProperty(StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS);
 if (val != null) {
 props.setProperty("allowStaticMethodAccess", val);
 }
-
+
 // TODO: This should be moved to XWork after 2.0.4
 // struts.custom.i18n.resources
 
 
LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
-
+
 String bundles = 
props.getProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES);
-if (bundles != null && bundles.length() > 0) { 
+if (bundles != null && bundles.length() > 0) {
 StringTokenizer customBundles = new 
StringTokenizer(props.getProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES),
 ", ");
-
+
 while (customBundles.hasMoreTokens()) {
 String name = customBundles.nextToken();
 try {
@@ -241,14 +241,14 @@
 } catch (Exception e) {
 LOG.error("Could not find messages file " + name + 
".properties. Skipping");
 }
-} 
+}
 }
 

svn commit: r614488 - in /struts/struts2/trunk: core/pom.xml plugins/dojo/pom.xml

[husted]

Author: husted
Date: Wed Jan 23 02:56:48 2008
New Revision: 614488

URL: http://svn.apache.org/viewvc?rev=614488&view=rev
Log:
WW-2451 "Updated poms to use struts annotations 1.0.3-SNAPSHOT to fix 
dependency issue" Apply patch suggested by Al Sutton, but leave issue open 
pending a 1.0.3 release of Struts-Annotations. 

Modified:
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=614488&r1=614487&r2=614488&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Jan 23 02:56:48 2008
@@ -422,7 +422,7 @@
 
 org.apache.struts
 struts-annotations
-1.0.2
+1.0.3-SNAPSHOT
 true
 
 

Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=614488&r1=614487&r2=614488&view=diff
==
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Wed Jan 23 02:56:48 2008
@@ -258,7 +258,7 @@
 
 org.apache.struts
 struts-annotations
-1.0.2
+1.0.3-SNAPSHOT
 true
 
 

svn commit: r614751 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java

[husted]

Author: husted
Date: Wed Jan 23 16:29:34 2008
New Revision: 614751

URL: http://svn.apache.org/viewvc?rev=614751&view=rev
Log:
WW-2435 " tag does not evaluate Body" Apply patch suggested by Lukasz 
Racon.

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java?rev=614751&r1=614750&r2=614751&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Set.java 
Wed Jan 23 16:29:34 2008
@@ -101,7 +101,7 @@
 }
 
 body="";
-
+
 if ("application".equalsIgnoreCase(scope)) {
 stack.setValue("#application['" + getVar() + "']", o);
 } else if ("session".equalsIgnoreCase(scope)) {
@@ -118,14 +118,14 @@
 return super.end(writer, body);
 }
 
-/* 
+/*
  * TODO: set required=true when 'id' is dropped after 2.1
  */
 @StrutsTagAttribute(description="Name used to reference the value pushed 
into the Value Stack")
 public void setVar(String var) {
super.setVar(var);
 }
-
+
 @StrutsTagAttribute(description="Deprecated. Use 'var' instead")
 public void setName(String name) {
 setVar(name);
@@ -140,5 +140,10 @@
 @StrutsTagAttribute(description="The value that is assigned to the 
variable named name")
 public void setValue(String value) {
 this.value = value;
+}
+
+@Override
+public boolean usesBody() {
+return true;
 }
 }

svn commit: r614842 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/Label.java test/java/org/apache/struts2/TestAction.java test/java/org/apache/struts2/views/jsp/ui/Label

[husted]

Author: husted
Date: Thu Jan 24 03:09:59 2008
New Revision: 614842

URL: http://svn.apache.org/viewvc?rev=614842&view=rev
Log:
WW-2171 "Label tag does not use key attribute to lookup value in resources when 
using simple theme" Apply patch provided by Maja S Bratseth.

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java?rev=614842&r1=614841&r2=614842&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Label.java
 Thu Jan 24 03:09:59 2008
@@ -78,15 +78,17 @@
 addParameter("for", findString(forAttr));
 }
 
-// try value first, then name (this overrides the default behavior in 
the superclass)
+// try value, then key, then name (this overrides the default behavior 
in the superclass)
 if (value != null) {
 addParameter("nameValue", findString(value));
+} else if (key != null) {
+String expr = "%{getText('"+ key +"')}";
+addParameter("nameValue", findString(expr));
 } else if (name != null) {
 String expr = name;
 if (altSyntax()) {
 expr = "%{" + expr + "}";
 }
-
 addParameter("nameValue", findString(expr));
 }
 }

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java?rev=614842&r1=614841&r2=614842&view=diff
==
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java 
(original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java 
Thu Jan 24 03:09:59 2008
@@ -20,10 +20,7 @@
  */
 package org.apache.struts2;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.apache.struts2.views.jsp.ui.User;
 
@@ -49,6 +46,19 @@
 private List list2;
 private List list3;
 private SomeEnum status = SomeEnum.COMPLETED;
+
+private final Map texts = new HashMap();
+
+public void setText(String key, String value) {
+this.texts.put(key, value);
+}
+
+public String getText(String key) {
+if (this.texts.containsKey(key)) {
+return (String) this.texts.get(key);
+}
+return super.getText(key);
+}
 
 public Collection getCollection() {
 return collection;

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java?rev=614842&r1=614841&r2=614842&view=diff
==
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java
 Thu Jan 24 03:09:59 2008
@@ -108,4 +108,26 @@
 LabelTag tag = new LabelTag();
 verifyGenericProperties(tag, "xhtml", null);
 }
+
+public void testWithKey() throws Exception {
+TestAction testAction = (TestAction) action;
+final String key = "labelKey";
+final String value = "baz";
+testAction.setText(key, value);
+
+testAction.setFoo("notToBeOutput");
+
+LabelTag tag = new LabelTag();
+tag.setPageContext(pageContext);
+tag.setLabel("mylabel");
+tag.setFor("for");
+tag.setName("foo");
+tag.setKey(key);
+
+tag.doStartTag();
+tag.doEndTag();
+
+verify(LabelTest.class.getResource("Label-2.txt"));
+}
+
 }

svn commit: r618609 - in /struts/site/src/site/xdoc: announce-2007.xml announce.xml

[husted]

Author: husted
Date: Tue Feb  5 03:19:41 2008
New Revision: 618609

URL: http://svn.apache.org/viewvc?rev=618609&view=rev
Log:
WW-2421 Roll over announcements page for 2008. 

Added:
struts/site/src/site/xdoc/announce-2007.xml
  - copied unchanged from r618537, struts/site/src/site/xdoc/announce.xml
Removed:
struts/site/src/site/xdoc/announce.xml

svn commit: r618618 - in /struts: current/STATUS.txt site/src/site/xdoc/announce.xml site/src/site/xdoc/dev/volunteers.xml

[husted]

Author: husted
Date: Tue Feb  5 04:06:47 2008
New Revision: 618618

URL: http://svn.apache.org/viewvc?rev=618618&view=rev
Log:
WW-2421 Add new committer announcements, update status file, conform volunteer 
rosters, add new committers to rosters

Added:
struts/site/src/site/xdoc/announce.xml
Modified:
struts/current/STATUS.txt
struts/site/src/site/xdoc/dev/volunteers.xml

Modified: struts/current/STATUS.txt
URL: 
http://svn.apache.org/viewvc/struts/current/STATUS.txt?rev=618618&r1=618617&r2=618618&view=diff
==
--- struts/current/STATUS.txt (original)
+++ struts/current/STATUS.txt Tue Feb  5 04:06:47 2008
@@ -37,37 +37,71 @@
 
 Other Active Committers
 
-* Michael Jouravlev  (mikus at apache.org)
+* Michael Jouravlev (mikus at apache.org)
 * Bob Lee (crazybob at apache.org)
 * Nils-Helge Garli (nilsga at apache.org)
 * David H. DeWolf (ddewolf at apache.org)
 * Philip Luppens (phil at apache.org)
 * Tom Schneider (tschneider at apache.org) 
+* Wes Wannemacher (wesw at apache.org)
+* Jeromy Evans (jeromy at apache.org)
 
-Emeritus PMC Members
+Emeritus Volunteers
 
-* David M. Karr (dmkarr at apache.org)
-* David Graham (dgraham at apache.org)
-* Steve Raeburn (sraeburn at apache.org)
-* Eddie Bush  (ekbush at apache.org)
-* Henri Yandell (bayard at apache.org)
-
-Emeritus Committers 
-
-* Richard Feit  (rich at apache.org)
-* David Geary (dgeary at apache.org)
-* James Turner (turner at blackbear.com)
 * Luis Arias
+* David Geary (dgeary at apache.org)
 * Pierre Delilse
 * Michael Schachter
+* Rob Leland
 * Vincent Massol
-* David Winterfeldt
 * Oleg Alexeev
-* Rob Leland
+* David Winterfeldt
 * Arron Bates
-* Steve Raeburn
-* James Turner
+* David M. Karr (PMC) (dmkarr at apache.org)
+* Eddie Bush  (ekbush at apache.org)
+* David Graham (PMC) (dgraham at apache.org)
+* James Turner (turner at blackbear.com)
+* Steve Raeburn (PMC) (sraeburn at apache.org)
+* Richard Feit  (rich at apache.org)
+* Henri Yandell (PMC) (bayard at apache.org)
+
+
+
+2008 Board Reports 
+
+January 2008 -- RESTing
+
+Work on Struts 2 continues apace. During this last quarter, we released 
+Struts 2.0.11 as GA, and produced a first test build of the Struts 2.1 
+code line. Struts 1 is garnering less attention these days, but there is 
+still a rivulet of bug fixes and other patches, albeit without any releases 
+this quarter.
+
+At ApacheCon in Atlanta, our own Don Brown presented an excellent session 
+entitled "Go Light with Apache Struts 2 and REST", fitting in nicely with 
+a number of other REST-related sessions at the conference. The combined 
+Roller / Struts 2 BOF had fewer attendees than we might have hoped for, but 
+resulted in some productive discussion. Disappointingly, the Struts-related 
+tutorials were canceled due to insufficient sign-ups.
+
+During this quarter, we added Musachy Barroso to the PMC, and removed Henri 
+Yandell at his request. No new committers joined us this quarter.
+
+2008 PROJECT VOTES AND DECISIONS 
+
+Jeromy Evans for Committer
+ * [24 Jan 2008] 5 +1 (binding)
+
+Wes Wannemacher for Committer
+ * [24 Jan 2008] 6 +1 (binding)
 
+Should voting +1 on a release imply that the voter intends to help support 
+the release?
+ * [14 Jan 2008] General consensus is that the PMC is acting as a quality 
+   control group, and a binding vote indicates that a member has reviewed 
+   the distribution, and, ideally, has tested or deployed the software in 
+   their own environment.
+ 
 
 
 2007 Board Reports

Added: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=618618&view=auto
==
--- struts/site/src/site/xdoc/announce.xml (added)
+++ struts/site/src/site/xdoc/announce.xml Tue Feb  5 04:06:47 2008
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+Announcements
+
+
+
+
+
+
+Skip to: Announcements - 2007
+
+
+4 February 2008 - New Struts Committer Jeromy 
Evans
+
+Please join us in welcoming Jeromy Evans as a new Struts 
committer.
+
+
+Jeromy has been posting to the user list since May 2007, and 
to dev@
+since July 2007, and has submitted two issues to JIRA, both 
with
+patches.
+
+
+Welcome, jeromy@ ... WW-2398 is all yours now!
+
+
+  PMC vote: 5 +1s
+
+
+4 February 2008 - New Struts Committer Wes 
Wannemacher
+
+  Please join us in welcoming Wes Wannemacher as a new Struts 
committer.
+
+  

svn commit: r618667 - in /struts: current/STATUS.txt site/src/site/xdoc/dev/volunteers.xml

[husted]

Author: husted
Date: Tue Feb  5 07:04:11 2008
New Revision: 618667

URL: http://svn.apache.org/viewvc?rev=618667&view=rev
Log:
SITE-23 Move content from STATUS.txt file to a dev/minutes.xml page, to ease 
and promote maintenance. 

Modified:
struts/current/STATUS.txt
struts/site/src/site/xdoc/dev/volunteers.xml

Modified: struts/current/STATUS.txt
URL: 
http://svn.apache.org/viewvc/struts/current/STATUS.txt?rev=618667&r1=618666&r2=618667&view=diff
==
--- struts/current/STATUS.txt (original)
+++ struts/current/STATUS.txt Tue Feb  5 07:04:11 2008
@@ -6,853 +6,8 @@
 JIRA Issue Tracking: http://issues.apache.org/struts/
 Source Code: http://svn.apache.org/viewvc/struts/
 Announcements: http://struts.apache.org/announce.html
-
-PMC Members
-
-* Craig R. McClanahan  (craigmcc at apache.org)
-    * Ted Husted (husted at apache.org)
-* Cedric Dumoulin (cedric at apache.org)
-* Martin Cooper, Vice President and Chair (martinc at apache.org)
-* James Holmes (jholmes at apache.org)
-* James Mitchell (jmitchell at apache.org)
-* Don Brown (mrdon at apache.org)
-* Joe Germuska (germuska at apache.org)
-* Niall Pemberton (niallp at apache.org)
-* Hubert Rabago (hrabago at apache.org)
-* Wendy Smoak (wsmoak at apache.org)
-* Gary VanMatre (gvanmatre at apache.org)
-* Sean Schofield (schof at apache.org)
-* Greg Reddin (greddin at apache.org)
-* Laurie Harper  (laurieh at apache.org)
-* Jason Carreira (jcarreira at apache.org)
-* Patrick Lightbody (plightbo at apache.org)
-* Alexandru Popescu (apopescu at apache.org)
-* Rene Gielen (rgielen at apache.org)
-* Rainer Hermanns (hermanns at apache.org)
-* Toby Jee (tmjee at apache.org)
-* Ian Roughley (roughley at apache.org) 
-* Paul Benedict  (pbenedict at apache.org)
-* Antonio Petrelli (apetrelli at apache.org) 
-* Musachy Barroso (musachy at apache.org)
-
-Other Active Committers
-
-* Michael Jouravlev (mikus at apache.org)
-* Bob Lee (crazybob at apache.org)
-* Nils-Helge Garli (nilsga at apache.org)
-* David H. DeWolf (ddewolf at apache.org)
-* Philip Luppens (phil at apache.org)
-* Tom Schneider (tschneider at apache.org) 
-* Wes Wannemacher (wesw at apache.org)
-* Jeromy Evans (jeromy at apache.org)
-
-Emeritus Volunteers
-
-* Luis Arias
-* David Geary (dgeary at apache.org)
-* Pierre Delilse
-* Michael Schachter
-* Rob Leland
-* Vincent Massol
-* Oleg Alexeev
-* David Winterfeldt
-* Arron Bates
-* David M. Karr (PMC) (dmkarr at apache.org)
-* Eddie Bush  (ekbush at apache.org)
-* David Graham (PMC) (dgraham at apache.org)
-* James Turner (turner at blackbear.com)
-* Steve Raeburn (PMC) (sraeburn at apache.org)
-* Richard Feit  (rich at apache.org)
-* Henri Yandell (PMC) (bayard at apache.org)
-
-
-
-2008 Board Reports 
-
-January 2008 -- RESTing
-
-Work on Struts 2 continues apace. During this last quarter, we released 
-Struts 2.0.11 as GA, and produced a first test build of the Struts 2.1 
-code line. Struts 1 is garnering less attention these days, but there is 
-still a rivulet of bug fixes and other patches, albeit without any releases 
-this quarter.
-
-At ApacheCon in Atlanta, our own Don Brown presented an excellent session 
-entitled "Go Light with Apache Struts 2 and REST", fitting in nicely with 
-a number of other REST-related sessions at the conference. The combined 
-Roller / Struts 2 BOF had fewer attendees than we might have hoped for, but 
-resulted in some productive discussion. Disappointingly, the Struts-related 
-tutorials were canceled due to insufficient sign-ups.
-
-During this quarter, we added Musachy Barroso to the PMC, and removed Henri 
-Yandell at his request. No new committers joined us this quarter.
-
-2008 PROJECT VOTES AND DECISIONS 
-
-Jeromy Evans for Committer
- * [24 Jan 2008] 5 +1 (binding)
-
-Wes Wannemacher for Committer
- * [24 Jan 2008] 6 +1 (binding)
-
-Should voting +1 on a release imply that the voter intends to help support 
-the release?
- * [14 Jan 2008] General consensus is that the PMC is acting as a quality 
-   control group, and a binding vote indicates that a member has reviewed 
-   the distribution, and, ideally, has tested or deployed the software in 
-   their own environment.
- 
-
-
-2007 Board Reports
-
-October 2007 -- Planet Struts
-
-There has been a lot of activity over the last quarter, especially on
-Struts 2. We released Struts 2.0.9 as GA, which includes an important
-security fix, and released Struts 1.3.9 as Beta. Our registry of Struts 2
-plugins continues to grow, with 30 distinct plugins now registered, many
-written by developers outside the project. The number of authors
-contributing to our official documentation wiki also continues to grow.
-
-On the infrastructure side, the Struts se

svn commit: r619260 - /struts/site/src/site/xdoc/dev/minutes.xml

[husted]

Author: husted
Date: Wed Feb  6 20:37:36 2008
New Revision: 619260

URL: http://svn.apache.org/viewvc?rev=619260&view=rev
Log:
SITE-23 Move content from STATUS.txt file to a dev/minutes.xml page, to ease 
and promote maintenance.

Added:
struts/site/src/site/xdoc/dev/minutes.xml

Added: struts/site/src/site/xdoc/dev/minutes.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/minutes.xml?rev=619260&view=auto
==
--- struts/site/src/site/xdoc/dev/minutes.xml (added)
+++ struts/site/src/site/xdoc/dev/minutes.xml Wed Feb  6 20:37:36 2008
@@ -0,0 +1,850 @@
+
+
+
+
+
+
+Minutes
+
+
+
+
+
+  
+The Apache Struts PMC meets continuously and asynchronously over the mailing
+lists provided by the project. Major decisions made by the PMC are noted
+here, as a convenient reference. For details. consult the mailing list
+archives, or inquire on the appropriate list. All project business is
+conducted over the mailing lists, and nowhere else.
+  
+
+
+
+  
+January 2008 -- RESTing
+  
+  
+Work on Struts 2 continues apace. During this last quarter, we released
+Struts 2.0.11 as GA, and produced a first test build of the Struts 2.1
+code line. Struts 1 is garnering less attention these days, but there is
+still a rivulet of bug fixes and other patches, albeit without any releases
+this quarter.
+  
+  
+At ApacheCon in Atlanta, our own Don Brown presented an excellent session
+entitled "Go Light with Apache Struts 2 and REST", fitting in nicely with
+a number of other REST-related sessions at the conference. The combined
+Roller / Struts 2 BOF had fewer attendees than we might have hoped for, but
+resulted in some productive discussion. Disappointingly, the Struts-related
+tutorials were canceled due to insufficient sign-ups.
+  
+  
+During this quarter, we added Musachy Barroso to the PMC, and removed Henri
+Yandell at his request. No new committers joined us this quarter.
+  
+
+
+
+
+  
+Jeromy Evans for Committer -- [24 Jan 2008] 5 +1 (binding)
+  
+  
+Wes Wannemacher for Committer -- [24 Jan 2008] 6 +1 (binding)
+  
+  
+Should voting +1 on a release imply that the voter intends to help support
+the release? - [14 Jan 2008] General feeling is that the PMC is acting as a
+quality control group, and a binding vote indicates that a member has
+reviewed the distribution, and, ideally, has tested or deployed the software
+in their own environment.
+  
+
+
+  
+
+
+ 
+October 2007 -- Planet Struts
+  
+  
+There has been a lot of activity over the last quarter, especially on
+Struts 2. We released Struts 2.0.9 as GA, which includes an important
+security fix, and released Struts 1.3.9 as Beta. Our registry of Struts 2
+plugins continues to grow, with 30 distinct plugins now registered, many
+written by developers outside the project. The number of authors
+contributing to our official documentation wiki also continues to grow.
+  
+  
+On the infrastructure side, the Struts security alias, mentioned in last
+quarter's report, has now been set up, and Planet Struts was the first "PMC
+Planet" to be created, thanks to Sam Ruby and Ted Husted. Prompted by
+infrastructure@, we handed back 1.6GB of disk space on people.a.o that we
+didn't actually need.
+  
+  
+At ApacheCon US 2007 in Atlanta next month, two tutorials and one session
+will focus on Struts 2, and we expect at least six Struts committers to be
+in attendance. A session on Struts 2 will also be presented at OS Summit
+Asia 2007.
+  
+  
+During this quarter, we have added three new committers (Matt Raible, Dave
+Newton, and Brian Pontarelli) and two new PMC members (Henri Yandell and
+Antonio Petrelli).
+  
+  
+July 2007 -- [EMAIL PROTECTED]
+  
+  
+Things have been running smoothly this last quarter, with little of
+note for the board at this time.
+  
+  
+We have had one GA release, of Struts 2.0.8, and a test build of
+Struts 1.3.9 is up for a quality vote at this time. Both Struts
+2.1 and Struts 1.4 are under active development.
+  
+  
+Prompted by a user trying to report a security vulnerability in
+Struts, we have requested a [EMAIL PROTECTED] alias, which we hope will
+be set up shortly. (We believe the reported vulnerability had already
+been resolved.)
+  
+  
+No new committers or PMC members have been added in the last quarter.
+  
+  
+March 2007 -- Bamboo online
+  
+  
+This quarter, we made up for the absence of releases in the previous
+quarter, with GA releases of both Struts 1.3.8 and Struts 2.0.6. The

svn commit: r619268 - in /struts/site/src/site: site.xml xdoc/dev/bylaws.xml xdoc/dev/minutes.xml xdoc/dev/site.xml xdoc/dev/volunteers.xml

[husted]

Author: husted
Date: Wed Feb  6 21:22:00 2008
New Revision: 619268

URL: http://svn.apache.org/viewvc?rev=619268&view=rev
Log:
SITE-23 From charter, remove sections that overlap "How it works" and 
incorporate "How it works" by reference. Mention that release plans can also be 
posted in documentation. Add Sandbox section. 

Modified:
struts/site/src/site/site.xml
struts/site/src/site/xdoc/dev/bylaws.xml
struts/site/src/site/xdoc/dev/minutes.xml
struts/site/src/site/xdoc/dev/site.xml
struts/site/src/site/xdoc/dev/volunteers.xml

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=619268&r1=619267&r2=619268&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Wed Feb  6 21:22:00 2008
@@ -106,23 +106,28 @@
 />
 
 
 
 
 
+
+
 http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/bylaws.xml?rev=619268&r1=619267&r2=619268&view=diff
==
--- struts/site/src/site/xdoc/dev/bylaws.xml (original)
+++ struts/site/src/site/xdoc/dev/bylaws.xml Wed Feb  6 21:22:00 2008
@@ -38,76 +38,14 @@
 Bylaws
 and the direction of the ASF Board.
 
-
-
-
-
-The roles and responsibilities that people can assume in
-the project
-are based on merit. Everybody can help no matter what
-their role.
-Those who have been longterm or valuable contributors to
-the project
-can earn the right to commit directly to the source
-repository and to
-cast binding votes during the decision-making process.
-
-
-
-Users.
-Users are the people who use the products of the Project.
-People in
-this role aren't contributing code, but they are using the
-products,
-reporting bugs, making feature requests, and such. This is
-by far
-the most important category of people as, without users,
-there is no
-reason for the Project. When a user starts to contribute
-code or
-documentation patches, they become a Contributor.
-
-
-
-Contributors.
-Contributors are the people who write code or
-documentation patches or
-contribute positively to the project in other ways. When a
-volunteer's
-patch is applied, the contribution is recognized in the
-version control
-log.
-
-
-
-Committers.
-Contributors who give frequent and valuable contributions
-to a
-subproject of the Project can have their status promoted
-to that of
-a "
-Committer
-" for that subproject. A Committer
-has write access to the source code repository. Committer
-status is
-granted by the Project Management Committee by majority
-vote.
-
-
-
-Project Management Committee (PMC).
-Committers and other volunteers who frequently participate
-with
-valuable contributions may have their status promoted to
-that of a
-"
-Project Management Committee Member
-". The PMC
-is responsible for the day-to-day management of the
-Project.
-
-
-
+
+
+The Project Charter incorporates by reference 
+the current version of 
+http://apache.org/foundation/how-it-works.html";>
+How the ASF works, with the additional guidelines 
+and clarifications found herein.
+
 
 
 
@@ -184,17 +122,18 @@
 
 
 
+
 
 
 
 
-All Volunteers are encouraged to participate in decisions,
-but the
-decision itsel

svn commit: r411379 - in /struts/site/src/site: site.xml xdoc/announce.xml

[husted]

Author: husted
Date: Fri Jun  2 21:39:24 2006
New Revision: 411379

URL: http://svn.apache.org/viewvc?rev=411379&view=rev
Log:
Site 
* Add announcements

Modified:
struts/site/src/site/site.xml
struts/site/src/site/xdoc/announce.xml

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=411379&r1=411378&r2=411379&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Fri Jun  2 21:39:24 2006
@@ -66,7 +66,7 @@
 
 
 http://struts.apache.org/struts-action/index.html"/>
-http://confluence.twdata.org/display/WW/Home"/>
+http://struts.apache.org/struts-action2/index.html"/>
 http://struts.apache.org/struts-shale/index.html"/>
 
 

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=411379&r1=411378&r2=411379&view=diff
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Fri Jun  2 21:39:24 2006
@@ -25,13 +25,97 @@
 
 
 
+
+03 Jun 2006 - New Struts Committer: 
+   Bob Lee
+
+   Please join us in welcoming Bob Lee as a new Struts committer. 
+
+
+   Some of us have known Bob for several years through his Struts, 
+   WebWork, and Dynaop work, or in person from a conference. 
+   At this last JavaOne, he met other PMC members: Craig, Martin, 
+   Gary, and Wendy -- and Bob is well known to the WebWork folks.
+
+
+   Bob's current focus is to develop a kinder, gentler API for 
+   Action 2, having already submitted several patches and 
+   http://wiki.apache.org/struts/RoughSpots";>
+   constructively engaged the community 
+   while handling criticisms well. He has committed several 
+   patches for WebWork and Xwork, started the Dynaop project, 
+   and has been peripherally involved in the Struts community 
+   for many years.  
+
+
+   Welcome, Bob  ... Our only worry is that we haven't yet seen 
+   the Crazy part of Crazy Bob.
+
+
+   PMC vote: 8 +1 (binding), 4 +1 (non-binding).
+
+
+
+03 Jun 2006 - New Struts Committer: Michael 
+   Jouravlev
+
+   Please join us in welcoming Michael Jouravlev as a new Struts 
+   committer. 
+
+
+   Michael has been an active member of our community for a very 
+   long time. His posts to user@ and dev@ are consistently 
+   helpful. Michael often participates in development 
+   discussions, including the Action2 discussions. He has 
+   http://tinyurl.com/ls7ga";>
+   submitted code and patches and collaborated on changes 
+   that were accepted to the code base.
+
+
+   Michael has also make many contributions to the wiki, 
+   including reorganizing the area so that it is more useful to 
+   others.
+
+
+   Welcome, Michael ... Just don't start downsizing the fonts :)
+
+
+   PMC vote: 7 +1.
+
+
 
-23 March 2006 - Struts Shale Framework 1.0.2 
Alpha
-
+03 Jun 2006 - New Struts Committer: 
+
+   Please join us in welcoming Paul Benedict as a new Struts 
+   committer. 
+   
+   
+   Paul has been an earnest and helpful member of our community 
+   for well over a year now. He has submitted patches and ideas, 
+   andvmany useful posts to the user list. Paul was particularly 
+   active in the 
+   http://issues.apache.org/bugzilla/show_bug.cgi?id=38374";>
+   discussion 
+   that lead to the addition of the "Opt-in Cancel" feature, 
+   
+   
+   In this and other discussions, Paul has demonstrated an 
+   ability to collaborate with others and create a better 
+   solution than the one originally proposed. 
+   
+   
+   Welcome, Paul ... Hey, we're always looking for release
+   managers! 
+   
+   
+   PMC v

svn commit: r413565 [2/4] - in /struts/site/src/site: ./ fml/ xdoc/

[husted]

  17 Jan 2006 - New Struts Committers: Jason
-Carreira
-and Patrick Lightbody
-
-Please join me in welcoming Jason Carreira and Patrick
-Lightbody as new
-Struts committers. Jason and Patrick are the core WebWork 2
-developers
-and they are joining us in an important step in the merger
-process. I, and
-many other Struts committers, have personally met and talked
-at length with
-both Patrick and Jason on several occasions and find them
-dedicated,
-skilled, and team players. Their dedication to WebWork 2 over
-the years is
-a testament to their perseverance, commitment to their
-community, and
-technical skill. We look forward to their contributions as
-committers.
-
-
-
-Welcome Jason and Patrick!
-
-
-PMC vote: 8 +1
-
-
-
-18 Dec 2005 - New Struts Committer: Richard
-Feit
-
-Please join us in welcoming Rich Feit as a new Struts
-committer. Rich is
-a Beehive committer and PMC member. In addition to being a
-Struts user
-for years (Beehive is built on Struts), he has been pivotal in
-designing
-and coding Struts Ti, both the initial annotationed Beehive
-version and
-the current WebWork merger effort. His experience in Struts
-migration
-tools in particular will be key to making Struts Action a
-success. We
-look forward to his continued contributions as a committer.
-
-
-
-Welcome, Rich!
-
-
-PMC vote: 7 +1, non-binding committer votes: 3 +1
-
-
-
-14 Dec 2005 - Apache Struts to release Struts
-1.3.0
-as the "Action Framework"
-
-The Apache Struts flagship product,
-the leading web application framework for Java,
-is now known as the "Struts Action Framework".
-
-
-
-To make the framework easier to maintain,
-Apache Struts subdivided the original monolithic distribution
-into several
-subprojects.
-Each subproject has its own website, documentation, and
-release cycle,
-and may be downloaded separately.
-For consistency, the original core framework component also
-has its own name
-now: "Struts Action Framework".
-The JARs and external dependencies for the extensions to
-Struts Action Framework
-are being bundled into a convenient distribution known as the
-"Struts Action
-Framework Library".
-
-
-
-The Struts Action Framework 1.3.0 release will include several
-exciting new
-features, including:
-
-
-
-Composable Request Processor
-ActionDynaForm interfaces
-Arbitrary configuration properties
-Catalog and Command Elements
-Enhanced Global Exception Handlers
-Extends attribute for XML configurations
-"isCommitted" Exception Handling
-Postback Actions
-Wildcard ActionConfig properties
-
-
-
-The key change in this release is the "composable request
-processor".
-The request processor is the framework's "kernal".
-The request processor methods are now command objects in a
-flexible chain of
-commands.
-Rather than subclassing a monolithic object,
-developers can now just replace commands with their own
-implementations.
-Commands can also be inserted or removed, if needed,
-to extend or streamline the request processing gauntlet,
-to better meet the needs of different kinds of applications.
-
-
-
-The Struts Action Framework 1.3.0 release,
-and other milestones on the Apache Struts roadmap,
-were discussed at ApacheCon on Tuesday, December 13, 2005, in
-a talk,
-entitled "Str

svn commit: r413565 [4/4] - in /struts/site/src/site: ./ fml/ xdoc/

[husted]

Modified: struts/site/src/site/xdoc/announce.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=413565&r1=413564&r2=413565&view=diff
==
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Sun Jun 11 19:33:57 2006
@@ -84,7 +84,8 @@
 
 
 
-03 Jun 2006 - New Struts Committer: 
+03 Jun 2006 - New Struts Committer: Paul 
+   Benedict
 
Please join us in welcoming Paul Benedict as a new Struts 
committer. 
@@ -266,1057 +267,12 @@
 
 
 
-18 Dec 2005 - New Struts Committer: Richard
-Feit
-
-Please join us in welcoming Rich Feit as a new Struts
-committer. Rich is
-a Beehive committer and PMC member. In addition to being a
-Struts user
-for years (Beehive is built on Struts), he has been pivotal in
-designing
-and coding Struts Ti, both the initial annotationed Beehive
-version and
-the current WebWork merger effort. His experience in Struts
-migration
-tools in particular will be key to making Struts Action a
-success. We
-look forward to his continued contributions as a committer.
-
-
-
-Welcome, Rich!
-
-
-PMC vote: 7 +1, non-binding committer votes: 3 +1
-
-
-
-14 Dec 2005 - Apache Struts to release Struts
-1.3.0
-as the "Action Framework"
-
-The Apache Struts flagship product,
-the leading web application framework for Java,
-is now known as the "Struts Action Framework".
-
-
-
-To make the framework easier to maintain,
-Apache Struts subdivided the original monolithic distribution
-into several
-subprojects.
-Each subproject has its own website, documentation, and
-release cycle,
-and may be downloaded separately.
-For consistency, the original core framework component also
-has its own name
-now: "Struts Action Framework".
-The JARs and external dependencies for the extensions to
-Struts Action Framework
-are being bundled into a convenient distribution known as the
-"Struts Action
-Framework Library".
-
-
-
-The Struts Action Framework 1.3.0 release will include several
-exciting new
-features, including:
-
-
-
-Composable Request Processor
-ActionDynaForm interfaces
-Arbitrary configuration properties
-Catalog and Command Elements
-Enhanced Global Exception Handlers
-Extends attribute for XML configurations
-"isCommitted" Exception Handling
-Postback Actions
-Wildcard ActionConfig properties
-
-
-
-The key change in this release is the "composable request
-processor".
-The request processor is the framework's "kernal".
-The request processor methods are now command objects in a
-flexible chain of
-commands.
-Rather than subclassing a monolithic object,
-developers can now just replace commands with their own
-implementations.
-Commands can also be inserted or removed, if needed,
-to extend or streamline the request processing gauntlet,
-to better meet the needs of different kinds of applications.
-
-
-
-The Struts Action Framework 1.3.0 release,
-and other milestones on the Apache Struts roadmap,
-were discussed at ApacheCon on Tuesday, December 13, 2005, in
-a talk,
-entitled "Struts 2006: An Embarrassment of Riches".
-http://people.apache.org/~husted/apachecon-2005-action.pdf";>
-Slides from the talk are available online
-.
-
-
-
-14 Dec 2005 - Apache Struts and Open Symphony
-WebWork
-communities to merge
-
-Apache St

svn commit: r413567 - in /struts/site/src/site/xdoc: annouce-2002.xml annouce-2003.xml annouce-2004.xml annouce-2005.xml announce-2002.xml announce-2003.xml announce-2004.xml announce-2005.xml

[husted]

Author: husted
Date: Sun Jun 11 19:41:03 2006
New Revision: 413567

URL: http://svn.apache.org/viewvc?rev=413567&view=rev
Log:
Action site
* Fix file names.


Added:
struts/site/src/site/xdoc/announce-2002.xml
  - copied unchanged from r413565, 
struts/site/src/site/xdoc/annouce-2002.xml
struts/site/src/site/xdoc/announce-2003.xml
  - copied unchanged from r413565, 
struts/site/src/site/xdoc/annouce-2003.xml
struts/site/src/site/xdoc/announce-2004.xml
  - copied, changed from r413565, struts/site/src/site/xdoc/annouce-2004.xml
struts/site/src/site/xdoc/announce-2005.xml
  - copied unchanged from r413565, 
struts/site/src/site/xdoc/annouce-2005.xml
Removed:
struts/site/src/site/xdoc/annouce-2002.xml
struts/site/src/site/xdoc/annouce-2003.xml
struts/site/src/site/xdoc/annouce-2004.xml
struts/site/src/site/xdoc/annouce-2005.xml

Copied: struts/site/src/site/xdoc/announce-2004.xml (from r413565, 
struts/site/src/site/xdoc/annouce-2004.xml)
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2004.xml?p2=struts/site/src/site/xdoc/announce-2004.xml&p1=struts/site/src/site/xdoc/annouce-2004.xml&r1=413565&r2=413567&rev=413567&view=diff
==
--- struts/site/src/site/xdoc/annouce-2004.xml (original)
+++ struts/site/src/site/xdoc/announce-2004.xml Sun Jun 11 19:41:03 2006
@@ -171,7 +171,7 @@
 
 
 Next:
-Announcements - 2003
+Announcements - 2003
 
 
 

svn commit: r419560 - in /struts/site/src/site: fml/helping.fml fml/kickstart.fml fml/roadmap.fml xdoc/announce-2005.xml xdoc/announce.xml xdoc/index.xml xdoc/mail.xml xdoc/volunteers.xml

[husted]

Author: husted
Date: Thu Jul  6 07:13:00 2006
New Revision: 419560

URL: http://svn.apache.org/viewvc?rev=419560&view=rev
Log:
=SITE-8 : Crib layout of welcome page from Cocoon; other SAF # to Struts # 
updates. 

Modified:
struts/site/src/site/fml/helping.fml
struts/site/src/site/fml/kickstart.fml
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/announce-2005.xml
struts/site/src/site/xdoc/announce.xml
struts/site/src/site/xdoc/index.xml
struts/site/src/site/xdoc/mail.xml
struts/site/src/site/xdoc/volunteers.xml

Modified: struts/site/src/site/fml/helping.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/helping.fml?rev=419560&r1=419559&r2=419560&view=diff
==
--- struts/site/src/site/fml/helping.fml (original)
+++ struts/site/src/site/fml/helping.fml Thu Jul  6 07:13:00 2006
@@ -305,12 +305,10 @@
 through the
 http://issues.apache.org/struts/";>Apache Struts 
 JIRA instance.
-Please select
-Struts
-from the product list, along with
-the details of which component of Struts you feel this
-report
-relates to, and details of your operating environment.
+Please select the appropriate Apache Struts product from 
+the list, 
+and then select the component to which you feel this report
+relates.
 You will automatically be notified by email as the status
 of your defect or
 enhancement report changes.
@@ -318,7 +316,7 @@
 http://www.chiark.greenend.org.uk/~sgtatham/bugs.html";>
 How to
 Report Bugs Effectively
-before posting.
+before posting a report.
 
 
 
@@ -478,27 +476,34 @@
 How can I contribute to the
 documentation?
 
-
+
+   
+   The Struts 2 documentation is maintained using a 
+   Atlassian Confluence wiki and then exported to HTML 
+   for viewing on the website. 
+   To help out, 
+   http://confluence.twdata.org/display/WW/Home";>
+   sign up for account on the wiki.
+
 
-The documentation is maintained in the repository
+The Struts 1 documentation is maintained in the repository
 under
 the
 xdocs
 folder for the subproject.
 To build just the documentation for a subproject,
 change to the subprojects trunk directory and run
-maven site
-.
+maven site..
 The Maven build compiles the site and stores the
 output
 under
-target/docs/
-.
+target/docs/.
+See http://wiki.apache.org/struts/StrutsMaintenanceWebsite";>
+Struts Maintenance Website for details.
 
-
 
 Procedurally, the only difference between patching
-documentation and
+the Struts 1 documentation and
 software is that the docs are kept in XML rather than
 Java
 source code.

Modified: struts/site/src/site/fml/kickstart.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?rev=419560&r1=419559&r2=419560&view=diff
==
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Thu Jul  6 07:13:00 2006
@@ -36,25 +36,15 @@
 http://struts.apache.org/1.2.9/userGuide/index.html";>
 Preface to the User Guide.
 
-
-
-The main website is devoted to the upcoming version, Struts
-1.3. This version is at the
-"http://svn.apache.org/dist/struts/action-lib/";>test
-build" stage now, but it is still 100% backwardly compatible
-with Struts 1.2.9.
-
-
+
 
-Meanwhile, for the Struts 2 release, 
-we "joined forces" with another project,
-http://www.opensymphony.com/webwork/";>OpenSymphony
-WebWork.
-Th

svn commit: r419592 - in /struts/site/src/site: fml/roadmap.fml site.xml xdoc/index.xml

[husted]

Author: husted
Date: Thu Jul  6 08:53:13 2006
New Revision: 419592

URL: http://svn.apache.org/viewvc?rev=419592&view=rev
Log:
SITE-8 : Update navigation menu; minor tweaks.

Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/site.xml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=419592&r1=419591&r2=419592&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Thu Jul  6 08:53:13 2006
@@ -204,8 +204,7 @@
  
 
 
-Which framework should I use on my next
-project?
+What should I use with my next project?
 
 
 
@@ -237,7 +236,7 @@
 
 
 If you are a sole developer working on a small application,
-then you might not even need a framework.
+you might not even need a framework.
 Simple applications can be written with JSF or JSP with
 http://java.sun.com/products/jsp/jstl/index.jsp";>
 JSTL
@@ -262,12 +261,12 @@
 
 
 While both Struts 1 and 2 support JSP and Velocity, 
-Struts 2 has better support for JSF and enhanced support
+Struts 2 has better support for JSF and first-class support
 for template languages like Velocity and Freemarker, 
-along with optonal plugins for report generators like 
+along with optional plugins for report generators like 
 JasperReports.
 Both frameworks work well with AJAX, but Struts 2 includes 
an 
-AJAX theme that can give your AJAX pages a boost.
+AJAX theme that can give your interactive pages a boost.
 Under the name WebWork, Struts 2 already powers many large 
 enterprise-grade solutions, including Atlassian's JIRA and 
 Confluence applications.
@@ -277,7 +276,8 @@
 Aside from Apache Struts products, 
 other likely candidates for a Java Web MVC framework 
include
 http://cocoon.apache.org/";>Apache Cocoon,
-http://jakarta.apache.org/tapestry/";>Apache 
Tapestry,
+http://shale.apache.org/";>Apache Shale,
+http://tapestry.apache.org/";>Apache Tapestry,
 http://jakarta.apache.org/turbine/";>Apache 
Turbine,
 http://www.springframework.org/docs/reference/mvc.html";>Spring MVC,
 http://stripes.mc4j.org/confluence/display/stripes/Home";>Stripes,
@@ -346,20 +346,24 @@
 and help reduce choice for the rest of us?
 
 
-Apache Struts is neither a steering committee nor a 
vendor. We're
-a group of engineers creating the web application 
frameworks that
-we want to use to build our own applications. Some of us 
are
-working on legacy Struts 1 applications, some of us are 
working on
-WebWork 2 or Struts 2 applications, and some of us are 
working on both. Since we have
-volunteers to work on two major versions, we offer two
-major versions.
+We're a group of engineers creating and maintaining the 
+framework that we want to use to build our own enterprise 
+web applications. 
+Some of us are working on legacy Struts 1 applications, 
+some of us are working on bleeding-edge Struts 2 
+applications, and a lot of us are working on both.
+Since we have volunteers to work on two major versions, 
+we offer two major versions.
+
 
 The Struts committers work for different employers all over
 the world. It is not feasible for us to say this 
technology or
 that technology is the only technology anyone in our group 
can
 use.
 One of our employers might choose JSF, and another might 
stick
-with JSP. We are a working group of engineers who live in 
the
+with JSP. 
+Apache Struts is neither a steering committee nor a 
vendor. 
+We are a working group of engineers who live in the
 real world, a

svn commit: r419872 - in /struts/struts1/trunk: ./ src/site/xdoc/ src/site/xdoc/faqs/ src/site/xdoc/userGuide/

[husted]

Author: husted
Date: Fri Jul  7 04:32:46 2006
New Revision: 419872

URL: http://svn.apache.org/viewvc?rev=419872&view=rev
Log:
STR-2898 : Tweaks, update links and product names, from welcome through 
userGuide

Modified:
struts/struts1/trunk/pom.xml
struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
struts/struts1/trunk/src/site/xdoc/index.xml
struts/struts1/trunk/src/site/xdoc/learning.xml
struts/struts1/trunk/src/site/xdoc/roadmap.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml
struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml
struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml

Modified: struts/struts1/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=419872&r1=419871&r2=419872&view=diff
==
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Fri Jul  7 04:32:46 2006
@@ -123,7 +123,7 @@
 
 
 maven-site-plugin
-2.0-beta-4
+2.0-beta-5
 
 
 

Modified: struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/apps.xml?rev=419872&r1=419871&r2=419872&view=diff
==
--- struts/struts1/trunk/src/site/xdoc/faqs/apps.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/apps.xml Fri Jul  7 04:32:46 2006
@@ -53,7 +53,7 @@
 This document focuses on form/data centric
 applications, but may also work with
 other types of applications.
-This material was originally written for version 1.1 
(beta 2), 
+This material was originally written for Struts 1.1 
(beta 2), 
 and reviewed for the 1.2.2 and 1.3.0 releases.
 
 
@@ -225,12 +225,12 @@
 
 Unit Testing
 
-Unit test normal java beans with
+Unit test normal JavaBeans with
 JUnit.
 http://www.junit.org";>
 (more...)
 
-Unit test JSP, taglibs and
+Unit test JSP, taglibs, and
 conventional servlet components
 with Cactus.
 http://jakarta.apache.org/cactus";>
@@ -254,7 +254,7 @@
 
 Deployment
 
-Build script should create a war file
+Build script should create a WAR file
 containing the
 files developed above, along with
 files that make up the 

Modified: struts/struts1/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/index.xml?rev=419872&r1=419871&r2=419872&view=diff
==
--- struts/struts1/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/index.xml Fri Jul  7 04:32:46 2006
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
@@ -72,7 +72,8 @@
 http://java.sun.com/products/jsp/";>JavaServer
 Pages,
 including
-JSTL and JSF,
+JSTL and 
+JSF,
 as well as
 http://jakarta.apache.org/velocity/tools/struts/";>
 Velocity Templates,
@@ -214,7 +215,7 @@
 set-property
 feature.
 This is one reason why there are so many
-http://wiki.apache.org/struts/StrutsResources/";>
+
 contributor
 extensions.
 We provide the base framework, but you can s

svn commit: r420001 - in /struts/struts1/trunk: apps/cookbook/src/main/webapp/WEB-INF/ core/src/main/resources/org/apache/struts/chain/ src/site/fml/faqs/ src/site/xdoc/faqs/ src/site/xdoc/userGuide/

[husted]

Author: husted
Date: Fri Jul  7 15:32:10 2006
New Revision: 420001

URL: http://svn.apache.org/viewvc?rev=420001&view=rev
Log:
STR-2898 : Updates and tweaks to FAQs and HOWTOs

Modified:
struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/chain-config.xml

struts/struts1/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
struts/struts1/trunk/src/site/fml/faqs/kickstart.fml
struts/struts1/trunk/src/site/fml/faqs/newbie.fml
struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml
struts/struts1/trunk/src/site/xdoc/faqs/validator.xml
struts/struts1/trunk/src/site/xdoc/faqs/works.xml
struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml

struts/struts1/trunk/tiles/src/main/resources/org/apache/struts/tiles/chain-config.xml

Modified: 
struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/chain-config.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/chain-config.xml?rev=420001&r1=42&r2=420001&view=diff
==
--- struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/chain-config.xml 
(original)
+++ struts/struts1/trunk/apps/cookbook/src/main/webapp/WEB-INF/chain-config.xml 
Fri Jul  7 15:32:10 2006
@@ -22,7 +22,7 @@
 
 

svn commit: r420020 - in /struts/site/src/site: fml/roadmap.fml xdoc/announce-2005.xml xdoc/downloads.xml xdoc/index.xml

[husted]

Author: husted
Date: Fri Jul  7 17:15:21 2006
New Revision: 420020

URL: http://svn.apache.org/viewvc?rev=420020&view=rev
Log:
=SITE-8 Tweaks and updates

Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/announce-2005.xml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=420020&r1=420019&r2=420020&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Fri Jul  7 17:15:21 2006
@@ -33,13 +33,13 @@
 Symphony WebWork.
 Pursuant to this plan, WebWork 2.3 was
 donated to the ASF in March 2006,
-and the active WebWork committers joined the Apache Struts 
project.
+and the active WebWork committers joined the Apache Struts 
Project.
 The WebWork 2.3 codebase was brought into the ASF through
 the
 http://incubator.apache.org/projects/webwork2.html";>
 Apache Incubator.
 The donated codebase is now part of the Apache Struts 
-project.
+Project.
 
 
 WebWork started as a
@@ -142,67 +142,6 @@
 
 
 
-
-Will it be difficult to migration from Struts 1 to
-Struts 2?
-
-
-Many of us have significant Struts 1 
-applications in production.
-Being able to migrate both applications and developer
-skill sets is important to all of us.
-
-
-The Struts 2 documentation includes a Migration Guide 
-that outlines several migration strategies. 
-Several classic Struts example applications, 
-including the MailReader, 
-are being migrated to Struts 2. 
-
-
-
-
-
-  Is Struts 1 obsolete?
-  
-
-   There is a robust and vibrant community of developers using 
Struts 1 
-   in production, and we expect that thousands of teams will 
continue to base new 
-   projects on Struts 1 and support existing projects, for many, 
many years 
-   to come. 
-
-
-   New and improved extensions to Struts 1 continue to appear 
regularly. 
-   In 2006 alone, we've seen the release of 
-   
-   http://strecks.sourceforge.net/";>Strecks,
-   http://www.jspcontrols.net";>JSP Control Tags,
-   http://mojodna.net/sprout/";>Sprout,
-   http://www.springframework.org/node/239";>Spring Web 
Flow,
-   http://getahead.ltd.uk/dwr/";>DWR,
-   http://calyxo.org/";>Calyxo,
-   https://formdef.dev.java.net/";>FormDef, and
-   http://javawebparts.sourceforge.net/";>Java Web 
Parts.  
-
-   There are http://opensource.atlassian.com/confluence/oss/display/BOOKS/Books+about+Struts";>dozens
 of books and 
-   http://www.husted.com/central/Resources/Action/articles-2006.html";>hundreds
 of articles available 
-   to help people get started with Struts 1 or improve the 
application they already have.
-
-
-   Since the merger, Struts 1.x has gone on to release a new minor 
version, Struts 1.3, 
-   and new 1.x releases are being planned.
-   Apache Struts 1 continues to be the most popular and best 
supported 
-   web application framework for Java.
-
-
-
-   Of course, if you are starting a new project, and have your 
choice of frameworks, 
-   this would be a good time to consider whether you would like to 
continue to use 
-   Struts 1 or whether it's time to try 
something else. 
-
-
- 
-
 
 What should I use with my next project?
 
@@ -262,14 +201,14 @@
 
 While both Struts 1 and 2 support JSP and Velocity, 
 Struts 2 has better support for JSF and first-class support
-for template languages like Velocity and Freemarker, 
-along with optional plugins for report generators like 
-JasperReports.
+

svn commit: r420101 - in /struts/site/src/site: fml/roadmap.fml xdoc/downloads.xml

[husted]

Author: husted
Date: Sat Jul  8 05:14:48 2006
New Revision: 420101

URL: http://svn.apache.org/viewvc?rev=420101&view=rev
Log:
SITE-8 Fix reference to Maven; Streamline roadmap FAQ.

Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/downloads.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=420101&r1=420100&r2=420101&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sat Jul  8 05:14:48 2006
@@ -147,34 +147,7 @@
 
 
 
-First, you should decide which user interface technology 
you
-would like to use:
-http://java.sun.com/j2ee/javaserverfaces/";>JavaServer
-Faces
-(JSF),
-conventional
-http://java.sun.com/products/jsp/";>JavaServer 
Pages
-(JSP),
-or another templating technology like
-http://jakarta.apache.org/velocity/";>Velocity
-.
-
-
-JSF is designed to work well with visual design tools, much
-like ASP.NET. Some people are finding that JSF is a faster 
way to
-write new applications, especially modest intranet 
applications. 
-A good place to learn more about JSF is
-http://jsfcentral.com/";>JSF Central
-.
-
-
-Conventional JSP is a tried and true strategy.
-When used as part of a MVC architecture, applications 
based on
-server pages or templates are known to be easy to create,
-maintain, and extend over time.
-
-
-If you are a sole developer working on a small application,
+First, if you are a sole developer working on a small 
application,
 you might not even need a framework.
 Simple applications can be written with JSF or JSP with
 http://java.sun.com/products/jsp/jstl/index.jsp";>
@@ -189,160 +162,52 @@
 Multi-developer teams working on larger applications will
 probably find a MVC framework useful.  
 
-
-   
-   The original 1.x framework is mature, well-documented, and widely 
-   supported. 
-Struts 1 is the best choice for teams who value proven 
solutions.
-   The new Struts 2 framework is the best choice for teams who value 
-elegant solutions to difficult problems.   
+
+When choosing a framework, an important consideration is 
+which user interface technology you would like to use:
+http://java.sun.com/j2ee/javaserverfaces/";>JavaServer
+Faces
+(JSF),
+conventional
+http://java.sun.com/products/jsp/";>JavaServer 
Pages
+(JSP),
+or another templating technology like
+http://jakarta.apache.org/velocity/";>Velocity.
 
-
 
-While both Struts 1 and 2 support JSP and Velocity, 
+While both Struts 1 and 2 support JSP, Velocity, and XSLT, 
 Struts 2 has better support for JSF and first-class support
-for template languages like Velocity and Freemarker. 
-Struits 2 also suppports XSLT, PDF, and, optionally, 
JasperReports.
+for template languages like Velocity and 
+http://www.freemarker.org/";>FreeMarker.
+and, optionally, JasperReports.
+
+
 Both frameworks work well with AJAX, but Struts 2 includes 
an 
 AJAX theme that can give your interactive pages a boost.
 Under the name WebWork, Struts 2 already powers many large 
 enterprise-grade solutions, including 
 http://www.atlassian.com/";>Atlassian's 
 JIRA and Confluence applications.
- 
-
-
-Aside from Apache Struts products, 
-other likely candidates for a Java Web MVC framework 
include
-http://cocoon.apache.org/";>Apache Cocoon,
-  

svn commit: r420229 - in /struts/site/src/site: fml/roadmap.fml xdoc/index.xml

[husted]

Author: husted
Date: Sat Jul  8 17:19:15 2006
New Revision: 420229

URL: http://svn.apache.org/viewvc?rev=420229&view=rev
Log:
SITE-8
* Remove tab characters (oops!)
* Adjust spacing 
* Minor changes to Roadmap FAQ (sorry to mix formatting with editorial changes).


Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=420229&r1=420228&r2=420229&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sat Jul  8 17:19:15 2006
@@ -26,15 +26,15 @@
 
 http://wiki.apache.org/struts/StrutsTi";>Struts
 Ti
-(short for Titanium) was a codename for Struts 2.0.
+(short for Titanium) was a codename for Struts 2.
 In late November 2005, the Ti proposal was amended to
 include a merger with
 http://www.opensymphony.com/webwork/";>Open
 Symphony WebWork.
-Pursuant to this plan, WebWork 2.3 was
+Pursuant to this plan, WebWork 2.2 was
 donated to the ASF in March 2006,
 and the active WebWork committers joined the Apache Struts 
Project.
-The WebWork 2.3 codebase was brought into the ASF through
+The WebWork codebase was brought into the ASF through
 the
 http://incubator.apache.org/projects/webwork2.html";>
 Apache Incubator.
@@ -46,7 +46,7 @@
 http://incubator.apache.org/learn/rules-for-revolutionaries.html";>
 Struts Revolution.
 Over the years, it has evolved into a superb action-based
-framework that retains many Struts 1.x paradigms.
+framework that retains many Struts 1 paradigms.
 
 
 People who have worked with both Struts 1 and WebWork
@@ -59,11 +59,11 @@
 If we had finished the original Struts 1 roadmap 
ourselves, 
 Struts 1 would have ended up being a WebWork 2 workalike.
 Rather than reinvent the wheel,
-Ti has become a proposal to put the WebWork wheel back on
+Ti became a proposal to put the WebWork wheel back on
 the Struts axle.
 
 
-At this point, the Ti codename has being dropped,
+At this point, the Ti codename has been dropped,
 and we are referring to the donated codebase as Struts 2.
 
 
@@ -73,57 +73,53 @@
 If they share the same roots,
 why did WebWork evolve more quickly than Struts 1?
 
-
-  The Struts 1.x release series is deeply into "backward 
-  compatibility" mode.
-  Backward compatibility has become an obsession with Struts 1.
-  Before making any API change, we deprecate the existing member,
-  and make at least one milestone release before removing the 
-  deprecated member.
-  Each Struts milestone is drop-and-go compatible with the last.
-  Maintaining this degree of stability takes a lot of effort,
-  but given the installed base, we feel it is worth the time and 
-  trouble.
-
-
-  There have been several proposals for a new Struts 2 codebase.
-  The first formal proposal was
-  http://wiki.apache.org/struts/StrutsJericho";>Jericho,
-  followed by
-  http://wiki.apache.org/struts/StrutsShale";>Shale,
-  and then
-  http://wiki.apache.org/struts/StrutsTi";>Ti.
-
-
-  Jericho never progressed past the trial balloon stage.
-  Shale is based on JavaServer Faces, and, when the time came,
-  the Apache Struts PMC found that many of us were not ready to
-  adopt JSF just yet.
-  Initially, Shale was a Struts subproject,
-  but later Shale graduated to its own 
-  http://struts.apache.org/struts-shale";>top-level ASF 
-  project.
-   
-   
-   The Ti proposal included the idea of collaborating with other
-   projects to build a "best of breed" framework that incorporated
-   everything we had learned over the past six y

svn commit: r420326 - in /struts/site/src/site: fml/kickstart.fml resources/proposals/todo-1.1.xml site.xml xdoc/bylaws.xml xdoc/index.xml xdoc/volunteers.xml

[husted]

Author: husted
Date: Sun Jul  9 10:33:36 2006
New Revision: 420326

URL: http://svn.apache.org/viewvc?rev=420326&view=rev
Log:
SITE-8
* Add Google Site Search to home page, as a test; this should be on the sidebar 
or topbar 
* Kickstart: Add link to IDE wiki page
* Welcome: Add "what's a webapp" paragraph 
* Volunteers: Add link to Charter (bylaws)

Modified:
struts/site/src/site/fml/kickstart.fml
struts/site/src/site/resources/proposals/todo-1.1.xml
struts/site/src/site/site.xml
struts/site/src/site/xdoc/bylaws.xml
struts/site/src/site/xdoc/index.xml
struts/site/src/site/xdoc/volunteers.xml

Modified: struts/site/src/site/fml/kickstart.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?rev=420326&r1=420325&r2=420326&view=diff
==
--- struts/site/src/site/fml/kickstart.fml (original)
+++ struts/site/src/site/fml/kickstart.fml Sun Jul  9 10:33:36 2006
@@ -31,14 +31,14 @@
 The Struts 1.2.9 release has its
 http://struts.apache.org/1.2.9/index.html";>
 own area of the website.
-If you are new to Java or web development as well as Apache Struts,
+If you are new to Java or web development, as well as Apache 
Struts,
 be sure to review the
 http://struts.apache.org/1.2.9/userGuide/index.html";>
 Preface to the User Guide.
 
 
 
-The main Struts website covers the latest, unreleased version of 
+The main Struts web site covers the latest, unreleased version of 
 each major release series (Struts 1.3 and Struts 2.0). 
 The documentation for past releases are also available online. 
 See the navigational menu for links to the documentation for 
@@ -48,8 +48,8 @@
 
 To learn more about using Apache Struts, you can also visit
 http://www.StrutsCentral.net/";>Struts Central,
-which catalogs all the known resources about Apache Struts, 
whether it is
-http://struts.apache.org/1.x/";>Struts 1,
+which catalogs all the known resources about Apache Struts for both
+http://struts.apache.org/1.x/";>Struts 1 and  
 http://struts.apache.org/2.0/";>Struts 2.
 To keep up on the latest news about "everything Struts",
 point your RSS reader at the
@@ -96,7 +96,7 @@
 
 
 Do I have to credit Apache Struts on my own
-website?
+web site?
 
 You need to credit Apache Struts if you
 redistribute your own framework
@@ -136,7 +136,7 @@
 The frameworks should work well with any development 
environment
 that you would like to use, as well as with any
 programmers editor.
-The members of the Apache Struts development team each use 
their
+The members of the Apache Struts development group each 
use their
 own tools such as
 http://www.gnu.org/software/emacs/emacs.html";>
 Emacs,
@@ -144,6 +144,12 @@
 http://www.eclipse.org/";>Eclipse,
 and
 http://www.netbeans.org/";>NetBeans.
+
+
+For more, see the 
+http://wiki.apache.org/struts/StrutsMyFavoriteIDE";>
+ IDE discussion page 
+in the wiki.
 
 
 

Modified: struts/site/src/site/resources/proposals/todo-1.1.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/resources/proposals/todo-1.1.xml?rev=420326&r1=420325&r2=420326&view=diff
==
--- struts/site/src/site/resources/proposals/todo-1.1.xml (original)
+++ struts/site/src/site/resources/proposals/todo-1.1.xml Sun Jul  9 10:33:36 
2006
@@ -586,7 +586,7 @@
   
 
 
-  A portion of the Struts web site, and file system, where individually
+  A portion of the Struts website, and file system, where individually
   contributed add-ons for Struts can be hosted and downloaded.  
 
 

Modified: struts/site/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=420326&r1=420325&r2=420326&view=diff
==
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sun Jul  9 10:33:36 2006
@@ -140,7 +140,7 @@
 />
 http://apache.apache.org/";
+ 

svn commit: r420411 - in /struts/struts1/trunk: apps/src/site/ el/src/site/ el/src/site/xdoc/ extras/src/site/ faces/src/main/resources/META-INF/ faces/src/site/ faces/src/site/xdoc/ scripting/src/sit

[husted]

Author: husted
Date: Sun Jul  9 20:52:21 2006
New Revision: 420411

URL: http://svn.apache.org/viewvc?rev=420411&view=rev
Log:
STR-2598
* Update EL welcome page
* Remove redundant "FAQ" page 
* Conform spelling of "website" 
* Update other references to "Struts Action"


Removed:
struts/struts1/trunk/el/src/site/xdoc/struts-el.xml
Modified:
struts/struts1/trunk/apps/src/site/site.xml
struts/struts1/trunk/el/src/site/site.xml
struts/struts1/trunk/el/src/site/xdoc/index.xml
struts/struts1/trunk/extras/src/site/site.xml
struts/struts1/trunk/faces/src/main/resources/META-INF/faces-config.xml
struts/struts1/trunk/faces/src/site/site.xml
struts/struts1/trunk/faces/src/site/xdoc/index.xml
struts/struts1/trunk/scripting/src/site/site.xml
struts/struts1/trunk/scripting/src/site/xdoc/index.xml
struts/struts1/trunk/src/site/xdoc/userGuide/installation-oas.xml
struts/struts1/trunk/src/site/xdoc/userGuide/installation-was352.xml
struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
struts/struts1/trunk/taglib/src/site/site.xml
struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml
struts/struts1/trunk/taglib/src/site/xdoc/dev_bean.xml
struts/struts1/trunk/taglib/src/site/xdoc/dev_html.xml
struts/struts1/trunk/taglib/src/site/xdoc/dev_logic.xml
struts/struts1/trunk/taglib/src/site/xdoc/faq.xml
struts/struts1/trunk/taglib/src/site/xdoc/index.xml
struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml
struts/struts1/trunk/taglib/src/site/xdoc/ssl.xml
struts/struts1/trunk/tiles/src/site/site.xml
struts/struts1/trunk/tiles/src/site/xdoc/dev_tiles.xml
struts/struts1/trunk/tiles/src/site/xdoc/examples.xml
struts/struts1/trunk/tiles/src/site/xdoc/index.xml
struts/struts1/trunk/tiles/src/site/xdoc/installation.xml

Modified: struts/struts1/trunk/apps/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==
--- struts/struts1/trunk/apps/src/site/site.xml (original)
+++ struts/struts1/trunk/apps/src/site/site.xml Sun Jul  9 20:52:21 2006
@@ -72,7 +72,7 @@
 name="Apache Struts Home"
 href="http://struts.apache.org/"/>
 
 
 

Modified: struts/struts1/trunk/el/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/site.xml?rev=420411&r1=420410&r2=420411&view=diff
==
--- struts/struts1/trunk/el/src/site/site.xml (original)
+++ struts/struts1/trunk/el/src/site/site.xml Sun Jul  9 20:52:21 2006
@@ -1,5 +1,5 @@
 
-
+
 
 Apache Software Foundation
 http://www.apache.org/images/asf-logo.gif

Modified: struts/struts1/trunk/el/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/xdoc/index.xml?rev=420411&r1=420410&r2=420411&view=diff
==
--- struts/struts1/trunk/el/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/el/src/site/xdoc/index.xml Sun Jul  9 20:52:21 2006
@@ -18,7 +18,7 @@
 -->
 
 
-Struts Action Framework - EL Taglibs
+Struts EL
 
 
 
@@ -27,39 +27,59 @@
 
 
 
-This subproject is an extension of the Struts tag library.
-Each JSP custom tag
-in this library is a subclass of an associated tag in the
-Struts tag library.
-One difference is that this tag library does not use
-"rtexprvalues", it uses
-the expression evaluation engine in the Jakarta Taglibs
-implementation of the
-JSP Standard Tag Library (version 1.0) to evaluate attribute
+Struts EL is an extension of the Struts Taglib component 
+that uses JSTL (the JavaServer Pages Standard Tag Library)
+as a foundation technology. 
+Each JSP custom tag in this library is a JSTL-aware 
+subclass of a corresponding tag in Struts Taglib.
+Since JSTL is a prerequisite, 
+only those tags without a JSTL corrollary were ported to 
+Struts EL. 
+
+
+Since this component utilizes JSTL, the JSTL expression 
+language ("EL"), and Struts Taglib, an understanding of all 
+three is a prerequisite. 
+
+
+
+
+
+Unlike the Struts Taglib component, 
+Struts EL does not use runtime scriptlet expressions 
("rtexprvalue

svn commit: r420679 - in /struts/struts1/trunk: extras/src/site/xdoc/dispatchValidator.xml scripting/src/site/xdoc/index.xml scripting/src/site/xdoc/source-guide.xml scripting/src/site/xdoc/user-guide

[husted]

Author: husted
Date: Mon Jul 10 19:40:42 2006
New Revision: 420679

URL: http://svn.apache.org/viewvc?rev=420679&view=rev
Log:
=STR-2898 : Continue updates through scripting (but not apps).

Modified:
struts/struts1/trunk/extras/src/site/xdoc/dispatchValidator.xml
struts/struts1/trunk/scripting/src/site/xdoc/index.xml
struts/struts1/trunk/scripting/src/site/xdoc/source-guide.xml
struts/struts1/trunk/scripting/src/site/xdoc/user-guide.xml

Modified: struts/struts1/trunk/extras/src/site/xdoc/dispatchValidator.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/site/xdoc/dispatchValidator.xml?rev=420679&r1=420678&r2=420679&view=diff
==
--- struts/struts1/trunk/extras/src/site/xdoc/dispatchValidator.xml (original)
+++ struts/struts1/trunk/extras/src/site/xdoc/dispatchValidator.xml Mon Jul 10 
19:40:42 2006
@@ -19,14 +19,13 @@
 
 
 
-Using the DispatchAction and Validator
+Creating a Multipage Wizard with DispatchAction and 
Validator
 
 
 
 
-
+
 
-
 
 
 This is simple example to illustrate how to build a
@@ -42,7 +41,6 @@
 form field validations.
 
 
-
 
 
 
@@ -84,9 +82,11 @@
 
 ]]>
 
+
 The method
 enterName
 simply forwards to the first page.
+
 
 
 
+
 On the page
 name.jsp
 is a hidden field for the
@@ -112,15 +113,18 @@
 Javascript to set the
 submitName
 parameter
+
 
 
 
 
+
 The
 enterAddress
 method then forwards to the address page.
+
 
 
 
+
 On the
 adddress.jsp
 page, we again dynamically set the
 submitName
 parameter.
+
 
 
 
+
 And the action path that is submitted is
+
 
 
 
+
 The action mapping for
 /address
 is
+
 
 
 
+
 Note that two action mappings are required to handle the page
 flow (we'll discuss why
 in the next section).
+
 
 
 
 
 
+
 Let's now add some validations to require input fields using
 the
 Validator. In validation.xml, there's a
@@ -186,6 +199,7 @@
 that specifies two field validations for the form bean
 named
 acmeForm.
+
 
 
 
+
 We need to identify the page where the input field resides so
 that
 we can control which validations are triggered for a given
@@ -212,27 +227,34 @@
 acmeForm
 (even validations for fields that the user
 has not seen yet).
-
+
+
 On each of the pages, a hidden field is used to identify
 the page number.
-
+
+
 In
 name.jsp
+
 
 
 
+
 In
 address.jsp
+
 
 
 
+
 The Validator will use the value of the page property in
 determining which validations to run.
-
+
+
 Now let's revisit the reason for having two action mappings.
 An action mapping
 is required for each page since the
@@ -241,25 +263,29 @@
 to in case validation fails. Therefore we need to define an
 action mapping for each page
 that could be displayed after a validation fails.
+
 
 
 
 
 
+
 The tricky part is how to setup Previous and Cancel buttons
 for each of the pages. If the user clicks Previous then
 the validations for the currrent page should not be triggered.
 For Cancel, none of the validations should be triggered.
-
+
+
 The solution for Previous is to set the page number property
 to the number of the previous page, effectively circumventing
 the valid

svn commit: r420680 - in /struts/site/src/site: fml/roadmap.fml xdoc/index.xml

[husted]

Author: husted
Date: Mon Jul 10 19:41:38 2006
New Revision: 420680

URL: http://svn.apache.org/viewvc?rev=420680&view=rev
Log:
=SITE-8 : Adopt some tweaks from Struts 1.0 website and Maven.

Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=420680&r1=420679&r2=420680&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Mon Jul 10 19:41:38 2006
@@ -75,8 +75,8 @@
 
 
 The Struts 1.x release series is deeply into "backward 
-compatibility" mode.
-Backward compatibility has become an obsession with Struts 
1.
+compatibility" mode. In fact, 
+backward compatibility has become an obsession with Struts 
1.
 Before making any API change, we deprecate the existing 
member,
 and make at least one milestone release before removing 
the 
 deprecated member.
@@ -204,6 +204,70 @@
 Originally a Struts subproject, 
 Shale is now a top-level ASF project.
 
+
+
+
+
+What's changed in Struts 2?
+   
+   
+  Struts 2 is designed to be simpler to use and closer to how 
+  Struts was always meant to be. 
+  To Struts 1 developers, 
+  Struts 2 feels strange but familiar. 
+  Some key changes from Struts 1 are:
+   
+
+   
+ 
+   Improved design - All Struts 2 classes are based on 
interfaces. 
+   Core interfaces are HTTP independant.
+ 
+ 
+   Easy-to-test Actions - Struts 2 Actions are HTTP 
independant and 
+   can be tested without resorting to mocks.
+ 
+ 
+   Easy-to-customize controller - Struts 1 lets you customize 
the 
+   request processor per module, Struts 2 lets you customize 
the request 
+   handling per action, if you like.
+ 
+ 
+   Easy-to-customize tags - Struts 2 tags can be customized by 
+   changing an underlying stylesheet. Individual tags can be 
customized by 
+   editing a FreeMarker template. No need to grok the taglib API! Both 
JSP 
+   and FreeMarker tags are fully supported.
+ 
+ 
+   No Cancel quirks - The Struts 2 Cancel button can go 
directly to a 
+   different action. 
+ 
+ 
+Intelligent Defaults - Most configuration elements have a 
default 
+value that you can set and forget.
+ 
+ 
+POJO forms - No more ActionForms! Use any JavaBean you 
like or put 
+properties directly on your Action. No need to use all 
String 
+properties!
+ 
+ 
+POJO Actions - Any class can be used as an Action class. 
You don't 
+even have to implement an interface!
+ 
+ 
+Enhanced Results - Unlike ActionForwards, Struts 2 Results 
can 
+actually help prepare the response.
+ 
+ 
+Better AJAX support - The AJAX theme gives your 
interactive 
+applications a jump start.
+  
+ 
+QuickStart - Many changes can be made on the fly without 
+restarting a web container.
+ 
+   
 
 
 

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=420680&r1=420679&r2=420680&view=diff
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Mon Jul 10 19:41:38 2006
@@ -28,58 +28,72 @@
 
 
 
-Apache Struts is an open-source framework for creating 
-Java web applications, based on the classic 
-Model-View-Controller design. 
+Apache Struts is a free open-source framework for creating 
+Java web applications. 
 
 
 
 Web applications differ from conventional we

svn commit: r420681 - /struts/struts1/trunk/extras/src/site/xdoc/index.xml

[husted]

Author: husted
Date: Mon Jul 10 19:42:49 2006
New Revision: 420681

URL: http://svn.apache.org/viewvc?rev=420681&view=rev
Log:
=STR-2898 : Continue updates through scripting (but not apps).

Added:
struts/struts1/trunk/extras/src/site/xdoc/index.xml

Added: struts/struts1/trunk/extras/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/site/xdoc/index.xml?rev=420681&view=auto
==
--- struts/struts1/trunk/extras/src/site/xdoc/index.xml (added)
+++ struts/struts1/trunk/extras/src/site/xdoc/index.xml Mon Jul 10 19:42:49 2006
@@ -0,0 +1,114 @@
+
+
+
+
+
+Struts Extras
+
+
+
+
+
+
+
+
+Struts Extras provides several popular but non-essential 
+classes, including:
+
+
+ActionDispatcherAn Action helper class that 
dispatches to a public method in an Action.
+
+
+BaseActionBaseAction is provided as an intermediate 
class for shared funtionality between Action and any stock implementation 
provided in this package.
+
+
+DigestingPlugInAn implementation of PlugIn which can 
be configured to instantiate a graph of objects using the Commons Digester and 
place the root object of that graph into the Application context.
+
+
+DispatchActionThis Action is useful for developers 
who prefer to combine many similar actions into a single Action class, in order 
to simplify their application design.
+
+
+DownloadActionThis is an abstract base class that 
minimizes the amount of special coding that needs to be written to download a 
file. 
+
+
+DynaValidatorActionFormThis class differs from the 
core DynaValidatorForm in that the key passed into the validator is the action 
element's 'path' attribute from the struts-config.xml which should match the 
form element's name attribute in the validation.xml.
+
+
+EventActionDispatcherAn Action helper class that 
dispatches to to one of the public methods that are named in the parameter 
attribute of the corresponding ActionMapping and matches a submission parameter.
+
+
+ EventDispatchActionAn Action that dispatches to to 
one of the public methods that are named in the parameter attribute of the 
corresponding ActionMapping and matches a submission parameter
+
+
+ForwardActionAn Action that forwards to the 
context-relative URI specified by the parameter property of our associated 
ActionMapping.
+
+
+IncludeActionAn Action that includes the 
context-relative URI specified by the parameter property of our associated 
ActionMapping. 
+
+
+LocaleActionImplementation of Action that changes the 
user's Locale and forwards to a page, based on request level parameters that 
are set (language, country, and page).
+
+
+LookupDispatchAction An abstract Action that 
dispatches to the subclass mapped execute method. This is useful in cases where 
an HTML form has multiple submit buttons with the same name
+
+
+MappingDispatchActionAn abstract Action that 
dispatches to a public method that is named by the parameter attribute of the 
corresponding ActionMapping.
+
+
+ModuleConfigVerifierConvenient implementation of 
PlugIn that performs as many verification tests on the information stored in 
the ModuleConfig  for this module as is practical.
+
+
+SwitchActionA standard Action that switches to a new 
module and then forwards control to a URI (specified in a number of possible 
ways) within the new module.
+
+
+ValidatorActionForm This class differs from the core 
ValidatorForm in that the key passed into the validator is the action element's 
'path' attribute from the struts-config.xml which should match the form 
element's name attribute in the validation.xml.
+
+
+
+
+
+
+
+Many of the "extra" classes are simple, and the easiest way to 
learn how to use 
+one of them, can be to review the 
+Javadocs 
+and 
+http://svn.apache.org/viewvc/struts/struts1/trunk/extras/src/main/java/org/apache/struts/";>
+source code.
+
+
+   
+
+Note that there is not an "extras" package, per se.
+  

svn commit: r420866 - in /struts/struts1/trunk: faces/src/site/xdoc/ src/site/xdoc/ taglib/src/site/ taglib/src/site/xdoc/

[husted]

Author: husted
Date: Tue Jul 11 07:22:16 2006
New Revision: 420866

URL: http://svn.apache.org/viewvc?rev=420866&view=rev
Log:
STR-2898 : Updates through Taglib.

Modified:
struts/struts1/trunk/faces/src/site/xdoc/index.xml
struts/struts1/trunk/src/site/xdoc/index.xml
struts/struts1/trunk/taglib/src/site/site.xml
struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml
struts/struts1/trunk/taglib/src/site/xdoc/faq.xml
struts/struts1/trunk/taglib/src/site/xdoc/index.xml
struts/struts1/trunk/taglib/src/site/xdoc/indexedprops.xml

Modified: struts/struts1/trunk/faces/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/faces/src/site/xdoc/index.xml?rev=420866&r1=420865&r2=420866&view=diff
==
--- struts/struts1/trunk/faces/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/faces/src/site/xdoc/index.xml Tue Jul 11 07:22:16 2006
@@ -24,24 +24,38 @@
 
   
 
-
+
 
 
-  The "Struts-Faces" 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.
+  
+The "Struts Faces" component 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.
+  
   
-  The Struts-Faces Integration Library should work with any implementation
-  of JavaServer Faces, version 1.0 or later.  It has primarily been tested
-  against version 1.1 of the JavaServer Faces reference implementation,
-  available at:
-http://java.sun.com/j2ee/javaserverfaces/";>
-http://java.sun.com/j2ee/javaserverfaces/
-
+  
+The Struts-Faces Integration Library should work with any implementation
+of JavaServer Faces, version 1.0 or later.  It has primarily been tested
+against http://java.sun.com/j2ee/javaserverfaces/";>
+version 1.1 of the JavaServer Faces reference implementation.
   
 
-  For more information, consult the
-  README file.
+  
+For more information, consult the
+README file.
+  
+  
+  
+   Note that the Struts Faces component is intended as a "bridge" between 
+   Struts 1 and JavaServer Faces. 
+   The typical use case is a team that would like to experiment with JSF 
+   components but does not want to completely rework an existing 
application. 
+  
+  
+  
+For better JavaServer Faces support, 
+consider using Struts 2 or 
+http://shale.apache.org/";>Apache Shale.
   
 
 
@@ -49,8 +63,8 @@
 
 
   Please report any bugs, or log any enhancement requests, in the
-  http://issues.apache.org/struts/";>Struts JIRA Issue Tracker,
-  using Struts and Faces.
+  http://issues.apache.org/struts/";>Struts JIRA Issue Tracker 
+  to the Faces component under Struts 1.
 
 
 

Modified: struts/struts1/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/index.xml?rev=420866&r1=420865&r2=420866&view=diff
==
--- struts/struts1/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/index.xml Tue Jul 11 07:22:16 2006
@@ -263,8 +263,7 @@
 
 
 Next:
-Learning about Struts
-Framework
+Learning about Struts
 
 
 

Modified: struts/struts1/trunk/taglib/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/site.xml?rev=420866&r1=420865&r2=420866&view=diff
==
--- struts/struts1/trunk/taglib/src/site/site.xml (original)
+++ struts/struts1/trunk/taglib/src/site/site.xml Tue Jul 11 07:22:16 2006
@@ -16,17 +16,17 @@
 http://struts.apache.org/1.x"; />
 http://struts.apache.org/2.0"; />
 
-
-
-
-
-
-
 
 
 
 

+
+
+
+
+
+
 

 

Modified: struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml?rev=420866&r1=420865&r2=420866&view=diff
==
--- struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml (original)
+++ struts/struts1/trunk/taglib/src/site/xdoc/building_view.xml Tue Jul 11 
07:22:16 2006
@@ -25,10 +25,9 @@
 
 
 
-
 
  

svn commit: r420868 - in /struts/site/src/site: fml/roadmap.fml xdoc/download.xml xdoc/downloads.xml xdoc/index.xml

[husted]

Author: husted
Date: Tue Jul 11 07:25:52 2006
New Revision: 420868

URL: http://svn.apache.org/viewvc?rev=420868&view=rev
Log:
SITE-8 : Update nighly build reference; delete obsolete 'downloads.xml' page; 
yet another tweak to index and roadmap.

Removed:
struts/site/src/site/xdoc/download.xml
Modified:
struts/site/src/site/fml/roadmap.fml
struts/site/src/site/xdoc/downloads.xml
struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=420868&r1=420867&r2=420868&view=diff
==
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Tue Jul 11 07:25:52 2006
@@ -178,7 +178,8 @@
 Struts 2 has better support for JSF and first-class support
 for template engines like Velocity and 
 http://www.freemarker.org/";>FreeMarker,
-and, optionally, JasperReports.
+and, optionally, 
+http://www.jaspersoft.com/";>JasperReports.
 
 
 Both versions work well with AJAX, but Struts 2 includes 
an 
@@ -200,7 +201,7 @@
 If you would like to use JSF exclusively, 
 then http://shale.apache.org/";>
 Apache Shale 
-is a good choice.
+might be a good choice.
 Originally a Struts subproject, 
 Shale is now a top-level ASF project.
 
@@ -261,7 +262,7 @@
  
  
 Better AJAX support - The AJAX theme gives your 
interactive 
-applications a jump start.
+applications a boost.
   
  
 QuickStart - Many changes can be made on the fly without 

Modified: struts/site/src/site/xdoc/downloads.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?rev=420868&r1=420867&r2=420868&view=diff
==
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Tue Jul 11 07:25:52 2006
@@ -131,12 +131,8 @@
 
 
 
-http://cvs.apache.org/builds/struts/maven/trunk/nightly/struts/";>
+http://people.apache.org/builds/struts/";>
 Struts Nightly Builds
-
- 
-http://cvs.apache.org/builds/struts/nightly/struts-shale/";>
-Shale Nightly Builds
 
 
 

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=420868&r1=420867&r2=420868&view=diff
==
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Tue Jul 11 07:25:52 2006
@@ -50,7 +50,7 @@
 
 
 
-One way to separate concerns in an application is to 
+One way to separate concerns in a software application is to 
 use a Model-View-Controller (MVC) architecture.
 The Model represents the business or database code, 
 the View represents the page design code, 

svn commit: r420871 - in /struts/struts1/trunk/taglib/src/site: fml/ fml/faq.fml xdoc/faq.xml

[husted]

Author: husted
Date: Tue Jul 11 07:29:42 2006
New Revision: 420871

URL: http://svn.apache.org/viewvc?rev=420871&view=rev
Log:
STR-2898 : Move FAQ page in order to use plugin.

Added:
struts/struts1/trunk/taglib/src/site/fml/
struts/struts1/trunk/taglib/src/site/fml/faq.fml
  - copied unchanged from r420866, 
struts/struts1/trunk/taglib/src/site/xdoc/faq.xml
Removed:
struts/struts1/trunk/taglib/src/site/xdoc/faq.xml

svn commit: r420903 - /struts/site/src/site/xdoc/download.xml

[husted]

Author: husted
Date: Tue Jul 11 08:51:41 2006
New Revision: 420903

URL: http://svn.apache.org/viewvc?rev=420903&view=rev
Log:
SITE-8 : Restore download.xml which is used in conjunction with dowload.cgi

Added:
struts/site/src/site/xdoc/download.xml
  - copied unchanged from r420867, struts/site/src/site/xdoc/download.xml

svn commit: r420928 - /struts/struts1/trunk/taglib/src/site/fml/faq.fml

[husted]

Author: husted
Date: Tue Jul 11 10:12:03 2006
New Revision: 420928

URL: http://svn.apache.org/viewvc?rev=420928&view=rev
Log:
STR-2898 : Update to use FAQ plugin.

Modified:
struts/struts1/trunk/taglib/src/site/fml/faq.fml

Modified: struts/struts1/trunk/taglib/src/site/fml/faq.fml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/site/fml/faq.fml?rev=420928&r1=420927&r2=420928&view=diff
==
--- struts/struts1/trunk/taglib/src/site/fml/faq.fml (original)
+++ struts/struts1/trunk/taglib/src/site/fml/faq.fml Tue Jul 11 10:12:03 2006
@@ -16,129 +16,32 @@
 
-
-
-Taglib FAQ
-
-
-
-
 
-
-
+
+
 
-
-
-
-What about JSTL and JavaServer
-Faces?
-
-
-
-Are the Struts tags XHTML
-compliant?
-
-
-
-Will the Struts tags support other
-markup languages such as WML
-
-
-
-Can I use multiple HTML form
-elements with the same
-name?
-
-
-
-Can I have multiple submit
-buttons on the same
-form?
-
-
-
-Why doesn't the focus feature on the
-<html:form>
-tag work in every circumstance?
-
-
-
-Why are my checkboxes not being
-set from ON to
-OFF?
-
-
-
-How do I use JavaScript
-to submit a form?
-
-
-
-How do I use JavaScript to
-...
-
-
-
-Do I need to implement reset and set
-all my form
-properties to their initial values?
-
-
-
-Can't I just create some of my
-JavaBeans in the JSP
-using a scriptlet?
-
-
-
-Why does the <html:link> tag
-URL-encode javascript and
-mailto links?"
-
-
-
-How can I scroll through list of
-pages like the search
-results in google?
-
-
-
-Why does the option tag render
-selected="selected"
-instead of just "selected"?
-
-
-
-
-Why does Struts Taglib provide for so
-little
-formatting?
-
-
-
-Why doesn't Struts Taglib offer more
-layout options?
-
-
-
-
-
-
-
-
-   
-  There is overlap between Struts Taglib and the 
+
+
+What about JSTL?
+
+
+
+There is overlap between Struts Taglib and the 
 http://java.sun.com/products/jsp/jstl/";>
 JavaServer Standard Tag Library (JSTL).
-  To make the best use of JSTL, 
-  use the 
-  Struts EL component instead. 
-  
-
-
-
-
-
+   To make the best use of JSTL, 
+   use the 
+   Struts EL component instead. 
+
+
+ 
+
+
+
+
+What about JSF?
+
+
 
 Struts 1 is not the best choice if you'd 
 like to use JavaServer Faces com

svn commit: r421008 - in /struts/struts1/trunk/taglib/src/main: java/org/apache/struts/taglib/bean/package.html java/org/apache/struts/taglib/html/package.html java/org/apache/struts/taglib/logic/pack

[husted]

Author: husted
Date: Tue Jul 11 15:03:41 2006
New Revision: 421008

URL: http://svn.apache.org/viewvc?rev=421008&view=rev
Log:
STR-1276 : Document multibox issues with map-backed beans.

Modified:

struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/package.html

struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/package.html

struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/logic/package.html
struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld

Modified: 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/package.html
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/package.html?rev=421008&r1=421007&r2=421008&view=diff
==
--- 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/package.html
 (original)
+++ 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/bean/package.html
 Tue Jul 11 15:03:41 2006
@@ -64,7 +64,7 @@
 
 
 
-See the Bean Tags
+See the Bean Tags
 Reference
 for detailed information about the available tags in this tag library, and
 the valid attributes for each tag.
@@ -391,7 +391,7 @@
 and the request that is currently being processed. Not all of the
 attributes
 for each tag are illustrated in the examples below - see the 
+href="../../../../../../tagreference.html">
 Bean Tags Reference
 for more information. Any bean created by these tags exists only in page
 scope, for the remainder of the current page.
@@ -514,7 +514,7 @@
 the Locale must recently stored in the user's session. These defaults can
 be overridden by setting values for the "bundle" and "locale" attributes,
 as described in the 
+href="../../../../../../tagreference.html#message">
 Bean Tags Reference
 . 
 <bean:message key="label.Cancel"/> <bean:message

Modified: 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/package.html
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/package.html?rev=421008&r1=421007&r2=421008&view=diff
==
--- 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/package.html
 (original)
+++ 
struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/package.html
 Tue Jul 11 15:03:41 2006
@@ -51,43 +51,43 @@
 
 
 
-button
+button
 
 
-cancel
+cancel
 
-checkboxes
+checkboxes
 
-file
+file
 
 
-hidden
+hidden
 
-image
+image
 
-multibox
+multibox
 
-password
+password
 input fields
-radio
+radio
 buttons
-reset
+reset
 buttons
 
-select
+select
 lists with embedded
 
-option
+option
 
 
-options
+options
 
 
-submit
+submit
 buttons
-text
+text
 input fields
-textareas
+textareas
 
 
 
@@ -372,7 +372,7 @@
 
  
 
-See the HTML Tags
+See the HTML Tags
 Reference
 for detailed information about the available tags in this tag library,
 and the complete list of valid attributes for each tag.
@@ -533,7 +533,7 @@
 
 
 
-base
+base
 
 
 
@@ -572,14 +572,14 @@
 it easy to write "session-aware" hyperlink references:
 
 
-link
+link
 - Renders an HTML anchor or hyperlink.
 
-rewrite
+rewrite
 - Renders a request URI, but without creating the <a> hyperlink.
 This tag is useful when you want to generate a string constant for use
 by a JavaScript procedure.
-img
+img
 - Renders an HTML <img> element with the image at the specified
 URL.
 
@@ -837,7 +837,7 @@
 
 
 
-See the HTML Tags
+See the HTML Tags
 Reference
 for the complete list of valid attributes for each tag.. 
 
@@ -847,31 +847,31 @@
 Internationalization is automatically supported by the HTML tags where
 appropriate. 
 
-Errors
+Errors
 - By default, the text for your messages will be returned by the default
 message resource, which will select the appropriate language for the user.
 You may also specify another message resource using the 
 bundle
 attribute.
 
-HTML
+HTML
 - Renders an HTML element with language attributes extracted from the
 user's current Locale object, if there is one. 
 
-image
-and img
+image
+and img
 - Can optionally retrieve the value for its binary source and alt text
 from the message resou