struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r370938 [24/50] - in /struts: action/trunk/ action/trunk/conf/java/ action/trunk/src/java/org/apache/struts/ action/trunk/src/java/org/apache/struts/action/ action/trunk/src/java/org/apache/struts/chain/ action/trunk/src/java/org/apache/str...
Date Sat, 21 Jan 2006 00:21:00 GMT
Modified: struts/action/trunk/src/test/org/apache/struts/config/struts-config-1.1.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/test/org/apache/struts/config/struts-config-1.1.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/test/org/apache/struts/config/struts-config-1.1.xml (original)
+++ struts/action/trunk/src/test/org/apache/struts/config/struts-config-1.1.xml Fri Jan 20 16:19:02 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!DOCTYPE struts-config PUBLIC
-          "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
-          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+        "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
 
 <!--
      This is the Struts configuration file for the example application,
@@ -19,109 +19,109 @@
 <struts-config>
 
 
-  <!-- ========== Form Bean Definitions =================================== -->
-  <form-beans>
+    <!-- ========== Form Bean Definitions =================================== -->
+    <form-beans>
 
-    <!-- Logon form bean -->
-    <form-bean      name="logonForm"
-                    type="org.apache.struts.webapp.example.LogonForm"/>
-
-    <!-- Registration form bean -->
-    <form-bean      name="registrationForm"
-                    type="org.apache.struts.webapp.example.RegistrationForm"/>
-
-    <!-- Subscription form bean -->
-    <form-bean      name="subscriptionForm"
-                    type="org.apache.struts.webapp.example.SubscriptionForm"/>
-
-  </form-beans>
-
-
-  <!-- ========== Global Forward Definitions ============================== -->
-  <global-forwards>
-    <forward   name="logoff"               path="/logoff.do"/>
-    <forward   name="logon"                path="/logon.jsp"/>
-    <forward   name="success"              path="/mainMenu.jsp"/>
-  </global-forwards>
-
-
-  <!-- ========== Action Mapping Definitions ============================== -->
-  <action-mappings>
-
-    <!-- Edit user registration -->
-    <action    path="/editRegistration"
-               type="org.apache.struts.webapp.example.EditRegistrationAction"
-          attribute="registrationForm"
-              scope="request"
-           validate="false">
-      <forward name="success"              path="/registration.jsp"/>
-    </action>
-
-    <!-- Edit mail subscription -->
-    <action    path="/editSubscription"
-               type="org.apache.struts.webapp.example.EditSubscriptionAction"
-          attribute="subscriptionForm"
-              scope="request"
-           validate="false">
-      <forward name="failure"              path="/mainMenu.jsp"/>
-      <forward name="success"              path="/subscription.jsp"/>
-    </action>
-
-    <!-- Process a user logoff -->
-    <action    path="/logoff"
-               type="org.apache.struts.webapp.example.LogoffAction">
-      <forward name="success"              path="/index.jsp"/>
-    </action>
-
-    <!-- Process a user logon -->
-    <action    path="/logon"
-               type="org.apache.struts.webapp.example.LogonAction"
-               name="logonForm"
-              scope="request"
-              input="/logon.jsp">
-    </action>
-
-    <!-- Save user registration -->
-    <action    path="/saveRegistration"
-               type="org.apache.struts.webapp.example.SaveRegistrationAction"
-               name="registrationForm"
-              scope="request"
-              input="/registration.jsp"/>
-
-    <!-- Save mail subscription -->
-    <action    path="/saveSubscription"
-               type="org.apache.struts.webapp.example.SaveSubscriptionAction"
-               name="subscriptionForm"
-              scope="request"
-              input="/subscription.jsp">
-      <forward name="success"         path="/editRegistration.do?action=Edit"/>
-    </action>
-
-
-    <!-- Display the "walking tour" documentation -->
-    <action    path="/tour"
-            forward="/tour.htm">
-    </action>
-
-    <!-- The standard administrative actions available with Struts -->
-    <!-- These would be either omitted or protected by security -->
-    <!-- in a real application deployment -->
-    <action    path="/admin/addFormBean"
-               type="org.apache.struts.actions.AddFormBeanAction"/>
-    <action    path="/admin/addForward"
-               type="org.apache.struts.actions.AddForwardAction"/>
-    <action    path="/admin/addMapping"
-               type="org.apache.struts.actions.AddMappingAction"/>
-    <action    path="/admin/reload"
-               type="org.apache.struts.actions.ReloadAction"/>
-    <action    path="/admin/removeFormBean"
-               type="org.apache.struts.actions.RemoveFormBeanAction"/>
-    <action    path="/admin/removeForward"
-               type="org.apache.struts.actions.RemoveForwardAction"/>
-    <action    path="/admin/removeMapping"
-               type="org.apache.struts.actions.RemoveMappingAction"/>
+        <!-- Logon form bean -->
+        <form-bean name="logonForm"
+                   type="org.apache.struts.webapp.example.LogonForm"/>
+
+        <!-- Registration form bean -->
+        <form-bean name="registrationForm"
+                   type="org.apache.struts.webapp.example.RegistrationForm"/>
+
+        <!-- Subscription form bean -->
+        <form-bean name="subscriptionForm"
+                   type="org.apache.struts.webapp.example.SubscriptionForm"/>
+
+    </form-beans>
+
+
+    <!-- ========== Global Forward Definitions ============================== -->
+    <global-forwards>
+        <forward name="logoff" path="/logoff.do"/>
+        <forward name="logon" path="/logon.jsp"/>
+        <forward name="success" path="/mainMenu.jsp"/>
+    </global-forwards>
+
+
+    <!-- ========== Action Mapping Definitions ============================== -->
+    <action-mappings>
+
+        <!-- Edit user registration -->
+        <action path="/editRegistration"
+                type="org.apache.struts.webapp.example.EditRegistrationAction"
+                attribute="registrationForm"
+                scope="request"
+                validate="false">
+            <forward name="success" path="/registration.jsp"/>
+        </action>
+
+        <!-- Edit mail subscription -->
+        <action path="/editSubscription"
+                type="org.apache.struts.webapp.example.EditSubscriptionAction"
+                attribute="subscriptionForm"
+                scope="request"
+                validate="false">
+            <forward name="failure" path="/mainMenu.jsp"/>
+            <forward name="success" path="/subscription.jsp"/>
+        </action>
+
+        <!-- Process a user logoff -->
+        <action path="/logoff"
+                type="org.apache.struts.webapp.example.LogoffAction">
+            <forward name="success" path="/index.jsp"/>
+        </action>
+
+        <!-- Process a user logon -->
+        <action path="/logon"
+                type="org.apache.struts.webapp.example.LogonAction"
+                name="logonForm"
+                scope="request"
+                input="/logon.jsp">
+        </action>
+
+        <!-- Save user registration -->
+        <action path="/saveRegistration"
+                type="org.apache.struts.webapp.example.SaveRegistrationAction"
+                name="registrationForm"
+                scope="request"
+                input="/registration.jsp"/>
+
+        <!-- Save mail subscription -->
+        <action path="/saveSubscription"
+                type="org.apache.struts.webapp.example.SaveSubscriptionAction"
+                name="subscriptionForm"
+                scope="request"
+                input="/subscription.jsp">
+            <forward name="success" path="/editRegistration.do?action=Edit"/>
+        </action>
+
+
+        <!-- Display the "walking tour" documentation -->
+        <action path="/tour"
+                forward="/tour.htm">
+        </action>
+
+        <!-- The standard administrative actions available with Struts -->
+        <!-- These would be either omitted or protected by security -->
+        <!-- in a real application deployment -->
+        <action path="/admin/addFormBean"
+                type="org.apache.struts.actions.AddFormBeanAction"/>
+        <action path="/admin/addForward"
+                type="org.apache.struts.actions.AddForwardAction"/>
+        <action path="/admin/addMapping"
+                type="org.apache.struts.actions.AddMappingAction"/>
+        <action path="/admin/reload"
+                type="org.apache.struts.actions.ReloadAction"/>
+        <action path="/admin/removeFormBean"
+                type="org.apache.struts.actions.RemoveFormBeanAction"/>
+        <action path="/admin/removeForward"
+                type="org.apache.struts.actions.RemoveForwardAction"/>
+        <action path="/admin/removeMapping"
+                type="org.apache.struts.actions.RemoveMappingAction"/>
 
 
-  </action-mappings>
+    </action-mappings>
 
 </struts-config>

Modified: struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping-1.1.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping-1.1.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping-1.1.xml (original)
+++ struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping-1.1.xml Fri Jan 20 16:19:02 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!DOCTYPE struts-config PUBLIC
-          "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
-          "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+        "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
 
 <!--
      This is the Struts configuration file for the example application,
@@ -19,111 +19,111 @@
 <struts-config>
 
 
-  <!-- ========== Form Bean Definitions =================================== -->
-  <form-beans>
+    <!-- ========== Form Bean Definitions =================================== -->
+    <form-beans>
 
