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

2006-08-30 Thread tmjee
Author: tmjee
Date: Wed Aug 30 00:39:00 2006
New Revision: 438410

URL: http://svn.apache.org/viewvc?rev=438410&view=rev
Log:
WW-1422
  - fixed else tag executed when it is not suppose, when used with ElseIf tag.

Modified:

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

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java?rev=438410&r1=438409&r2=438410&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
 Wed Aug 30 00:39:00 2006
@@ -85,7 +85,12 @@
 }
 
 public boolean end(Writer writer, String body) {
-
+if (answer == null) {
+answer = Boolean.FALSE;
+}
+if (answer.booleanValue()) {
+stack.getContext().put(If.ANSWER, answer);
+}
 return super.end(writer, "");
 }
 




svn commit: r438411 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag: testIf.ftl testIf.jsp

2006-08-30 Thread tmjee
Author: tmjee
Date: Wed Aug 30 00:45:32 2006
New Revision: 438411

URL: http://svn.apache.org/viewvc?rev=438411&view=rev
Log:
WW-1422
  - alter if tag example (jsp / freemarker template) in showcase to test for 
this issue.
  - the example should have tested most 

Modified:

struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl

struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.jsp

Modified: 
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl?rev=438411&r1=438410&r2=438411&view=diff
==
--- 
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl 
(original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/ifTag/testIf.ftl 
Wed Aug 30 00:45:32 2006
@@ -2,67 +2,606 @@

TEST IF

-   
-
+
+
+This is a simple freemarker template to test the If Tag (using freemarker 
directive).
+There's quite a few combination being tested. The characters in bold and 
non-bold should be the same.
+   
+   
+   
+1 - Foo -
 <@s.if test="true">
-   1]THIS SHOULD APPEAR 
+   Foo
 
 <@s.else>
-   THIS SHOULD NOT APPEAR 
+   Bar
 
-
-
-
+
+2 - Bar -
 <@s.if test="false">
-   THIS SHOULD NOT APPEAR 
+   Foo
+
+<@s.else>
+   Bar
+
+
+3 - FooFooFoo - 
+<@s.if test="true">
+   Foo
+   <@s.if test="true">
+   FooFoo  
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.else>
+   Bar
+
+
+4 - FooBarBar - 
+<@s.if test="true">
+   Foo
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.else>
+   BarBar
+   
+
+
+5 - BarFooFoo - 
+<@s.if test="false">
+   Foo
+
+<@s.else>
+   Bar
+   <@s.if test="true">
+   FooFoo
+   
+   <@s.else>
+   BarBar
+   
+
+
+6 - BarBarBar - 
+<@s.if test="false">
+   Foo
+
+<@s.else>
+   Bar
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.else>
+   BarBar
+   
+
+
+7 - Foo - 
+<@s.if test="true">
+   Foo
+
+<@s.elseif test="false">
+   Moo
+
+<@s.else>
+   Bar
+
+
+8 - Moo - 
+<@s.if test="false">
+   Foo
 
 <@s.elseif test="true">
-   2]THIS SHOULD APPEAR 
+   Moo
+
+<@s.else>
+   Bar
+
+
+9 - Bar - 
+<@s.if test="false">
+   Foo
+
+<@s.elseif test="false">
+   Moo
+
+<@s.else>
+   Bar
+
+
+10 - FooFooFoo - 
+<@s.if test="true">
+   Foo
+   <@s.if test="true">
+   FooFoo
+   
+   <@s.elseif test="false">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.elseif test="false">
+   Moo
+
+<@s.else>
+   Bar
+
+
+11 - FooMooMoo - 
+<@s.if test="true">
+   Foo
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.elseif test="true">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.elseif test="false">
+   Moo
 
