Author: husted
Date: Mon Aug 28 20:34:06 2006
New Revision: 437938
URL: http://svn.apache.org/viewvc?rev=437938&view=rev
Log:
WW-1353 Add wildcard configuration and README.txt
Added:
struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
Added: 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=437938&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt (added)
+++ struts/sandbox/trunk/struts2/apps/mailreader-bang/README.txt Mon Aug 28
20:34:06 2006
@@ -0,0 +1,16 @@
+README.txt - mailreader-bang
+
+This application demonstrates switching form 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
+disableDynamicMethodInvocation property is set to false.
+
+For the -wilcard application. be sure that the
+disableDynamicMethodInvocation property is set to true.
+
+
+----------------------------------------------------------------------------
\ No newline at end of file
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties?rev=437938&r1=437937&r2=437938&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties
Mon Aug 28 20:34:06 2006
@@ -2,5 +2,5 @@
struts.devMode = true
struts.action.extension = do
struts.custom.i18n.resources = resources
-struts.compatibilityMode.WebWork = true
+struts.compatibilityMode.WebWork = false
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml?rev=437938&r1=437937&r2=437938&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml
Mon Aug 28 20:34:06 2006
@@ -4,105 +4,15 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="struts-default.xml"/>
-
- <package name="default" namespace="/" extends="struts-default">
-
- <interceptors>
-
- <interceptor name="authentication"
- class="mailreader2.AuthenticationInterceptor"/>
-
- <interceptor-stack name="user" >
- <interceptor-ref name="authentication" />
- <interceptor-ref name="defaultStack"/>
- </interceptor-stack>
-
- <interceptor-stack name="user-submit" >
- <interceptor-ref name="token-session" />
- <interceptor-ref name="user"/>
- </interceptor-stack>
-
- <interceptor-stack name="guest" >
- <interceptor-ref name="defaultStack"/>
- </interceptor-stack>
-
- <interceptor-stack name="guest-submit" >
- <interceptor-ref name="token-session" />
- <interceptor-ref name="guest"/>
- </interceptor-stack>
-
- </interceptors>
- <default-interceptor-ref name="user"/>
-
- <global-results>
- <result name="error">/pages/Error.jsp</result>
- <result name="invalid.token">/pages/Error.jsp</result>
- <result name="login" type="redirect-action">Logon!input</result>
- </global-results>
-
- <global-exception-mappings>
- <exception-mapping
- result="error"
- exception="java.lang.Throwable"/>
- </global-exception-mappings>
-
- <action name="Welcome" class="mailreader2.Welcome">
- <result>/pages/Welcome.jsp</result>
- <interceptor-ref name="guest"/>
- </action>
-
- <action name="Logon" class="mailreader2.Logon">
- <result name="input">/pages/Logon.jsp</result>
- <result name="cancel" type="redirect-action">Welcome</result>
- <result type="redirect-action">MainMenu</result>
- <result name="expired" type="chain">ChangePassword</result>
- <exception-mapping
-
exception="org.apache.struts.apps.mailreader.dao.ExpiredPasswordException"
- result="expired"/>
- <interceptor-ref name="guest"/>
- </action>
-
- <action name="ChangePassword">
- <result>/pages/ChangePassword.jsp</result>
- </action>
-
- <action name="MainMenu" class="mailreader2.MailreaderSupport">
- <result>/pages/MainMenu.jsp</result>
- </action>
-
- <action name="Registration" class="mailreader2.Registration">
- <result name="input">/pages/Registration.jsp</result>
- <result type="redirect-action">MainMenu</result>
- <interceptor-ref name="guest"/>
- </action>
-
- <action name="RegistrationSave" class="mailreader2.Registration">
- <result name="input">/pages/Registration.jsp</result>
- <result type="redirect-action">MainMenu</result>
- <interceptor-ref name="guest-submit" />
- </action>
-
- <action name="Subscription" class="mailreader2.Subscription">
- <result name="input">/pages/Subscription.jsp</result>
- <result type="redirect-action">Registration!input</result>
- </action>
+ <include file="struts-default.xml"/>
- <action name="SubscriptionSave" class="mailreader2.SubscriptionSave">
- <result name="input">/pages/Subscription.jsp</result>
- <result type="redirect-action">Registration!input</result>
- <interceptor-ref name="user-submit" />
- </action>
+ <include file="struts-support.xml"/>
- <action name="Logoff" class="mailreader2.Logoff">
- <result type="redirect-action">Welcome</result>
- </action>
+ <!--
+ <include file="struts-bang.xml"/>
+ -->
- <action name="Tour">
- <result>/pages/tour.html</result>
- <interceptor-ref name="guest"/>
- </action>
+ <include file="struts-wildcard.xml"/>
- </package>
-</struts>
+</struts>
\ No newline at end of file
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp?rev=437938&r1=437937&r2=437938&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Logon.jsp
Mon Aug 28 20:34:06 2006
@@ -12,7 +12,7 @@
<body onLoad="self.focus();document.Logon.username.focus()">
<s:actionerror />
-<s:form method="POST" validate="true">
+<s:form action="Logon" validate="true">
<s:textfield label="%{getText('username')}" name="username"/>
<s:password label="%{getText('password')}" name="password"
showPassword="true"/>
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp?rev=437938&r1=437937&r2=437938&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Registration.jsp
Mon Aug 28 20:34:06 2006
@@ -17,7 +17,7 @@
<body onLoad="self.focus();document.Registration.username.focus()">
<s:actionerror/>
-<s:form method="POST" validate="false">
+<s:form action="RegistrationSave" validate="false">
<s:token />
<s:hidden name="task"/>
<s:if test="task == 'Create'">
Modified:
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp?rev=437938&r1=437937&r2=437938&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
(original)
+++
struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/webapp/pages/Subscription.jsp
Mon Aug 28 20:34:06 2006
@@ -20,7 +20,7 @@
<body onLoad="self.focus();document.Subscription.username.focus()">
<s:actionerror/>
-<s:form method="POST" action="SubscriptionSave" validate="false">
+<s:form action="SubscriptionSave" validate="false">
<s:token />
<s:hidden name="task"/>
<s:label label="%{getText('username')}" name="user.username"/>