-    <!-- Logon form bean -->
-    <form-bean      name="logonForm"
-                    type="org.apache.struts.webapp.example.LogonForm"/>
-
-    <!-- Registration form bean -->
-    <form-bean      name="registrationForm"
-                    type="org.apache.struts.webapp.example.RegistrationForm"/>
-
-    <!-- Subscription form bean -->
-    <form-bean      name="subscriptionForm"
-                    type="org.apache.struts.webapp.example.SubscriptionForm"/>
-
-  </form-beans>
-
-
-  <!-- ========== Global Forward Definitions ============================== -->
-  <global-forwards>
-    <forward   name="logoff"               path="/logoff.do"/>
-    <forward   name="logon"                path="/logon.jsp"/>
-    <forward   name="success"              path="/mainMenu.jsp"/>
-  </global-forwards>
-
-
-  <!-- ========== Action Mapping Definitions ============================== -->
-  <action-mappings>
-
-    <!-- Edit user registration -->
-    <action    path="/editRegistration"
-               type="org.apache.struts.webapp.example.EditRegistrationAction"
-          attribute="registrationForm"
-              scope="request"
-           validate="false"
-           className="org.apache.struts.config.CustomMappingTest">
-      <set-property property="public" value="true"/>
-      <forward name="success"              path="/registration.jsp"/>
-    </action>
-
-    <!-- Edit mail subscription -->
-    <action    path="/editSubscription"
-               type="org.apache.struts.webapp.example.EditSubscriptionAction"
-          attribute="subscriptionForm"
-              scope="request"
-           validate="false">
-      <forward name="failure"              path="/mainMenu.jsp"/>
-      <forward name="success"              path="/subscription.jsp"/>
-    </action>
-
-    <!-- Process a user logoff -->
-    <action    path="/logoff"
-               type="org.apache.struts.webapp.example.LogoffAction">
-      <forward name="success"              path="/index.jsp"/>
-    </action>
-
-    <!-- Process a user logon -->
-    <action    path="/logon"
-               type="org.apache.struts.webapp.example.LogonAction"
-               name="logonForm"
-              scope="request"
-              input="/logon.jsp">
-    </action>
-
-    <!-- Save user registration -->
-    <action    path="/saveRegistration"
-               type="org.apache.struts.webapp.example.SaveRegistrationAction"
-               name="registrationForm"
-              scope="request"
-              input="/registration.jsp"/>
-
-    <!-- Save mail subscription -->
-    <action    path="/saveSubscription"
-               type="org.apache.struts.webapp.example.SaveSubscriptionAction"
-               name="subscriptionForm"
-              scope="request"
-              input="/subscription.jsp">
-      <forward name="success"         path="/editRegistration.do?action=Edit"/>
-    </action>
-
-
-    <!-- Display the "walking tour" documentation -->
-    <action    path="/tour"
-            forward="/tour.htm">
-    </action>
-
-    <!-- The standard administrative actions available with Struts -->
-    <!-- These would be either omitted or protected by security -->
-    <!-- in a real application deployment -->
-    <action    path="/admin/addFormBean"
-               type="org.apache.struts.actions.AddFormBeanAction"/>
-    <action    path="/admin/addForward"
-               type="org.apache.struts.actions.AddForwardAction"/>
-    <action    path="/admin/addMapping"
-               type="org.apache.struts.actions.AddMappingAction"/>
-    <action    path="/admin/reload"
-               type="org.apache.struts.actions.ReloadAction"/>
-    <action    path="/admin/removeFormBean"
-               type="org.apache.struts.actions.RemoveFormBeanAction"/>
-    <action    path="/admin/removeForward"
-               type="org.apache.struts.actions.RemoveForwardAction"/>
-    <action    path="/admin/removeMapping"
-               type="org.apache.struts.actions.RemoveMappingAction"/>
+        <!-- Logon form bean -->
+        <form-bean name="logonForm"
+                   type="org.apache.struts.webapp.example.LogonForm"/>
+
+        <!-- Registration form bean -->
+        <form-bean name="registrationForm"
+                   type="org.apache.struts.webapp.example.RegistrationForm"/>
+
+        <!-- Subscription form bean -->
+        <form-bean name="subscriptionForm"
+                   type="org.apache.struts.webapp.example.SubscriptionForm"/>
+
+    </form-beans>
+
+
+    <!-- ========== Global Forward Definitions ============================== -->
+    <global-forwards>
+        <forward name="logoff" path="/logoff.do"/>
+        <forward name="logon" path="/logon.jsp"/>
+        <forward name="success" path="/mainMenu.jsp"/>
+    </global-forwards>
+
+
+    <!-- ========== Action Mapping Definitions ============================== -->
+    <action-mappings>
+
+        <!-- Edit user registration -->
+        <action path="/editRegistration"
+                type="org.apache.struts.webapp.example.EditRegistrationAction"
+                attribute="registrationForm"
+                scope="request"
+                validate="false"
+                className="org.apache.struts.config.CustomMappingTest">
+            <set-property property="public" value="true"/>
+            <forward name="success" path="/registration.jsp"/>
+        </action>
+
+        <!-- Edit mail subscription -->
+        <action path="/editSubscription"
+                type="org.apache.struts.webapp.example.EditSubscriptionAction"
+                attribute="subscriptionForm"
+                scope="request"
+                validate="false">
+            <forward name="failure" path="/mainMenu.jsp"/>
+            <forward name="success" path="/subscription.jsp"/>
+        </action>
+
+        <!-- Process a user logoff -->
+        <action path="/logoff"
+                type="org.apache.struts.webapp.example.LogoffAction">
+            <forward name="success" path="/index.jsp"/>
+        </action>
+
+        <!-- Process a user logon -->
+        <action path="/logon"
+                type="org.apache.struts.webapp.example.LogonAction"
+                name="logonForm"
+                scope="request"
+                input="/logon.jsp">
+        </action>
+
+        <!-- Save user registration -->
+        <action path="/saveRegistration"
+                type="org.apache.struts.webapp.example.SaveRegistrationAction"
+                name="registrationForm"
+                scope="request"
+                input="/registration.jsp"/>
+
+        <!-- Save mail subscription -->
+        <action path="/saveSubscription"
+                type="org.apache.struts.webapp.example.SaveSubscriptionAction"
+                name="subscriptionForm"
+                scope="request"
+                input="/subscription.jsp">
+            <forward name="success" path="/editRegistration.do?action=Edit"/>
+        </action>
+
+
+        <!-- Display the "walking tour" documentation -->
+        <action path="/tour"
+                forward="/tour.htm">
+        </action>
+
+        <!-- The standard administrative actions available with Struts -->
+        <!-- These would be either omitted or protected by security -->
+        <!-- in a real application deployment -->
+        <action path="/admin/addFormBean"
+                type="org.apache.struts.actions.AddFormBeanAction"/>
+        <action path="/admin/addForward"
+                type="org.apache.struts.actions.AddForwardAction"/>
+        <action path="/admin/addMapping"
+                type="org.apache.struts.actions.AddMappingAction"/>
+        <action path="/admin/reload"
+                type="org.apache.struts.actions.ReloadAction"/>
+        <action path="/admin/removeFormBean"
+                type="org.apache.struts.actions.RemoveFormBeanAction"/>
+        <action path="/admin/removeForward"
+                type="org.apache.struts.actions.RemoveForwardAction"/>
+        <action path="/admin/removeMapping"
+                type="org.apache.struts.actions.RemoveMappingAction"/>
 
 
-  </action-mappings>
+    </action-mappings>
 
 </struts-config>

Modified: struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping.xml (original)
+++ struts/action/trunk/src/test/org/apache/struts/config/struts-config-custom-mapping.xml Fri Jan 20 16:19:02 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!DOCTYPE struts-config PUBLIC
-          "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
-          "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+        "http://struts.apache.org/dtds/struts-config_1_2.dtd">
 
 <!--
      This is the Struts configuration file for the example application,
@@ -18,111 +18,111 @@
 
 <struts-config>
 
-  <!-- ========== Form Bean Definitions =================================== -->
-  <form-beans>
+    <!-- ========== Form Bean Definitions =================================== -->
+    <form-beans>
 