+<@s.else>
+   Bar
+
+
+12 - FooBarBar - 
+<@s.if test="true">
+   Foo
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.elseif test="false">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.elseif test="false">
+   Moo
+
+<@s.else>
+   Bar
+
+
+13 - MooFooFoo - 
+<@s.if test="false">
+   Foo
+
+<@s.elseif test="true">
+   Moo
+   <@s.if test="true">
+   FooFoo
+   
+   <@s.elseif test="false">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.else>
+   Bar
+
+
+14 - MooMooMoo - 
+<@s.if test="false">
+   Foo
+
+<@s.elseif test="true">
+   Moo
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.elseif test="true">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.else>
+   Bar
+
+
+15 - MooBarBar - 
+<@s.if test="false">
+   Foo
+
+<@s.elseif test="true">
+   Moo
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.elseif test="false">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+
+<@s.else>
+   Bar
+
+
+16 - BarFooFoo - 
+<@s.if test="false">   
+   Foo
+
+<@s.elseif test="false">
+   Moo
+
+<@s.else>
+   Bar
+   <@s.if test="true">
+   FooFoo
+   
+   <@s.elseif test="false">
+   MooMoo
+   
+   <@s.else>
+   BarBar
+   
+ 
+
+17 - BarMooMoo - 
+<@s.if test="false">   
+   Foo
+
+<@s.elseif test="false">
+   Moo
+
+<@s.else>
+   Bar
+   <@s.if test="false">
+   FooFoo
+   
+   <@s.elseif test="true">
+   MooMoo
+   
+   <@s.else>
+   Bar

svn commit: r438498 - in /struts/struts2/trunk/apps/mailreader/src: main/java/ main/java/mailreader2/subscription/ main/webapp/pages/ test/java/mailreader2/

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 07:34:37 2006
New Revision: 438498

URL: http://svn.apache.org/viewvc?rev=438498&view=rev
Log:
WW-1349 MailReader: Conform class names

Modified:

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java?rev=438498&r1=438497&r2=438498&view=diff
==
--- 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
 Wed Aug 30 07:34:37 2006
