Author: jmitchell Date: Thu Apr 13 23:05:10 2006 New Revision: 394027 URL: http://svn.apache.org/viewcvs?rev=394027&view=rev Log: Struts Scripting update towards 1.3.x compatibility (Part 3) * Bring over groovy scripts. * Point all actions at ScriptAction. * Correct groovy imports
Added: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/ - copied from r394010, struts/action/trunk/apps/scripting-mailreader/src.tmp/main/webapp/WEB-INF/scripts/ Removed: struts/action/trunk/apps/scripting-mailreader/src.tmp/main/webapp/WEB-INF/scripts/ Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Welcome.gv struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Welcome.gv URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Welcome.gv?rev=394027&r1=394010&r2=394027&view=diff ============================================================================== --- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Welcome.gv (original) +++ struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Welcome.gv Thu Apr 13 23:05:10 2006 @@ -1,4 +1,4 @@ -import org.apache.struts.webapp.example.*; +import org.apache.struts.apps.mailreader.*; import java.util.ArrayList; // Setup message array in case there are errors Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml?rev=394027&r1=394026&r2=394027&view=diff ============================================================================== --- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml (original) +++ struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml Thu Apr 13 23:05:10 2006 @@ -114,32 +114,24 @@ </action> <!-- Display welcome page --> - <action - path="/Welcome" - type="org.apache.struts.apps.mailreader.actions.WelcomeAction"> + <action path="/Welcome" + type="org.apache.struts.scripting.ScriptAction" + parameter="/WEB-INF/scripts/Welcome.gv"> <forward name="Success" path="/Welcome.jsp"/> </action> - <!-- Display welcome page --> - <action - path="/Welcome" - forward="/Welcome.jsp"/> <!-- Change locale action --> - <action - path="/Locale" - type="org.apache.struts.apps.mailreader.actions.LocaleAction" - parameter="Success"> - <forward - name="Success" - path="/Welcome.do"/> - </action> + <action + path="/Locale" + type="org.apache.struts.scripting.ScriptAction" + parameter="/WEB-INF/scripts/Locale.gv?defaultTarget=welcome" /> <!-- Process a user logon --> <action path="/SubmitLogon" - type="org.apache.struts.apps.mailreader.actions.LogonAction" + type="org.apache.struts.scripting.ScriptAction" name="LogonForm" scope="request" cancellable="true" @@ -157,7 +149,7 @@ <!-- Display MainMenu --> <action path="/MainMenu" - type="org.apache.struts.apps.mailreader.actions.MainMenuAction"> + type="org.apache.struts.scripting.ScriptAction"> <forward name="Success" path="/MainMenu.jsp"/> @@ -166,7 +158,7 @@ <!-- Process a user logoff --> <action path="/Logoff" - type="org.apache.struts.apps.mailreader.actions.LogoffAction"> + type="org.apache.struts.scripting.ScriptAction"> <forward name="Success" path="/Welcome.do"/> @@ -175,7 +167,7 @@ <!-- "Abstract" mapping to use as base --> <action path="//BaseAction" input="Input" - type="org.apache.struts.apps.mailreader.actions.{1}Action" + type="org.apache.struts.scripting.ScriptAction" name="{1}Form" scope="request"> <forward @@ -214,7 +206,7 @@ <action path="/SaveSubscription" extends="/Save*" - type="org.apache.struts.apps.mailreader.actions.SubscriptionAction" + type="org.apache.struts.scripting.ScriptAction" name="SubscriptionForm"> <forward name="Success" --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]