-    <!-- Logon form bean -->
-    <form-bean      name="logonForm"
-                    type="org.apache.struts.webapp.example.LogonForm"/>
-
-    <!-- Registration form bean -->
-    <form-bean      name="registrationForm"
-                    type="org.apache.struts.webapp.example.RegistrationForm"/>
-
-    <!-- Subscription form bean -->
-    <form-bean      name="subscriptionForm"
-                    type="org.apache.struts.webapp.example.SubscriptionForm"/>
-
-  </form-beans>
-
-
-  <!-- ========== Global Forward Definitions ============================== -->
-  <global-forwards>
-    <forward   name="logoff"               path="/logoff.do"/>
-    <forward   name="logon"                path="/logon.jsp"/>
-    <forward   name="success"              path="/mainMenu.jsp"/>
-  </global-forwards>
-
-
-  <!-- ========== Action Mapping Definitions ============================== -->
-  <action-mappings>
-
-    <!-- Edit user registration -->
-    <action    path="/editRegistration"
-               type="org.apache.struts.webapp.example.EditRegistrationAction"
-          attribute="registrationForm"
-              scope="request"
-           validate="false"
-           className="org.apache.struts.config.CustomMappingTest">
-      <set-property property="public" value="true"/>
-      <forward name="success"              path="/registration.jsp"/>
-    </action>
-
-    <!-- Edit mail subscription -->
-    <action    path="/editSubscription"
-               type="org.apache.struts.webapp.example.EditSubscriptionAction"
-          attribute="subscriptionForm"
-              scope="request"
-           validate="false">
-      <forward name="failure"              path="/mainMenu.jsp"/>
-      <forward name="success"              path="/subscription.jsp"/>
-    </action>
-
-    <!-- Process a user logoff -->
-    <action    path="/logoff"
-               type="org.apache.struts.webapp.example.LogoffAction">
-      <forward name="success"              path="/index.jsp"/>
-    </action>
-
-    <!-- Process a user logon -->
-    <action    path="/logon"
-               type="org.apache.struts.webapp.example.LogonAction"
-               name="logonForm"
-              scope="request"
-              input="/logon.jsp">
-    </action>
-
-    <!-- Save user registration -->
-    <action    path="/saveRegistration"
-               type="org.apache.struts.webapp.example.SaveRegistrationAction"
-               name="registrationForm"
-              scope="request"
-              input="/registration.jsp"/>
-
-    <!-- Save mail subscription -->
-    <action    path="/saveSubscription"
-               type="org.apache.struts.webapp.example.SaveSubscriptionAction"
-               name="subscriptionForm"
-              scope="request"
-              input="/subscription.jsp">
-      <forward name="success"         path="/editRegistration.do?action=Edit"/>
-    </action>
-
-
-    <!-- Display the "walking tour" documentation -->
-    <action    path="/tour"
-            forward="/tour.htm">
-    </action>
-
-    <!-- The standard administrative actions available with Struts -->
-    <!-- These would be either omitted or protected by security -->
-    <!-- in a real application deployment -->
-    <action    path="/admin/addFormBean"
-               type="org.apache.struts.actions.AddFormBeanAction"/>
-    <action    path="/admin/addForward"
-               type="org.apache.struts.actions.AddForwardAction"/>
-    <action    path="/admin/addMapping"
-               type="org.apache.struts.actions.AddMappingAction"/>
-    <action    path="/admin/reload"
-               type="org.apache.struts.actions.ReloadAction"/>
-    <action    path="/admin/removeFormBean"
-               type="org.apache.struts.actions.RemoveFormBeanAction"/>
-    <action    path="/admin/removeForward"
-               type="org.apache.struts.actions.RemoveForwardAction"/>
-    <action    path="/admin/removeMapping"
-               type="org.apache.struts.actions.RemoveMappingAction"/>
+        <!-- Logon form bean -->
+        <form-bean name="logonForm"
+                   type="org.apache.struts.webapp.example.LogonForm"/>
+
+        <!-- Registration form bean -->
+        <form-bean name="registrationForm"
+                   type="org.apache.struts.webapp.example.RegistrationForm"/>
+
+        <!-- Subscription form bean -->
+        <form-bean name="subscriptionForm"
+                   type="org.apache.struts.webapp.example.SubscriptionForm"/>
+
+    </form-beans>
+
+
+    <!-- ========== Global Forward Definitions ============================== -->
+    <global-forwards>
+        <forward name="logoff" path="/logoff.do"/>
+        <forward name="logon" path="/logon.jsp"/>
+        <forward name="success" path="/mainMenu.jsp"/>
+    </global-forwards>
+
+
+    <!-- ========== Action Mapping Definitions ============================== -->
+    <action-mappings>
+
+        <!-- Edit user registration -->
+        <action path="/editRegistration"
+                type="org.apache.struts.webapp.example.EditRegistrationAction"
+                attribute="registrationForm"
+                scope="request"
+                validate="false"
+                className="org.apache.struts.config.CustomMappingTest">
+            <set-property property="public" value="true"/>
+            <forward name="success" path="/registration.jsp"/>
+        </action>
+
+        <!-- Edit mail subscription -->
+        <action path="/editSubscription"
+                type="org.apache.struts.webapp.example.EditSubscriptionAction"
+                attribute="subscriptionForm"
+                scope="request"
+                validate="false">
+            <forward name="failure" path="/mainMenu.jsp"/>
+            <forward name="success" path="/subscription.jsp"/>
+        </action>
+
+        <!-- Process a user logoff -->
+        <action path="/logoff"
+                type="org.apache.struts.webapp.example.LogoffAction">
+            <forward name="success" path="/index.jsp"/>
+        </action>
+
+        <!-- Process a user logon -->
+        <action path="/logon"
+                type="org.apache.struts.webapp.example.LogonAction"
+                name="logonForm"
+                scope="request"
+                input="/logon.jsp">
+        </action>
+
+        <!-- Save user registration -->
+        <action path="/saveRegistration"
+                type="org.apache.struts.webapp.example.SaveRegistrationAction"
+                name="registrationForm"
+                scope="request"
+                input="/registration.jsp"/>
+
+        <!-- Save mail subscription -->
+        <action path="/saveSubscription"
+                type="org.apache.struts.webapp.example.SaveSubscriptionAction"
+                name="subscriptionForm"
+                scope="request"
+                input="/subscription.jsp">
+            <forward name="success" path="/editRegistration.do?action=Edit"/>
+        </action>
+
+
+        <!-- Display the "walking tour" documentation -->
+        <action path="/tour"
+                forward="/tour.htm">
+        </action>
+
+        <!-- The standard administrative actions available with Struts -->
+        <!-- These would be either omitted or protected by security -->
+        <!-- in a real application deployment -->
+        <action path="/admin/addFormBean"
+                type="org.apache.struts.actions.AddFormBeanAction"/>
+        <action path="/admin/addForward"
+                type="org.apache.struts.actions.AddForwardAction"/>
+        <action path="/admin/addMapping"
+                type="org.apache.struts.actions.AddMappingAction"/>
+        <action path="/admin/reload"
+                type="org.apache.struts.actions.ReloadAction"/>
+        <action path="/admin/removeFormBean"
+                type="org.apache.struts.actions.RemoveFormBeanAction"/>
+        <action path="/admin/removeForward"
+                type="org.apache.struts.actions.RemoveForwardAction"/>
+        <action path="/admin/removeMapping"
+                type="org.apache.struts.actions.RemoveMappingAction"/>
 
 
-  </action-mappings>
+    </action-mappings>
 
 </struts-config>

Modified: struts/action/trunk/src/test/org/apache/struts/config/struts-config.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/test/org/apache/struts/config/struts-config.xml?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/test/org/apache/struts/config/struts-config.xml (original)
+++ struts/action/trunk/src/test/org/apache/struts/config/struts-config.xml Fri Jan 20 16:19:02 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!DOCTYPE struts-config PUBLIC
-          "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
-          "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+        "http://struts.apache.org/dtds/struts-config_1_2.dtd">
 
 <!--
      This is the Struts configuration file for the example application,
@@ -18,110 +18,110 @@
 
 <struts-config>
 