@@ -9,7 +9,7 @@
 
 /**
  *  Provide an Edit method for retrieving an existing subscription, and a
- * Save method for updating or inserting a subscription. 
+ * Update method for updating or inserting a subscription. 
  */
 public class Support extends MailreaderSupport
 implements Preparable {

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java?rev=438498&r1=438497&r2=438498&view=diff
==
--- 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
 Wed Aug 30 07:34:37 2006
@@ -5,7 +5,7 @@
 /**
  *  Workaround class. Submitting to an alias doesn't seem to work. 
  */
-public final class Save extends Edit {
+public final class Update extends Edit {
 
 public void prepare() {
 super.prepare();

Modified: struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml?rev=438498&r1=438497&r2=438498&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml Wed Aug 30 
07:34:37 2006
@@ -26,7 +26,7 @@
 
 
 
-
+
 /pages/subscription.jsp
 registration/+Input
 
@@ -43,7 +43,7 @@
 /pages/{1}.jsp
 
 
-
+
 
 
 /pages/{1}.jsp

Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp?rev=438498&r1=438497&r2=438498&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp Wed 
Aug 30 07:34:37 2006
@@ -9,10 +9,10 @@
   type="text/css"/>
 
 
-
+
 
 
-
+
 
 
 

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp?rev=438498&r1=438497&r2=438498&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp 
Wed Aug 30 07:34:37 2006
@@ -14,10 +14,10 @@
   type="text/css"/>
 
 
-
+
 
 
-
+
 
 
 

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp?rev=438498&r1=438497&r2=438498&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp 
Wed Aug 30 07:34:37 2006
@@ -17,10 +17,10 @@
   type="text/css"/>
 
 
-
+
 
 
-
+
 
 
 

Modified: 
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
URL: 
http

svn commit: r438499 - in /struts: sandbox/trunk/struts2/apps/mailreader-wildone/ struts2/trunk/apps/mailreader/

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 07:36:31 2006
New Revision: 438499

URL: http://svn.apache.org/viewvc?rev=438499&view=rev
Log:
WW-1349 MailReader: Move the current mailreader example to the sandbox, as an 
alternative example, 'mailreader-wildone' (one execute method per class with 
wildcards), and replace it with the wilcard-version of 'mailreader-bang', which 
uses multiple methods per Action class (per the usual practice).

Added:
struts/sandbox/trunk/struts2/apps/mailreader-wildone/
  - copied from r438498, struts/struts2/trunk/apps/mailreader/
Removed:
struts/struts2/trunk/apps/mailreader/



svn commit: r438500 - /struts/struts2/trunk/apps/mailreader/

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 07:37:17 2006
New Revision: 438500

URL: http://svn.apache.org/viewvc?rev=438500&view=rev
Log:
WW-1349 MailReader: Move the current mailreader example to the sandbox, as an 
alternative example, 'mailreader-wildone' (one execute method per class with 
wildcards), and replace it with the wilcard-version of 'mailreader-bang', which 
uses multiple methods per Action class (per the usual practice).

Added:
struts/struts2/trunk/apps/mailreader/
  - copied from r438499, struts/sandbox/trunk/struts2/apps/mailreader-bang/



svn commit: r438524 - in /struts/struts2/trunk/apps/mailreader/src/main: java/ java/mailreader2/ webapp/pages/

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 08:46:32 2006
New Revision: 438524

URL: http://svn.apache.org/viewvc?rev=438524&view=rev
Log:
WW-1349 MailReader: Minor refactorings to optimize use of wildcard DMI. 

Added:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml
  - copied, changed from r438500, 
struts/struts2/trunk/apps/mailreader/src/main/java/struts-support.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
  - copied, changed from r438500, 
struts/struts2/trunk/apps/mailreader/src/main/java/struts-wildcard.xml

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration-Registration!save-validation.xml
  - copied unchanged from r438522, 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration-RegistrationSave-validation.xml
Removed:

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration-RegistrationSave-validation.xml
struts/struts2/trunk/apps/mailreader/src/main/java/struts-bang.xml
struts/struts2/trunk/apps/mailreader/src/main/java/struts-support.xml
struts/struts2/trunk/apps/mailreader/src/main/java/struts-wildcard.xml
Modified:

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration.java
struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp

Copied: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml (from 
r438500, struts/struts2/trunk/apps/mailreader/src/main/java/struts-support.xml)
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml?p2=struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml&p1=struts/struts2/trunk/apps/mailreader/src/main/java/struts-support.xml&r1=438500&r2=438524&rev=438524&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/struts-support.xml 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml 
Wed Aug 30 08:46:32 2006
@@ -5,7 +5,7 @@
 
 
 
-
+
 
 
 
@@ -46,28 +46,6 @@
 result="error"
 exception="java.lang.Throwable"/>
 
-
-
-/pages/Welcome.jsp
-
-
-
-
-/pages/ChangePassword.jsp
-
-
-
-/pages/MainMenu.jsp
-
-
-
-Welcome
-
-
-
-/pages/tour.html
-
-
 
 
 

Copied: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml (from 
r438500, struts/struts2/trunk/apps/mailreader/src/main/java/struts-wildcard.xml)
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml?p2=struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml&p1=struts/struts2/trunk/apps/mailreader/src/main/java/struts-wildcard.xml&r1=438500&r2=438524&rev=438524&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/struts-wildcard.xml 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml 
Wed Aug 30 08:46:32 2006
@@ -4,7 +4,21 @@
 "http://struts.apache.org/dtds/struts-2.0.dtd";>
 
 
-
+
+
+
+/pages/tour.html
+
+
+
+
+/pages/Welcome.jsp
+
+
+
+
+Welcome
+
 
 
 /pages/Logon.jsp
@@ -23,22 +37,20 @@
 
 
 
-
-/pages/Registration.jsp
-MainMenu
-
-
-
-
+
 /pages/Subscription.jsp
 Registration!input
+
 
 
-
+
 /pages/Subscription.jsp
 Registration!input
-
 
 
+
+/pages/{1}.jsp
+
+
 
 

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration.java?rev=438524&r1=438523&r2=438524&view=diff
==
--- 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration.java
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Registration.java
 Wed Aug 30 08:46:32 2006
@@ -40,12 +40,22 @@
 }
 
 /**
+ * Insert or update a Registration.
+ *
+ * @return The "outcome" result code
+ * @throws Exception on any error
+ */
+public String save() throws Exception {
+return execute();
+

svn commit: r438532 - in /struts: sandbox/trunk/struts2/apps/cookbook/ sandbox/trunk/struts2/apps/mailreader-bang/ sandbox/trunk/struts2/apps/mailreader-ibatis/ sandbox/trunk/struts2/apps/mailreader-w

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 09:13:17 2006
New Revision: 438532

URL: http://svn.apache.org/viewvc?rev=438532&view=rev
Log:
WW-1349 Update and Add READMEs for applications. 

Added:
struts/sandbox/trunk/struts2/apps/cookbook/README.txt
struts/sandbox/trunk/struts2/apps/mailreader-ibatis/README.txt
struts/sandbox/trunk/struts2/apps/mailreader-wildone/README.txt
struts/struts2/trunk/apps/blank/README.txt
struts/struts2/trunk/apps/portlet/README.txt
struts/struts2/trunk/apps/showcase/README.txt
struts/struts2/trunk/apps/starter/README.txt
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt
struts/struts2/trunk/apps/mailreader/README.txt

Added: struts/sandbox/trunk/struts2/apps/cookbook/README.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/cookbook/README.txt?rev=438532&view=auto
==
--- struts/sandbox/trunk/struts2/apps/cookbook/README.txt (added)
+++ struts/sandbox/trunk/struts2/apps/cookbook/README.txt Wed Aug 30 09:13:17 
2006
@@ -0,0 +1,13 @@
+README.txt - cookbook
+
+The Cookbook is  a collection of working examples which demonstrate how to 
+code common web application use cases.
+
+The application is designed so that the code used to impolement the 
+examples can be viewed online. 
+
+This application is being retained as a placeholder until we can refactor 
+the Showcase to use a similar format. 
+
+
+
\ No newline at end of file

Modified: struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt?rev=438532&r1=438531&r2=438532&view=diff
==
--- struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt (original)
+++ struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt Wed Aug 30 
09:13:17 2006
@@ -1,15 +1,26 @@
 README.txt - mailreader-bang 
 
-This application demonstrates switching from the "bang" syntax for invoking
-dynamic methods to a general-purpose wild card approach. 
+The MailReader demonstrates a localized application with a master/child 
+CRUD workflow. 
 
-To switch between approaches, edit the struts.xml file to include either the 
-struts-bang.xml file OR the struts-wildcard.xml. (But not both.)
+This rendition also demonstrates switching from the "bang" syntax for 
+invoking dynamic methods to a general-purpose wild card approach. 
+
+To switch between approaches, edit the struts.xml file to include either 
+the struts-bang.xml file OR the struts-wildcard.xml. (But not both.)
 
 When using the -bang application, be sure that the 
 struts.enable.DynamicMethodInvocation property is set to "true".
 
 For the -wilcard application. be sure that the 
 struts.enable.DynamicMethodInvocation property is set to "false". 
+
+See the Sandbox for other MailReader examples using other architectures. 
+
+* http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/
+
+For more about the MailReader applicaton genneraly, visit Struts University.
+
+* http://www.StrutsUniversity.org/
 
 

Added: struts/sandbox/trunk/struts2/apps/mailreader-ibatis/README.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-ibatis/README.txt?rev=438532&view=auto
==
--- struts/sandbox/trunk/struts2/apps/mailreader-ibatis/README.txt (added)
+++ struts/sandbox/trunk/struts2/apps/mailreader-ibatis/README.txt Wed Aug 30 
09:13:17 2006
@@ -0,0 +1,18 @@
+README.txt - mailreader-ibatis
+
+The MailReader demonstrates a localized application with a master/child 
+CRUD workflow. 
+
+This rendition also demonstrates using iBATIS SQL Maps and a streamlined 
+data access layer for database access. 
+
+See the Sandbox for other MailReader examples using other architectures. 
+
+* http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/
+
+For more about the MailReader applicaton genneraly, visit Struts University.
+
+* http://www.StrutsUniversity.org/
+
+
+
\ No newline at end of file

Added: struts/sandbox/trunk/struts2/apps/mailreader-wildone/README.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-wildone/README.txt?rev=438532&view=auto
==
--- struts/sandbox/trunk/struts2/apps/mailreader-wildone/README.txt (added)
+++ struts/sandbox/trunk/struts2/apps/mailreader-wildone/README.txt Wed Aug 30 
09:13:17 2006
@@ -0,0 +1,19 @@
+README.txt - mailreader 
+
+The MailReader demonstrates a localized application with a master/child 
+CRUD workflow. 
+
+This

[Struts Wiki] Update of "StrutsDocComments" by MichaelJouravlev

2006-08-30 Thread Apache Wiki
Dear Wiki user,

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

The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/StrutsDocComments

--
  * StrutsCatalogLazyList
  * ...
  * StateManagement
+* RolloverScope
  * ...
  * [:StrutsCatalogDTOImplementation:DTO Implementation]
  * DaoRelated -- Data Access Frameworks


[Struts Wiki] Update of "RolloverScope" by MichaelJouravlev

2006-08-30 Thread Apache Wiki
Dear Wiki user,

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

The following page has been changed by MichaelJouravlev:
http://wiki.apache.org/struts/RolloverScope

New page:
Attention! This page describes a feature that has not been implemented yet!

= Rollover Scope =

In addition to standard J2EE scope objects (request, session, applicaiton) 
Struts supports the rollover scope. This is a virtual scope, which for most 
uses and purposes is identical to request scope, but its content survives till 
the next request comes in.

The major reason for implementing rollover scope is automatic retaining of 
!ActionForm object for its content to be displayed on a consecutive request 
(redirect-after-post pattern).

=== Storing data in rollover scope ===

When an object is stored in rollover scope, the object is actually stored in 
the request scope. Also the reference to the object is stored in rollover scope 
container. If container does not exist, it is created in request scope.

When an object is accessed from rollover scope, the data is actually read from 
the request scope.

Before returning the response to a client Struts verifies whether a rollover 
container exists. If yes, the container is saved in the session scope. A uniqie 
(for a given session) cookie is created and is attached to the response.

=== Handling an incoming request ===

Struts checks whether the request contains rollover cookie. If yes, session is 
looked up for a rollover scope that corresponds to the cookie and content of 
rollover scope is copied to the request object. The rollover container is not 
recreated. (Unique cookies are used as IDs of rollover containers in the 
session object, this allows to have several rollover containers, thus allowing 
to open several browser windows that use the same !ActionForm type.) Response 
object is updated to ensure that the rollover cookie expires on next request.

When user code accesses rollover scope, it actually accesses the request scope. 
Struts tags or JSTL tags automatically pick up data saved in rollover scope 
because this data has been copied back to request scope. Thus, no additional 
support is nesessary for tag libraries.

=== ActionForm and rollover scope ===

An !ActionForm can be configured to be stored in the rollover scope using 
{{{scope="rollover"}}} in an action mapping configuration.

=== 1.2 and 1.3 compatibility ===

Rollover scope is implemented both in 1.2-style RequestProcessor as well as 
1.3-style Command.


svn commit: r438570 - in /struts/struts2/trunk: apps/showcase/src/main/resources/struts-jsf.xml core/src/main/resources/struts-default.xml

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 11:09:22 2006
New Revision: 438570

URL: http://svn.apache.org/viewvc?rev=438570&view=rev
Log:
WW-1308 Disable include of jasperreport and JSF results by default. Specify the 
JSF result in the appropriate package of the showcase application. 

Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml

Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml?rev=438570&r1=438569&r2=438570&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml Wed 
Aug 30 11:09:22 2006
@@ -5,6 +5,11 @@
   
 
   
+
+  
+  
+  
+
 
   
 
@@ -12,8 +17,9 @@
 
   
 
-
+
 
+
   
   
   

Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=438570&r1=438569&r2=438570&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Wed Aug 30 
11:09:22 2006
@@ -19,10 +19,10 @@
 
 
 
-
+
 
 
 




svn commit: r438662 - /struts/struts2/trunk/apps/mailreader/pom.xml

2006-08-30 Thread husted
Author: husted
Date: Wed Aug 30 14:59:20 2006
New Revision: 438662

URL: http://svn.apache.org/viewvc?rev=438662&view=rev
Log:
WW-1349 Update POM to current release format. 


Modified:
struts/struts2/trunk/apps/mailreader/pom.xml

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=438662&r1=438661&r2=438662&view=diff
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Wed Aug 30 14:59:20 2006
@@ -5,7 +5,7 @@
 
   org.apache.struts
   struts2-apps
-  2.0-SNAPSHOT
+  2.0.0-SNAPSHOT
 
 org.apache.struts
 struts2-mailreader




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

2006-08-30 Thread wsmoak
Author: wsmoak
Date: Wed Aug 30 21:38:08 2006
New Revision: 438788

URL: http://svn.apache.org/viewvc?rev=438788&view=rev
Log:
Activate the dtddoc profile by default, and exclude the web-app dtd.
STR-2942

Modified:
struts/struts1/trunk/pom.xml

Modified: struts/struts1/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=438788&r1=438787&r2=438788&view=diff
==
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Wed Aug 30 21:38:08 2006
@@ -97,6 +97,9 @@
 
 
 dtddoc
+
+true
+
 
 
 dtddoc
@@ -114,6 +117,11 @@
 
 net.sf.dtddoc
 dtddoc-maven-plugin
+
+
+**/web-app*
+
+