-  
-  <!-- ========== Form Bean Definitions =================================== -->
-  <form-beans>
-
-    <!-- Logon form bean -->
-    <form-bean      name="logonForm"
-                    type="org.apache.struts.webapp.example.LogonForm"/>
-
-    <!-- Registration form bean -->
-    <form-bean      name="registrationForm"
-                    type="org.apache.struts.webapp.example.RegistrationForm"/>
-
-    <!-- Subscription form bean -->
-    <form-bean      name="subscriptionForm"
-                    type="org.apache.struts.webapp.example.SubscriptionForm"/>
-
-  </form-beans>
-
-
-  <!-- ========== Global Forward Definitions ============================== -->
-  <global-forwards>
-    <forward   name="logoff"               path="/logoff.do"/>
-    <forward   name="logon"                path="/logon.jsp"/>
-    <forward   name="success"              path="/mainMenu.jsp"/>
-  </global-forwards>
-
-
-  <!-- ========== Action Mapping Definitions ============================== -->
-  <action-mappings>
-
-    <!-- Edit user registration -->
-    <action    path="/editRegistration"
-               type="org.apache.struts.webapp.example.EditRegistrationAction"
-          attribute="registrationForm"
-              scope="request"
-           validate="false">
-      <forward name="success"              path="/registration.jsp"/>
-    </action>
-
-    <!-- Edit mail subscription -->
-    <action    path="/editSubscription"
-               type="org.apache.struts.webapp.example.EditSubscriptionAction"
-          attribute="subscriptionForm"
-              scope="request"
-           validate="false">
-      <forward name="failure"              path="/mainMenu.jsp"/>
-      <forward name="success"              path="/subscription.jsp"/>
-    </action>
-
-    <!-- Process a user logoff -->
-    <action    path="/logoff"
-               type="org.apache.struts.webapp.example.LogoffAction">
-      <forward name="success"              path="/index.jsp"/>
-    </action>
-
-    <!-- Process a user logon -->
-    <action    path="/logon"
-               type="org.apache.struts.webapp.example.LogonAction"
-               name="logonForm"
-              scope="request"
-              input="/logon.jsp">
-    </action>
-
-    <!-- Save user registration -->
-    <action    path="/saveRegistration"
-               type="org.apache.struts.webapp.example.SaveRegistrationAction"
-               name="registrationForm"
-              scope="request"
-              input="/registration.jsp"/>
-
-    <!-- Save mail subscription -->
-    <action    path="/saveSubscription"
-               type="org.apache.struts.webapp.example.SaveSubscriptionAction"
-               name="subscriptionForm"
-              scope="request"
-              input="/subscription.jsp">
-      <forward name="success"         path="/editRegistration.do?action=Edit"/>
-    </action>
-
-
-    <!-- Display the "walking tour" documentation -->
-    <action    path="/tour"
-            forward="/tour.htm">
-    </action>
-
-    <!-- The standard administrative actions available with Struts -->
-    <!-- These would be either omitted or protected by security -->
-    <!-- in a real application deployment -->
-    <action    path="/admin/addFormBean"
-               type="org.apache.struts.actions.AddFormBeanAction"/>
-    <action    path="/admin/addForward"
-               type="org.apache.struts.actions.AddForwardAction"/>
-    <action    path="/admin/addMapping"
-               type="org.apache.struts.actions.AddMappingAction"/>
-    <action    path="/admin/reload"
-               type="org.apache.struts.actions.ReloadAction"/>
-    <action    path="/admin/removeFormBean"
-               type="org.apache.struts.actions.RemoveFormBeanAction"/>
-    <action    path="/admin/removeForward"
-               type="org.apache.struts.actions.RemoveForwardAction"/>
-    <action    path="/admin/removeMapping"
-               type="org.apache.struts.actions.RemoveMappingAction"/>
 
+    <!-- ========== Form Bean Definitions =================================== -->
+    <form-beans>
 
-  </action-mappings>
+        <!-- Logon form bean -->
+        <form-bean name="logonForm"
+                   type="org.apache.struts.webapp.example.LogonForm"/>
+
+        <!-- Registration form bean -->
+        <form-bean name="registrationForm"
+                   type="org.apache.struts.webapp.example.RegistrationForm"/>
+
+        <!-- Subscription form bean -->
+        <form-bean name="subscriptionForm"
+                   type="org.apache.struts.webapp.example.SubscriptionForm"/>
+
+    </form-beans>
+
+
+    <!-- ========== Global Forward Definitions ============================== -->
+    <global-forwards>
+        <forward name="logoff" path="/logoff.do"/>
+        <forward name="logon" path="/logon.jsp"/>
+        <forward name="success" path="/mainMenu.jsp"/>
+    </global-forwards>
+
+
+    <!-- ========== Action Mapping Definitions ============================== -->
+    <action-mappings>
+
+        <!-- Edit user registration -->
+        <action path="/editRegistration"
+                type="org.apache.struts.webapp.example.EditRegistrationAction"
+                attribute="registrationForm"
+                scope="request"
+                validate="false">
+            <forward name="success" path="/registration.jsp"/>
+        </action>
+
+        <!-- Edit mail subscription -->
+        <action path="/editSubscription"
+                type="org.apache.struts.webapp.example.EditSubscriptionAction"
+                attribute="subscriptionForm"
+                scope="request"
+                validate="false">
+            <forward name="failure" path="/mainMenu.jsp"/>
+            <forward name="success" path="/subscription.jsp"/>
+        </action>
+
+        <!-- Process a user logoff -->
+        <action path="/logoff"
+                type="org.apache.struts.webapp.example.LogoffAction">
+            <forward name="success" path="/index.jsp"/>
+        </action>
+
+        <!-- Process a user logon -->
+        <action path="/logon"
+                type="org.apache.struts.webapp.example.LogonAction"
+                name="logonForm"
+                scope="request"
+                input="/logon.jsp">
+        </action>
+
+        <!-- Save user registration -->
+        <action path="/saveRegistration"
+                type="org.apache.struts.webapp.example.SaveRegistrationAction"
+                name="registrationForm"
+                scope="request"
+                input="/registration.jsp"/>
+
+        <!-- Save mail subscription -->
+        <action path="/saveSubscription"
+                type="org.apache.struts.webapp.example.SaveSubscriptionAction"
+                name="subscriptionForm"
+                scope="request"
+                input="/subscription.jsp">
+            <forward name="success" path="/editRegistration.do?action=Edit"/>
+        </action>
+
+
+        <!-- Display the "walking tour" documentation -->
+        <action path="/tour"
+                forward="/tour.htm">
+        </action>
+
+        <!-- The standard administrative actions available with Struts -->
+        <!-- These would be either omitted or protected by security -->
+        <!-- in a real application deployment -->
+        <action path="/admin/addFormBean"
+                type="org.apache.struts.actions.AddFormBeanAction"/>
+        <action path="/admin/addForward"
+                type="org.apache.struts.actions.AddForwardAction"/>
+        <action path="/admin/addMapping"
+                type="org.apache.struts.actions.AddMappingAction"/>
+        <action path="/admin/reload"
+                type="org.apache.struts.actions.ReloadAction"/>
+        <action path="/admin/removeFormBean"
+                type="org.apache.struts.actions.RemoveFormBeanAction"/>
+        <action path="/admin/removeForward"
+                type="org.apache.struts.actions.RemoveForwardAction"/>
+        <action path="/admin/removeMapping"
+                type="org.apache.struts.actions.RemoveMappingAction"/>
+
+
+    </action-mappings>
 
 </struts-config>

Modified: struts/action/trunk/src/test/org/apache/struts/util/TestRequestUtils.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/test/org/apache/struts/util/TestRequestUtils.java?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/test/org/apache/struts/util/TestRequestUtils.java (original)
+++ struts/action/trunk/src/test/org/apache/struts/util/TestRequestUtils.java Fri Jan 20 16:19:02 2006
@@ -1,30 +1,24 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 1999-2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.struts.util;
 
-
-import java.net.MalformedURLException;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
@@ -36,285 +30,259 @@
 import org.apache.struts.mock.MockPrincipal;
 import org.apache.struts.mock.TestMockBase;
 
+import java.net.MalformedURLException;
 
 /**
  * <p>Unit tests for <code>org.apache.struts.util.RequestUtils</code>.</p>
  *
- * @version $Rev$ $Date$
+ * @version $Rev$ $Date: 2005-08-14 17:24:39 -0400 (Sun, 14 Aug 2005)
+ *          $
  */
-
 public class TestRequestUtils extends TestMockBase {
-
-
     // ----------------------------------------------------------------- Basics
-
-
     public TestRequestUtils(String name) {
         super(name);
     }
 
-
-    public static void main(String args[]) {
-        junit.awtui.TestRunner.main
-            (new String[] { TestRequestUtils.class.getName() } );
+    public static void main(String[] args) {
+        junit.awtui.TestRunner.main(new String[]{
+                TestRequestUtils.class.getName()
+        });
     }
 
-
     public static Test suite() {
         return (new TestSuite(TestRequestUtils.class));
     }
 
-
     // ----------------------------------------------------- Instance Variables
-
-
-
     // ----------------------------------------------------- Setup and Teardown
-
-
     public void setUp() {
-
         super.setUp();
-
     }
 
-
     public void tearDown() {
-
         super.tearDown();
-
     }
 
-
     // ------------------------------------------------------- Individual Tests
-
-
     // ---------------------------------------------------------- absoluteURL()
-
-
     public void testAbsoluteURL() {
-
         request.setPathElements("/myapp", "/action.do", null, null);
+
         String url = null;
+
         try {
-            url = RequestUtils.absoluteURL(request, "/foo/bar.jsp").toString();
+            url = RequestUtils.absoluteURL(request, "/foo/bar.jsp")
+                    .toString();
             assertEquals("absoluteURL is correct",
-                         "http://localhost:8080/myapp/foo/bar.jsp",
-                         url);
-        } catch (MalformedURLException e) {
+                    "http://localhost:8080/myapp/foo/bar.jsp", url);
+        }
+        catch (MalformedURLException e) {
             fail("Threw MalformedURLException: " + e);
         }
-
     }
 
-
     // ------------------------------------------------------------ actionURL()
-
-
     // Default application -- extension mapping
     public void testActionURL1() {
-
         request.setAttribute(Globals.MODULE_KEY, moduleConfig);
         request.setPathElements("/myapp", "/foo.do", null, null);
-        String url = RequestUtils.actionURL
-            (request, moduleConfig.findActionConfig("/dynamic"), "*.do");
-        assertNotNull("URL was returned", url);
-        assertEquals("URL value",
-                     "/dynamic.do",
-                     url);
 
-    }
+        String url = RequestUtils.actionURL(request,
+                moduleConfig.findActionConfig("/dynamic"), "*.do");
 
+        assertNotNull("URL was returned", url);
+        assertEquals("URL value", "/dynamic.do", url);
+    }
 
     // Second application -- extension mapping
     public void testActionURL2() {
-
         request.setAttribute(Globals.MODULE_KEY, moduleConfig2);
         request.setPathElements("/myapp", "/2/foo.do", null, null);
-        String url = RequestUtils.actionURL
-            (request, moduleConfig2.findActionConfig("/dynamic2"), "*.do");
-        assertNotNull("URL was returned", url);
-        assertEquals("URL value",
-                     "/2/dynamic2.do",
-                     url);
 
-    }
+        String url = RequestUtils.actionURL(request,
+                moduleConfig2.findActionConfig("/dynamic2"), "*.do");
 
+        assertNotNull("URL was returned", url);
+        assertEquals("URL value", "/2/dynamic2.do", url);
+    }
 
     // Default application -- path mapping
     public void testActionURL3() {
-
         request.setAttribute(Globals.MODULE_KEY, moduleConfig);
         request.setPathElements("/myapp", "/do/foo", null, null);
-        String url = RequestUtils.actionURL
-            (request, moduleConfig.findActionConfig("/dynamic"), "/do/*");
-        assertNotNull("URL was returned", url);
-        assertEquals("URL value",
-                     "/do/dynamic",
-                     url);
 
-    }
+        String url = RequestUtils.actionURL(request,
+                moduleConfig.findActionConfig("/dynamic"), "/do/*");
 
+        assertNotNull("URL was returned", url);
+        assertEquals("URL value", "/do/dynamic", url);
+    }
 
     // ----------------------------------------------------- createActionForm()
-
-
-
     // Default module -- No ActionForm should be created
     public void testCreateActionForm1a() {
-
         request.setPathElements("/myapp", "/noform.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig.findActionConfig("/noform");
+
+        ActionMapping mapping = (ActionMapping) moduleConfig.findActionConfig(
+                "/noform");
+
         assertNotNull("Found /noform mapping", mapping);
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig, null);
-        assertNull("No ActionForm returned", form);
 
-    }
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig, null);
 
+        assertNull("No ActionForm returned", form);
+    }
 
     // Second module -- No ActionForm should be created
     public void testCreateActionForm1b() {
-
         request.setPathElements("/myapp", "/2/noform.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig2.findActionConfig("/noform");
+
+        ActionMapping mapping =
+                (ActionMapping) moduleConfig2.findActionConfig(
+                        "/noform");
+
         assertNotNull("Found /noform mapping", mapping);
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig2, null);
-        assertNull("No ActionForm returned", form);
 
-    }
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig2, null);
 
+        assertNull("No ActionForm returned", form);
+    }
 
     // Default module -- Standard ActionForm should be created
     public void testCreateActionForm2a() {
-
         request.setPathElements("/myapp", "/static.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig.findActionConfig("/static");
+
+        ActionMapping mapping = (ActionMapping) moduleConfig.findActionConfig(
+                "/static");
+
         assertNotNull("Found /static mapping", mapping);
-        assertNotNull("Mapping has non-null name",
-                      mapping.getName());
-        assertEquals("Mapping has correct name",
-                     "static",
-                     mapping.getName());
+        assertNotNull("Mapping has non-null name", mapping.getName());
+        assertEquals("Mapping has correct name", "static", mapping.getName());
         assertNotNull("AppConfig has form bean " + mapping.getName(),
-                      moduleConfig.findFormBeanConfig(mapping.getName()));
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig, null);
+                moduleConfig.findFormBeanConfig(mapping.getName()));
+
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig, null);
+
         assertNotNull("ActionForm returned", form);
         assertTrue("ActionForm of correct type",
-                   form instanceof MockFormBean);
-
+                form instanceof MockFormBean);
     }
 
-
     // Second module -- Standard ActionForm should be created
     public void testCreateActionForm2b() {
-
         request.setPathElements("/myapp", "/2/static.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig2.findActionConfig("/static");
+
+        ActionMapping mapping =
+                (ActionMapping) moduleConfig2.findActionConfig(
+                        "/static");
+
         assertNotNull("Found /static mapping", mapping);
-        assertNotNull("Mapping has non-null name",
-                      mapping.getName());
-        assertEquals("Mapping has correct name",
-                     "static",
-                     mapping.getName());
+        assertNotNull("Mapping has non-null name", mapping.getName());
+        assertEquals("Mapping has correct name", "static", mapping.getName());
         assertNotNull("AppConfig has form bean " + mapping.getName(),
-                      moduleConfig.findFormBeanConfig(mapping.getName()));
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig2, null);
+                moduleConfig.findFormBeanConfig(mapping.getName()));
+
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig2, null);
+
         assertNotNull("ActionForm returned", form);
         assertTrue("ActionForm of correct type",
-                   form instanceof MockFormBean);
-
+                form instanceof MockFormBean);
     }
 
-
     // Default module -- Dynamic ActionForm should be created
     public void testCreateActionForm3a() {
-
         request.setPathElements("/myapp", "/dynamic.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig.findActionConfig("/dynamic");
+
+        ActionMapping mapping = (ActionMapping) moduleConfig.findActionConfig(
+                "/dynamic");
+
         assertNotNull("Found /dynamic mapping", mapping);
-        assertNotNull("Mapping has non-null name",
-                      mapping.getName());
+        assertNotNull("Mapping has non-null name", mapping.getName());
         assertEquals("Mapping has correct name",
-                     "dynamic",
-                     mapping.getName());
+                "dynamic",
+                mapping.getName());
         assertNotNull("AppConfig has form bean " + mapping.getName(),
-                      moduleConfig.findFormBeanConfig(mapping.getName()));
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig, null);
+                moduleConfig.findFormBeanConfig(mapping.getName()));
+
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig, null);
+
         assertNotNull("ActionForm returned", form);
         assertTrue("ActionForm of correct type",
-                   form instanceof DynaActionForm);
-
+                form instanceof DynaActionForm);
     }
 
-
     // Second module -- Dynamic ActionForm should be created
     public void testCreateActionForm3b() {
-
         request.setPathElements("/myapp", "/2/dynamic2.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig2.findActionConfig("/dynamic2");
+
+        ActionMapping mapping =
+                (ActionMapping) moduleConfig2.findActionConfig(
+                        "/dynamic2");
+
         assertNotNull("Found /dynamic2 mapping", mapping);
-        assertNotNull("Mapping has non-null name",
-                      mapping.getName());
+        assertNotNull("Mapping has non-null name", mapping.getName());
         assertEquals("Mapping has correct name",
-                     "dynamic2",
-                     mapping.getName());
+                "dynamic2",
+                mapping.getName());
         assertNotNull("AppConfig has form bean " + mapping.getName(),
-                      moduleConfig2.findFormBeanConfig(mapping.getName()));
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig2, null);
+                moduleConfig2.findFormBeanConfig(mapping.getName()));
+
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig2, null);
+
         assertNotNull("ActionForm returned", form);
         assertTrue("ActionForm of correct type",
-                   form instanceof DynaActionForm);
-
+                form instanceof DynaActionForm);
     }
 
-
     // Default module -- Dynamic ActionForm with initializers
     public void testCreateActionForm4a() {
-
         // Retrieve an appropriately configured DynaActionForm instance
         request.setPathElements("/myapp", "/dynamic0.do", null, null);
-        ActionMapping mapping = (ActionMapping)
-            moduleConfig.findActionConfig("/dynamic0");
+
+        ActionMapping mapping = (ActionMapping) moduleConfig.findActionConfig(
+                "/dynamic0");
+
         assertNotNull("Found /dynamic0 mapping", mapping);
-        assertNotNull("Mapping has non-null name",
-                      mapping.getName());
+        assertNotNull("Mapping has non-null name", mapping.getName());
         assertEquals("Mapping has correct name",
-                     "dynamic0",
-                     mapping.getName());
+                "dynamic0",
+                mapping.getName());
         assertNotNull("AppConfig has form bean " + mapping.getName(),
-                      moduleConfig.findFormBeanConfig(mapping.getName()));
-        ActionForm form = RequestUtils.createActionForm
-            (request, mapping, moduleConfig, null);
+                moduleConfig.findFormBeanConfig(mapping.getName()));
+
+        ActionForm form = RequestUtils.createActionForm(request, mapping,
+                moduleConfig, null);
+
         assertNotNull("ActionForm returned", form);
         assertTrue("ActionForm of correct type",
-                   form instanceof DynaActionForm);
+                form instanceof DynaActionForm);
 
         // Validate the property values
         DynaActionForm dform = (DynaActionForm) form;
         Boolean booleanProperty = (Boolean) dform.get("booleanProperty");
+
         assertTrue("booleanProperty is true", booleanProperty.booleanValue());
+
         String stringProperty = (String) dform.get("stringProperty");
-        assertEquals("stringProperty is correct",
-                     "String Property",
-                     stringProperty);
+
+        assertEquals("stringProperty is correct", "String Property",
+                stringProperty);
+
         Object value = null;
 
         value = dform.get("intArray1");
         assertNotNull("intArray1 exists", value);
         assertTrue("intArray1 is int[]", value instanceof int[]);
-        int intArray1[] = (int[]) value;
+
+        int[] intArray1 = (int[]) value;
+
         assertEquals("intArray1 length is correct", 3, intArray1.length);
         assertEquals("intArray1[0] value is correct", 1, intArray1[0]);
         assertEquals("intArray1[1] value is correct", 2, intArray1[1]);
@@ -323,7 +291,9 @@
         value = dform.get("intArray2");
         assertNotNull("intArray2 exists", value);
         assertTrue("intArray2 is int[]", value instanceof int[]);
-        int intArray2[] = (int[]) value;
+
+        int[] intArray2 = (int[]) value;
+
         assertEquals("intArray2 length is correct", 5, intArray2.length);
         assertEquals("intArray2[0] value is correct", 0, intArray2[0]);
         assertEquals("intArray2[1] value is correct", 0, intArray2[1]);
@@ -334,67 +304,74 @@
         value = dform.get("principal");
         assertNotNull("principal exists", value);
         assertTrue("principal is MockPrincipal",
-                   value instanceof MockPrincipal);
+                value instanceof MockPrincipal);
 
         value = dform.get("stringArray1");
         assertNotNull("stringArray1 exists", value);
         assertTrue("stringArray1 is int[]", value instanceof String[]);
-        String stringArray1[] = (String[]) value;
-        assertEquals("stringArray1 length is correct", 3, stringArray1.length);
+
+        String[] stringArray1 = (String[]) value;
+
+        assertEquals("stringArray1 length is correct",
+                3,
+                stringArray1.length);
         assertEquals("stringArray1[0] value is correct",
-                     "aaa", stringArray1[0]);
+                "aaa",
+                stringArray1[0]);
         assertEquals("stringArray1[1] value is correct",
-                     "bbb", stringArray1[1]);
+                "bbb",
+                stringArray1[1]);
         assertEquals("stringArray1[2] value is correct",
-                     "ccc", stringArray1[2]);
+                "ccc",
+                stringArray1[2]);
 
         value = dform.get("stringArray2");
         assertNotNull("stringArray2 exists", value);
         assertTrue("stringArray2 is int[]", value instanceof String[]);
-        String stringArray2[] = (String[]) value;
-        assertEquals("stringArray2 length is correct", 3, stringArray2.length);
-        assertEquals("stringArray2[0] value is correct",
-                     new String(), stringArray2[0]);
-        assertEquals("stringArray2[1] value is correct",
-                     new String(), stringArray2[1]);
-        assertEquals("stringArray2[2] value is correct",
-                     new String(), stringArray2[2]);
+
+        String[] stringArray2 = (String[]) value;
+
+        assertEquals("stringArray2 length is correct",
+                3,
+                stringArray2.length);
+        assertEquals("stringArray2[0] value is correct", new String(),
+                stringArray2[0]);
+        assertEquals("stringArray2[1] value is correct", new String(),
+                stringArray2[1]);
+        assertEquals("stringArray2[2] value is correct", new String(),
+                stringArray2[2]);
 
         // Different form beans should get different property value instances
         Object value1 = null;
-        DynaActionForm dform1 = (DynaActionForm)
-            RequestUtils.createActionForm(request, mapping, moduleConfig, null);
+        DynaActionForm dform1 =
+                (DynaActionForm) RequestUtils.createActionForm(request,
+                        mapping, moduleConfig, null);
 
         value = dform.get("principal");
         value1 = dform1.get("principal");
-        assertEquals("Different form beans get equal instance values",
-                     value, value1);
+        assertEquals("Different form beans get equal instance values", value,
+                value1);
         assertTrue("Different form beans get different instances 1",
-                   value != value1);
+                value != value1);
 
         value = dform.get("stringArray1");
         value1 = dform1.get("stringArray1");
         assertTrue("Different form beans get different instances 2",
-                   value != value1);
+                value != value1);
 
         dform1.set("stringProperty", "Different stringProperty value");
         value = dform.get("stringProperty");
         value1 = dform1.get("stringProperty");
         assertTrue("Different form beans get different instances 3",
-                   value != value1);
-
+                value != value1);
     }
 
-
-
     // ----------------------------------------------------------- forwardURL()
-
-
     // Default module (default forwardPattern)
     public void testForwardURL1() {
-
         request.setAttribute(Globals.MODULE_KEY, moduleConfig);
         request.setPathElements("/myapp", "/action.do", null, null);
+
         ForwardConfig forward = null;
         String result = null;
 
@@ -403,63 +380,49 @@
         assertNotNull("moduleForward found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleForward computed", result);
-        assertEquals("moduleForward value",
-                     "/module/forward",
-                     result);
+        assertEquals("moduleForward value", "/module/forward", result);
 
         // redirect=true, module=null
         forward = moduleConfig.findForwardConfig("moduleRedirect");
         assertNotNull("moduleRedirect found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleRedirect computed", result);
-        assertEquals("moduleRedirect value",
-                     "/module/redirect",
-                     result);
+        assertEquals("moduleRedirect value", "/module/redirect", result);
 
         // redirect=false, module=/context
         forward = moduleConfig.findForwardConfig("contextForward");
         assertNotNull("contextForward found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextForward computed", result);
-        assertEquals("contextForward value",
-                     "/context/forward",
-                     result);
+        assertEquals("contextForward value", "/context/forward", result);
 
         // redirect=true, module=/context
         forward = moduleConfig.findForwardConfig("contextRedirect");
         assertNotNull("contextRedirect found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextRedirect computed", result);
-        assertEquals("contextRedirct value",
-                     "/context/redirect",
-                     result);
+        assertEquals("contextRedirct value", "/context/redirect", result);
 
         // noslash, module=null
         forward = moduleConfig.findForwardConfig("moduleNoslash");
         assertNotNull("moduleNoslash found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleNoslash computed", result);
-        assertEquals("moduleNoslash value",
-                     "/module/noslash",
-                     result);
+        assertEquals("moduleNoslash value", "/module/noslash", result);
 
         // noslash, module=/
         forward = moduleConfig.findForwardConfig("contextNoslash");
         assertNotNull("contextNoslash found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextNoslash computed", result);
-        assertEquals("contextNoslash value",
-                     "/context/noslash",
-                     result);
-
+        assertEquals("contextNoslash value", "/context/noslash", result);
     }
 
-
     // Second module (default forwardPattern)
     public void testForwardURL2() {
-
         request.setAttribute(Globals.MODULE_KEY, moduleConfig2);
         request.setPathElements("/myapp", "/2/action.do", null, null);
+
         ForwardConfig forward = null;
         String result = null;
 
@@ -468,63 +431,49 @@
         assertNotNull("moduleForward found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleForward computed", result);
-        assertEquals("moduleForward value",
-                     "/2/module/forward",
-                     result);
+        assertEquals("moduleForward value", "/2/module/forward", result);
 
         // redirect=true, module=null
         forward = moduleConfig2.findForwardConfig("moduleRedirect");
         assertNotNull("moduleRedirect found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleRedirect computed", result);
-        assertEquals("moduleRedirect value",
-                     "/2/module/redirect",
-                     result);
+        assertEquals("moduleRedirect value", "/2/module/redirect", result);
 
         // redirect=false, module=/context
         forward = moduleConfig2.findForwardConfig("contextForward");
         assertNotNull("contextForward found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextForward computed", result);
-        assertEquals("contextForward value",
-                     "/context/forward",
-                     result);
+        assertEquals("contextForward value", "/context/forward", result);
 
         // redirect=true, module=/context
         forward = moduleConfig2.findForwardConfig("contextRedirect");
         assertNotNull("contextRedirect found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextRedirect computed", result);
-        assertEquals("contextRedirct value",
-                     "/context/redirect",
-                     result);
+        assertEquals("contextRedirct value", "/context/redirect", result);
 
         // noslash, module=null
         forward = moduleConfig2.findForwardConfig("moduleNoslash");
         assertNotNull("moduleNoslash found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleNoslash computed", result);
-        assertEquals("moduleNoslash value",
-                     "/2/module/noslash",
-                     result);
+        assertEquals("moduleNoslash value", "/2/module/noslash", result);
 
         // noslash, module=/
         forward = moduleConfig2.findForwardConfig("contextNoslash");
         assertNotNull("contextNoslash found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextNoslash computed", result);
-        assertEquals("contextNoslash value",
-                     "/context/noslash",
-                     result);
-
+        assertEquals("contextNoslash value", "/context/noslash", result);
     }
 
-
     // Third module (custom forwardPattern)
     public void testForwardURL3() {
-
         request.setAttribute(Globals.MODULE_KEY, moduleConfig3);
         request.setPathElements("/myapp", "/3/action.do", null, null);
+
         ForwardConfig forward = null;
         String result = null;
 
@@ -533,230 +482,210 @@
         assertNotNull("moduleForward found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleForward computed", result);
-        assertEquals("moduleForward value",
-                     "/forwarding/3/module/forward",
-                     result);
+        assertEquals("moduleForward value", "/forwarding/3/module/forward",
+                result);
 
         // redirect=true, module=null
         forward = moduleConfig3.findForwardConfig("moduleRedirect");
         assertNotNull("moduleRedirect found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleRedirect computed", result);
-        assertEquals("moduleRedirect value",
-                     "/forwarding/3/module/redirect",
-                     result);
+        assertEquals("moduleRedirect value", "/forwarding/3/module/redirect",
+                result);
 
         // redirect=false, module=/context
         forward = moduleConfig3.findForwardConfig("contextForward");
         assertNotNull("contextForward found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextForward computed", result);
-        assertEquals("contextForward value",
-                     "/forwarding/context/forward",
-                     result);
+        assertEquals("contextForward value", "/forwarding/context/forward",
+                result);
 
         // redirect=true, module=/context
         forward = moduleConfig3.findForwardConfig("contextRedirect");
         assertNotNull("contextRedirect found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextRedirect computed", result);
-        assertEquals("contextRedirct value",
-                     "/forwarding/context/redirect",
-                     result);
+        assertEquals("contextRedirct value", "/forwarding/context/redirect",
+                result);
 
         // noslash, module=null
         forward = moduleConfig3.findForwardConfig("moduleNoslash");
         assertNotNull("moduleNoslash found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("moduleNoslash computed", result);
-        assertEquals("moduleNoslash value",
-                     "/forwarding/3/module/noslash",
-                     result);
+        assertEquals("moduleNoslash value", "/forwarding/3/module/noslash",
+                result);
 
         // noslash, module=/
         forward = moduleConfig3.findForwardConfig("contextNoslash");
         assertNotNull("contextNoslash found", forward);
         result = RequestUtils.forwardURL(request, forward, null);
         assertNotNull("contextNoslash computed", result);
-        assertEquals("contextNoslash value",
-                     "/forwarding/context/noslash",
-                     result);
-    }
-
-
-	// Cross module forwards
-	public void testForwardURLa() {
-
-		request.setAttribute(Globals.MODULE_KEY, moduleConfig);
-		request.setPathElements("/myapp", "/action.do", null, null);
-		ForwardConfig forward = null;
-		String result = null;
-
-		// redirect=false, contextRelative=false, link to module 3
-		forward = moduleConfig3.findForwardConfig("moduleForward");
-		assertNotNull("moduleForward found", forward);
-		result = RequestUtils.forwardURL(request, forward, moduleConfig3);
-		assertNotNull("moduleForward computed", result);
-		assertEquals("moduleForward value",
-					 "/forwarding/3/module/forward",
-					 result);
-
-		// redirect=true, contextRelative=false, link to module 3
-		forward = moduleConfig3.findForwardConfig("moduleRedirect");
-		assertNotNull("moduleRedirect found", forward);
-		result = RequestUtils.forwardURL(request, forward, moduleConfig3);
-		assertNotNull("moduleRedirect computed", result);
-		assertEquals("moduleRedirect value",
-					 "/forwarding/3/module/redirect",
-					 result);
-
-		// redirect=false, module=/context
-		forward = moduleConfig3.findForwardConfig("contextForward");
-		assertNotNull("contextForward found", forward);
-		result = RequestUtils.forwardURL(request, forward, moduleConfig3);
-		assertNotNull("contextForward computed", result);
-		assertEquals("contextForward value",
-					 "/forwarding/context/forward",
-					 result);
-
-		// redirect=true, module=/context
-		forward = moduleConfig3.findForwardConfig("contextRedirect");
-		assertNotNull("contextRedirect found", forward);
-		result = RequestUtils.forwardURL(request, forward, moduleConfig3);
-		assertNotNull("contextRedirect computed", result);
-		assertEquals("contextRedirct value",
-					 "/forwarding/context/redirect",
-					 result);
-
-		// noslash, contextRelative=false, link to module 3
-		forward = moduleConfig3.findForwardConfig("moduleNoslash");
-		assertNotNull("moduleNoslash found", forward);
-		result = RequestUtils.forwardURL(request, forward, moduleConfig3);
-		assertNotNull("moduleNoslash computed", result);
-		assertEquals("moduleNoslash value",
-					 "/forwarding/3/module/noslash",
-					 result);
-
-		// noslash, module=/
-		forward = moduleConfig3.findForwardConfig("contextNoslash");
-		assertNotNull("contextNoslash found", forward);
-		result = RequestUtils.forwardURL(request, forward, moduleConfig3);
-		assertNotNull("contextNoslash computed", result);
-		assertEquals("contextNoslash value",
-					 "/forwarding/context/noslash",
-					 result);
+        assertEquals("contextNoslash value", "/forwarding/context/noslash",
+                result);
+    }
 
-	}
+    // Cross module forwards
+    public void testForwardURLa() {
+        request.setAttribute(Globals.MODULE_KEY, moduleConfig);
+        request.setPathElements("/myapp", "/action.do", null, null);
 
+        ForwardConfig forward = null;
+        String result = null;
 
-    // ----------------------------------------------------------- requestURL()
+        // redirect=false, contextRelative=false, link to module 3
+        forward = moduleConfig3.findForwardConfig("moduleForward");
+        assertNotNull("moduleForward found", forward);
+        result = RequestUtils.forwardURL(request, forward, moduleConfig3);
+        assertNotNull("moduleForward computed", result);
+        assertEquals("moduleForward value", "/forwarding/3/module/forward",
+                result);
+
+        // redirect=true, contextRelative=false, link to module 3
+        forward = moduleConfig3.findForwardConfig("moduleRedirect");
+        assertNotNull("moduleRedirect found", forward);
+        result = RequestUtils.forwardURL(request, forward, moduleConfig3);
+        assertNotNull("moduleRedirect computed", result);
+        assertEquals("moduleRedirect value", "/forwarding/3/module/redirect",
+                result);
 
+        // redirect=false, module=/context
+        forward = moduleConfig3.findForwardConfig("contextForward");
+        assertNotNull("contextForward found", forward);
+        result = RequestUtils.forwardURL(request, forward, moduleConfig3);
+        assertNotNull("contextForward computed", result);
+        assertEquals("contextForward value", "/forwarding/context/forward",
+                result);
 
-    public void testRequestURL() {
+        // redirect=true, module=/context
+        forward = moduleConfig3.findForwardConfig("contextRedirect");
+        assertNotNull("contextRedirect found", forward);
+        result = RequestUtils.forwardURL(request, forward, moduleConfig3);
+        assertNotNull("contextRedirect computed", result);
+        assertEquals("contextRedirct value", "/forwarding/context/redirect",
+                result);
+
+        // noslash, contextRelative=false, link to module 3
+        forward = moduleConfig3.findForwardConfig("moduleNoslash");
+        assertNotNull("moduleNoslash found", forward);
+        result = RequestUtils.forwardURL(request, forward, moduleConfig3);
+        assertNotNull("moduleNoslash computed", result);
+        assertEquals("moduleNoslash value", "/forwarding/3/module/noslash",
+                result);
+
+        // noslash, module=/
+        forward = moduleConfig3.findForwardConfig("contextNoslash");
+        assertNotNull("contextNoslash found", forward);
+        result = RequestUtils.forwardURL(request, forward, moduleConfig3);
+        assertNotNull("contextNoslash computed", result);
+        assertEquals("contextNoslash value", "/forwarding/context/noslash",
+                result);
+    }
 
+    // ----------------------------------------------------------- requestURL()
+    public void testRequestURL() {
         request.setPathElements("/myapp", "/foo.do", null, null);
+
         String url = null;
+
         try {
             url = RequestUtils.requestURL(request).toString();
-        } catch (MalformedURLException e) {
+        }
+        catch (MalformedURLException e) {
             fail("MalformedURLException: " + e);
         }
-        assertNotNull("URL was returned", url);
-        assertEquals("URL value",
-                     "http://localhost:8080/myapp/foo.do",
-                     url);
 
+        assertNotNull("URL was returned", url);
+        assertEquals("URL value", "http://localhost:8080/myapp/foo.do", url);
     }
 
-
     // ---------------------------------------------------- selectApplication()
-
-
     // Map to the default module -- direct
     public void testSelectApplication1a() {
-
         request.setPathElements("/myapp", "/noform.do", null, null);
         ModuleUtils.getInstance().selectModule(request, context);
-        ModuleConfig moduleConfig = (ModuleConfig)
-            request.getAttribute(Globals.MODULE_KEY);
+
+        ModuleConfig moduleConfig =
+                (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
+
         assertNotNull("Selected a module", moduleConfig);
-        assertEquals("Selected correct module",
-                     "", moduleConfig.getPrefix());
-        // FIXME - check module resources?
+        assertEquals("Selected correct module", "", moduleConfig.getPrefix());
 
+        // FIXME - check module resources?
     }
 
-
     // Map to the second module -- direct
     public void testSelectApplication1b() {
-        String[] prefixes = { "/1", "/2" };
-        context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);    
+        String[] prefixes = {"/1", "/2"};
+
+        context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);
         request.setPathElements("/myapp", "/2/noform.do", null, null);
-        
+
         ModuleUtils.getInstance().selectModule(request, context);
-        ModuleConfig moduleConfig = (ModuleConfig)
-            request.getAttribute(Globals.MODULE_KEY);
+
+        ModuleConfig moduleConfig =
+                (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
+
         assertNotNull("Selected a module", moduleConfig);
         assertEquals("Selected correct module",
-                     "/2", moduleConfig.getPrefix());
-        // FIXME - check module resources?
+                "/2",
+                moduleConfig.getPrefix());
 
+        // FIXME - check module resources?
     }
 
-
     // Map to the default module -- include
     public void testSelectApplication2a() {
-
         request.setPathElements("/myapp", "/2/noform.do", null, null);
         request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
-                             "/noform.do");
+                "/noform.do");
         ModuleUtils.getInstance().selectModule(request, context);
-        ModuleConfig moduleConfig = (ModuleConfig)
-            request.getAttribute(Globals.MODULE_KEY);
+
+        ModuleConfig moduleConfig =
+                (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
+
         assertNotNull("Selected an application", moduleConfig);
-        assertEquals("Selected correct application",
-                     "", moduleConfig.getPrefix());
-        // FIXME - check application resources?
+        assertEquals("Selected correct application", "",
+                moduleConfig.getPrefix());
 
+        // FIXME - check application resources?
     }
 
-
     // Map to the second module -- include
     public void testSelectApplication2b() {
-        String[] prefixes = { "/1", "/2" };
-        context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);    
+        String[] prefixes = {"/1", "/2"};
+
+        context.setAttribute(Globals.MODULE_PREFIXES_KEY, prefixes);
         request.setPathElements("/myapp", "/noform.do", null, null);
         request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
-                             "/2/noform.do");
+                "/2/noform.do");
         ModuleUtils.getInstance().selectModule(request, context);
-        ModuleConfig moduleConfig = (ModuleConfig)
-            request.getAttribute(Globals.MODULE_KEY);
+
+        ModuleConfig moduleConfig =
+                (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
+
         assertNotNull("Selected a module", moduleConfig);
         assertEquals("Selected correct module",
-                     "/2", moduleConfig.getPrefix());
-        // FIXME - check application resources?
+                "/2",
+                moduleConfig.getPrefix());
 
+        // FIXME - check application resources?
     }
 
-
     // ------------------------------------------------------------ serverURL()
-
-
     // Basic test on values in mock objects
     public void testServerURL() {
-
         String url = null;
+
         try {
             url = RequestUtils.serverURL(request).toString();
-        } catch (MalformedURLException e) {
+        }
+        catch (MalformedURLException e) {
             fail("Threw MalformedURLException: " + e);
         }
-        assertNotNull("serverURL is present", url);
-        assertEquals("serverURL value",
-                     "http://localhost:8080",
-                     url);
 
+        assertNotNull("serverURL is present", url);
+        assertEquals("serverURL value", "http://localhost:8080", url);
     }
-
-
 }

Modified: struts/action/trunk/src/test/org/apache/struts/validator/PojoBean.java
URL: http://svn.apache.org/viewcvs/struts/action/trunk/src/test/org/apache/struts/validator/PojoBean.java?rev=370938&r1=370937&r2=370938&view=diff
==============================================================================
--- struts/action/trunk/src/test/org/apache/struts/validator/PojoBean.java (original)
+++ struts/action/trunk/src/test/org/apache/struts/validator/PojoBean.java Fri Jan 20 16:19:02 2006
@@ -1,21 +1,20 @@
 /*
- * $Id$ 
+ * $Id$
  *
  * Copyright 2004 The Apache Software Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.struts.validator;
 
 import java.util.HashMap;
@@ -25,178 +24,169 @@
  * Test Bean class.
  */
 public class PojoBean {
-
     protected String stringValue1;
-
-    protected String stringValue2;    
-
+    protected String stringValue2;
     protected int intValue1;
-
     protected int intValue2;
-    
     protected Integer integerValue1;
-    
     protected Integer integerValue2;
-
     protected PojoBean[] beans;
-
     protected Map map = new HashMap();
-    
+
     /**
      * Default Constructor
      */
     public PojoBean() {
     }
-    
+
     /**
      * Construct Bean with a pair of String values.
      */
     public PojoBean(String stringValue1, String stringValue2) {
-       setStringValue1(stringValue1);
-       setStringValue2(stringValue2);
+        setStringValue1(stringValue1);
+        setStringValue2(stringValue2);
     }
-    
+
     /**
      * Construct Bean with a pair of integer values.
      */
     public PojoBean(int intValue1, int intValue2) {
-       setIntValue1(intValue1);
-       setIntValue2(intValue2);
-       setIntegerValue1(new Integer(intValue1));
-       setIntegerValue2(new Integer(intValue2));
+        setIntValue1(intValue1);
+        setIntValue2(intValue2);
+        setIntegerValue1(new Integer(intValue1));
+        setIntegerValue2(new Integer(intValue2));
     }
-    
+
     /**
      * Set the stringValue1.
      */
     public void setStringValue1(String stringValue1) {
-       this.stringValue1 = stringValue1;
+        this.stringValue1 = stringValue1;
     }
-    
+
     /**
      * Return stringValue1.
      */
     public String getStringValue1() {
-       return stringValue1;
+        return stringValue1;
     }
-    
+
     /**
      * Set the stringValue2.
      */
     public void setStringValue2(String stringValue2) {
-       this.stringValue2 = stringValue2;
+        this.stringValue2 = stringValue2;
     }
-    
+
     /**
      * Return stringValue2.
      */
     public String getStringValue2() {
-       return stringValue2;
+        return stringValue2;
     }
-    
+
     /**
      * Set the intValue1.
      */
     public void setIntValue1(int intValue1) {
-       this.intValue1= intValue1;
+        this.intValue1 = intValue1;
     }
-    
+
     /**
      * Return intValue1.
      */
     public int getIntValue1() {
-       return intValue1;
+        return intValue1;
     }
-    
+
     /**
      * Set the intValue2.
      */
     public void setIntValue2(int intValue2) {
-       this.intValue2= intValue2;
+        this.intValue2 = intValue2;
     }
-    
+
     /**
      * Return intValue2.
      */
     public int getIntValue2() {
-       return intValue2;
+        return intValue2;
     }
-    
+
     /**
      * Set the integerValue1.
      */
     public void setIntegerValue1(Integer integerValue1) {
-       this.integerValue1= integerValue1;
+        this.integerValue1 = integerValue1;
     }
-    
+
     /**
      * Return integerValue1.
      */
     public Integer getIntegerValue1() {
-       return integerValue1;
+        return integerValue1;
     }
-    
+
     /**
      * Set the integerValue2.
      */
     public void setIntegerValue2(Integer integerValue2) {
-       this.integerValue2= integerValue2;
+        this.integerValue2 = integerValue2;
     }
-    
+
     /**
      * Return integerValue2.
      */
     public Integer getIntegerValue2() {
-       return integerValue2;
+        return integerValue2;
     }
-    
+
     /**
      * Set the PojoBean[].
      */
     public void setBeans(PojoBean[] beans) {
-       this.beans = beans;
+        this.beans = beans;
     }
-    
+
     /**
      * Return PojoBean[].
      */
     public PojoBean[] getBeans() {
-       return beans;
+        return beans;
     }
-    
+
     /**
      * Return and indexed Bean
      */
     public PojoBean getBean(int index) {
-       return beans[index];
+        return beans[index];
     }
-    
+
     /**
      * Return the Map
      */
     public Object getMap() {
-       return map;
+        return map;
     }
-    
+
     /**
      * Return the Map
      */
     public void setMap(Map map) {
-       this.map = map;
+        this.map = map;
     }
 
     /**
      * Set a  Mapped property
      */
     public void setMapped(String key, Object value) {
-       map.put(key, value);
+        map.put(key, value);
     }
 
     /**
      * Set a  Mapped property
      */
     public Object getMapped(String key) {
-       return map.get(key);
+        return map.get(key);
     }
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message