You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ni...@apache.org on 2004/09/24 03:17:59 UTC

cvs commit: jakarta-struts/web/test/test/org/apache/struts/taglib/html TestButtonTag1.jsp TestCancelTag1.jsp TestCheckboxTag1.jsp TestFileTag1.jsp TestFrameTag2.jsp TestHiddenTag1.jsp TestLinkTag2.jsp TestMultiboxTag1.jsp TestPasswordTag1.jsp TestRadioTag1.jsp TestResetTag1.jsp TestSelectTag1.jsp TestSubmitTag1.jsp TestTextTag1.jsp TestTextareaTag1.jsp

niallp      2004/09/23 18:17:59

  Modified:    doc/userGuide struts-html.xml
               src/test/org/apache/struts/taglib/html TestButtonTag1.java
                        TestCancelTag1.java TestCheckboxTag1.java
                        TestFileTag1.java TestFrameTag2.java
                        TestHiddenTag1.java TestLinkTag2.java
                        TestMultiboxTag1.java TestPasswordTag1.java
                        TestRadioTag1.java TestResetTag1.java
                        TestSelectTag1.java TestSubmitTag1.java
                        TestTextTag1.java TestTextareaTag1.java
               web/test/test/org/apache/struts/taglib/html
                        TestButtonTag1.jsp TestCancelTag1.jsp
                        TestCheckboxTag1.jsp TestFileTag1.jsp
                        TestFrameTag2.jsp TestHiddenTag1.jsp
                        TestLinkTag2.jsp TestMultiboxTag1.jsp
                        TestPasswordTag1.jsp TestRadioTag1.jsp
                        TestResetTag1.jsp TestSelectTag1.jsp
                        TestSubmitTag1.jsp TestTextTag1.jsp
                        TestTextareaTag1.jsp
  Log:
  Add missing "bundle" attribute to tld for html tags for Bug 17708 reported by James Mitchell
  
  Tags affected are ButtonTag, CancelTag, CheckboxTag, FileTag, FrameTag, HiddenTag, LinkTag, MultiboxTag, PasswordTag, RadioTag, ResetTag, SelectTag, SubmitTag,TextTag, TextareaTag
  
  Also added a test for the bundle attribute for each of the above tags
  
  Revision  Changes    Path
  1.81      +180 -0    jakarta-struts/doc/userGuide/struts-html.xml
  
  Index: struts-html.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- struts-html.xml	21 Jul 2004 21:02:22 -0000	1.80
  +++ struts-html.xml	24 Sep 2004 01:17:57 -0000	1.81
  @@ -124,6 +124,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -402,6 +414,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -687,6 +711,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -1077,6 +1113,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -1614,6 +1662,18 @@
   
            </info>
    
  +        <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
            <attribute>
              <name>action</name>
              <required>false</required>
  @@ -1983,6 +2043,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -3629,6 +3701,18 @@
               </info>
           </attribute>
   
  +        <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
                   <attribute>
                     <name>linkName</name>
                     <required>false</required>
  @@ -4143,6 +4227,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -4812,6 +4908,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -5154,6 +5262,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -5454,6 +5574,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -5962,6 +6094,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -6270,6 +6414,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -6542,6 +6698,18 @@
           </attribute>
   
           <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
  +        </attribute>
  +
  +        <attribute>
             <name>disabled</name>
             <required>false</required>
             <rtexprvalue>true</rtexprvalue>
  @@ -6853,6 +7021,18 @@
                   <p>The message resources key of the alternate text for this
                   element.</p>
                   </info>
  +        </attribute>
  +
  +        <attribute>
  +                <name>bundle</name>
  +                <required>false</required>
  +                <rtexprvalue>true</rtexprvalue>
  +                <info>
  +                    The servlet context attributes key for the MessageResources
  +                    instance to use.  If not specified, defaults to the
  +                    application resources configured for our action servlet.
  +                </info>
  +                <since>Struts 1.2.5</since>
           </attribute>
   
           <attribute>
  
  
  
  1.10      +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestButtonTag1.java
  
  Index: TestButtonTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestButtonTag1.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestButtonTag1.java	14 Mar 2004 06:23:40 -0000	1.9
  +++ TestButtonTag1.java	24 Sep 2004 01:17:57 -0000	1.10
  @@ -85,6 +85,9 @@
       public void testButtonPropertyAltKey2() throws Exception {
           runMyTest("testButtonPropertyAltKey2", "");
           }
  +    public void testButtonPropertyAltKey3() throws Exception {
  +        runMyTest("testButtonPropertyAltKey3", "");
  +    }
       public void testButtonPropertyAltKey_fr1() throws Exception {
           runMyTest("testButtonPropertyAltKey1_fr", "fr");
           }
  
  
  
  1.10      +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestCancelTag1.java
  
  Index: TestCancelTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestCancelTag1.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestCancelTag1.java	14 Mar 2004 06:23:41 -0000	1.9
  +++ TestCancelTag1.java	24 Sep 2004 01:17:57 -0000	1.10
  @@ -83,6 +83,9 @@
       public void testCancelAltKey2() throws Exception {
           runMyTest("testCancelAltKey2", "");
           }
  +    public void testCancelAltKey3() throws Exception {
  +        runMyTest("testCancelAltKey3", "");
  +    }
       public void testCancelAltKey_fr1() throws Exception {
           runMyTest("testCancelAltKey1_fr", "fr");
           }
  
  
  
  1.12      +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java
  
  Index: TestCheckboxTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestCheckboxTag1.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TestCheckboxTag1.java	14 Mar 2004 06:23:41 -0000	1.11
  +++ TestCheckboxTag1.java	24 Sep 2004 01:17:57 -0000	1.12
  @@ -98,6 +98,9 @@
       public void testCheckboxPropertybooleanTrueAltKey2() throws Exception {
           runMyTest("testCheckboxPropertybooleanTrueAltKey2", "");
           }
  +    public void testCheckboxPropertybooleanTrueAltKey3() throws Exception {
  +        runMyTest("testCheckboxPropertybooleanTrueAltKey3", "");
  +    }
       public void testCheckboxPropertybooleanTrueAltKey_fr1() throws Exception {
           runMyTest("testCheckboxPropertybooleanTrueAltKey1_fr", "fr");
           }
  
  
  
  1.10      +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestFileTag1.java
  
  Index: TestFileTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestFileTag1.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestFileTag1.java	14 Mar 2004 06:23:40 -0000	1.9
  +++ TestFileTag1.java	24 Sep 2004 01:17:57 -0000	1.10
  @@ -91,6 +91,9 @@
       public void testFilePropertyAltKey2() throws Exception {
           runMyTest("testFilePropertyAltKey2", "");
           }
  +    public void testFilePropertyAltKey3() throws Exception {
  +        runMyTest("testFilePropertyAltKey3", "");
  +    }
       public void testFilePropertyAltKey_fr1() throws Exception {
           runMyTest("testFilePropertyAltKey1_fr", "fr");
           }
  
  
  
  1.9       +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestFrameTag2.java
  
  Index: TestFrameTag2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestFrameTag2.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestFrameTag2.java	14 Mar 2004 06:23:40 -0000	1.8
  +++ TestFrameTag2.java	24 Sep 2004 01:17:57 -0000	1.9
  @@ -171,6 +171,9 @@
       public void testFrameForwardTitleKey() throws Exception {
           runMyTest("testFrameForwardTitleKey", "");
       }
  +    public void testFrameForwardTitleKeyAlt() throws Exception {
  +        runMyTest("testFrameForwardTitleKeyAlt", "");
  +    }
   
       public void testFrameForwardTransaction() throws Exception {
           pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY, "Some_Token_Here", PageContext.SESSION_SCOPE);
  
  
  
  1.9       +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestHiddenTag1.java
  
  Index: TestHiddenTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestHiddenTag1.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestHiddenTag1.java	14 Mar 2004 06:23:41 -0000	1.8
  +++ TestHiddenTag1.java	24 Sep 2004 01:17:57 -0000	1.9
  @@ -88,6 +88,9 @@
       public void testHiddenPropertyAltKey2() throws Exception {
           runMyTest("testHiddenPropertyAltKey2", "");
           }
  +    public void testHiddenPropertyAltKey3() throws Exception {
  +        runMyTest("testHiddenPropertyAltKey3", "");
  +    }
       public void testHiddenPropertyAltKey_fr1() throws Exception {
           runMyTest("testHiddenPropertyAltKey1_fr", "fr");
           }
  
  
  
  1.8       +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestLinkTag2.java
  
  Index: TestLinkTag2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestLinkTag2.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestLinkTag2.java	14 Mar 2004 06:23:40 -0000	1.7
  +++ TestLinkTag2.java	24 Sep 2004 01:17:57 -0000	1.8
  @@ -202,6 +202,9 @@
       public void testLinkForwardTitleKey() throws Exception {
           runMyTest("testLinkForwardTitleKey", "");
       }
  +    public void testLinkForwardTitleKeyAlt() throws Exception {
  +        runMyTest("testLinkForwardTitleKeyAlt", "");
  +    }
   
       public void testLinkForwardTransaction() throws Exception {
           pageContext.setAttribute(Globals.TRANSACTION_TOKEN_KEY, "Some_Token_Here", PageContext.SESSION_SCOPE);
  
  
  
  1.7       +6 -3      jakarta-struts/src/test/org/apache/struts/taglib/html/TestMultiboxTag1.java
  
  Index: TestMultiboxTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestMultiboxTag1.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestMultiboxTag1.java	14 Mar 2004 06:23:41 -0000	1.6
  +++ TestMultiboxTag1.java	24 Sep 2004 01:17:58 -0000	1.7
  @@ -115,6 +115,9 @@
       public void testMultiboxPropertyTrueAltKey2() throws Exception {
           runMyTest("testMultiboxPropertyTrueAltKey2", "");
           }
  +    public void testMultiboxPropertyTrueAltKey3() throws Exception {
  +        runMyTest("testMultiboxPropertyTrueAltKey3", "");
  +    }
       public void testMultiboxPropertyTrueAltKey_fr1() throws Exception {
           runMyTest("testMultiboxPropertyTrueAltKey1_fr", "fr");
           }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestPasswordTag1.java
  
  Index: TestPasswordTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestPasswordTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPasswordTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestPasswordTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -88,6 +88,9 @@
       public void testPasswordPropertyAltKey2() throws Exception {
           runMyTest("testPasswordPropertyAltKey2", "");
       }
  +    public void testPasswordPropertyAltKey3() throws Exception {
  +        runMyTest("testPasswordPropertyAltKey3", "");
  +    }
       public void testPasswordPropertyAltKey_fr1() throws Exception {
           runMyTest("testPasswordPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestRadioTag1.java
  
  Index: TestRadioTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestRadioTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestRadioTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestRadioTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -88,6 +88,9 @@
       public void testRadioPropertyAltKey2() throws Exception {
           runMyTest("testRadioPropertyAltKey2", "");
       }
  +    public void testRadioPropertyAltKey3() throws Exception {
  +        runMyTest("testRadioPropertyAltKey3", "");
  +    }
       public void testRadioPropertyAltKey_fr1() throws Exception {
           runMyTest("testRadioPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestResetTag1.java
  
  Index: TestResetTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestResetTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestResetTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestResetTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -85,6 +85,9 @@
       public void testResetPropertyAltKey2() throws Exception {
           runMyTest("testResetPropertyAltKey2", "");
       }
  +    public void testResetPropertyAltKey3() throws Exception {
  +        runMyTest("testResetPropertyAltKey3", "");
  +    }
       public void testResetPropertyAltKey_fr1() throws Exception {
           runMyTest("testResetPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestSelectTag1.java
  
  Index: TestSelectTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestSelectTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestSelectTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestSelectTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -82,6 +82,9 @@
       public void testSelectPropertyAltKey2() throws Exception {
           runMyTest("testSelectPropertyAltKey2", "");
       }
  +    public void testSelectPropertyAltKey3() throws Exception {
  +        runMyTest("testSelectPropertyAltKey3", "");
  +    }
       public void testSelectPropertyAltKey_fr1() throws Exception {
           runMyTest("testSelectPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestSubmitTag1.java
  
  Index: TestSubmitTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestSubmitTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestSubmitTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestSubmitTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -85,6 +85,9 @@
       public void testSubmitPropertyAltKey2() throws Exception {
           runMyTest("testSubmitPropertyAltKey2", "");
       }
  +    public void testSubmitPropertyAltKey3() throws Exception {
  +        runMyTest("testSubmitPropertyAltKey3", "");
  +    }
       public void testSubmitPropertyAltKey_fr1() throws Exception {
           runMyTest("testSubmitPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestTextTag1.java
  
  Index: TestTextTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestTextTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTextTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestTextTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -88,6 +88,9 @@
       public void testTextPropertyAltKey2() throws Exception {
           runMyTest("testTextPropertyAltKey2", "");
       }
  +    public void testTextPropertyAltKey3() throws Exception {
  +        runMyTest("testTextPropertyAltKey3", "");
  +    }
       public void testTextPropertyAltKey_fr1() throws Exception {
           runMyTest("testTextPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.2       +5 -2      jakarta-struts/src/test/org/apache/struts/taglib/html/TestTextareaTag1.java
  
  Index: TestTextareaTag1.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/html/TestTextareaTag1.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTextareaTag1.java	23 Sep 2004 00:37:23 -0000	1.1
  +++ TestTextareaTag1.java	24 Sep 2004 01:17:58 -0000	1.2
  @@ -88,6 +88,9 @@
       public void testTextareaPropertyAltKey2() throws Exception {
           runMyTest("testTextareaPropertyAltKey2", "");
       }
  +    public void testTextareaPropertyAltKey3() throws Exception {
  +        runMyTest("testTextareaPropertyAltKey3", "");
  +    }
       public void testTextareaPropertyAltKey_fr1() throws Exception {
           runMyTest("testTextareaPropertyAltKey1_fr", "fr");
       }
  
  
  
  1.5       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag1.jsp
  
  Index: TestButtonTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestButtonTag1.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestButtonTag1.jsp	26 Dec 2003 22:08:01 -0000	1.4
  +++ TestButtonTag1.jsp	24 Sep 2004 01:17:58 -0000	1.5
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testButtonPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:button property="propertyName" altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="button" name="propertyName" value="Click" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testButtonPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:button property="propertyName" altKey="default.bundle.message"/>
  
  
  
  1.6       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag1.jsp
  
  Index: TestCancelTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCancelTag1.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestCancelTag1.jsp	23 Sep 2004 00:34:15 -0000	1.5
  +++ TestCancelTag1.jsp	24 Sep 2004 01:17:58 -0000	1.6
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testCancelAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:cancel altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="submit" name="org.apache.struts.taglib.html.CANCEL" value="Cancel" onclick="bCancel=true;" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testCancelAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:cancel altKey="default.bundle.message"/>
  
  
  
  1.5       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag1.jsp
  
  Index: TestCheckboxTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestCheckboxTag1.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestCheckboxTag1.jsp	26 Dec 2003 22:08:01 -0000	1.4
  +++ TestCheckboxTag1.jsp	24 Sep 2004 01:17:58 -0000	1.5
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:checkbox property="checked"  altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="checkbox" name="checked" value="on" checked="checked" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testCheckboxPropertybooleanTrueAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:checkbox property="checked" altKey="default.bundle.message"/>
  
  
  
  1.5       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag1.jsp
  
  Index: TestFileTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFileTag1.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestFileTag1.jsp	26 Dec 2003 22:08:01 -0000	1.4
  +++ TestFileTag1.jsp	24 Sep 2004 01:17:58 -0000	1.5
  @@ -58,6 +58,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testFilePropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:file property="string" altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="file" name="string" value="Test Value" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testFilePropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:file property="string" altKey="default.bundle.message"/>
  
  
  
  1.3       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag2.jsp
  
  Index: TestFrameTag2.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestFrameTag2.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestFrameTag2.jsp	26 Dec 2003 22:08:01 -0000	1.2
  +++ TestFrameTag2.jsp	24 Sep 2004 01:17:58 -0000	1.3
  @@ -220,6 +220,15 @@
       </bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testFrameForwardTitleKeyAlt">
  +    <bean:define id="TEST_RESULTS" toScope="page">
  +        <html:frame forward="simpleForward" titleKey="alternate.bundle.message" bundle="alternate"/>
  +    </bean:define>
  +    <bean:define id="EXPECTED_RESULTS" toScope="page">
  +        <frame src="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" title="Testing Message">
  +    </bean:define>
  +</logic:equal>
  +
   
   <logic:equal name="runTest" value="testFrameForwardTransaction">
       <bean:define id="TEST_RESULTS" toScope="page">
  
  
  
  1.4       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHiddenTag1.jsp
  
  Index: TestHiddenTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestHiddenTag1.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestHiddenTag1.jsp	26 Dec 2003 22:08:01 -0000	1.3
  +++ TestHiddenTag1.jsp	24 Sep 2004 01:17:58 -0000	1.4
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testHiddenPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:hidden property="string" altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="hidden" name="string" value="Test Value" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testHiddenPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:hidden property="string" altKey="default.bundle.message"/>
  
  
  
  1.4       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag2.jsp
  
  Index: TestLinkTag2.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestLinkTag2.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestLinkTag2.jsp	26 Dec 2003 22:08:01 -0000	1.3
  +++ TestLinkTag2.jsp	24 Sep 2004 01:17:58 -0000	1.4
  @@ -270,6 +270,15 @@
       </bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testLinkForwardTitleKeyAlt">
  +    <bean:define id="TEST_RESULTS" toScope="page">
  +        <html:link forward="simpleForward" titleKey="alternate.bundle.message" bundle="alternate">Test Link</html:link>
  +    </bean:define>
  +    <bean:define id="EXPECTED_RESULTS" toScope="page">
  +        <a href="<%=response.encodeURL( request.getContextPath() + "/path/to/non/existing/jsp.jsp")%>" title="Testing Message">Test Link</a>
  +    </bean:define>
  +</logic:equal>
  +
   
   <logic:equal name="runTest" value="testLinkForwardTransaction">
       <bean:define id="TEST_RESULTS" toScope="page">
  
  
  
  1.3       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMultiboxTag1.jsp
  
  Index: TestMultiboxTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestMultiboxTag1.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestMultiboxTag1.jsp	26 Dec 2003 22:08:01 -0000	1.2
  +++ TestMultiboxTag1.jsp	24 Sep 2004 01:17:58 -0000	1.3
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testMultiboxPropertyTrueAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:multibox property="stringArray" altKey="alternate.bundle.message" value="value1" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="checkbox" name="stringArray" value="value1" checked="checked" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testMultiboxPropertyTrueAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:multibox property="stringArray" altKey="default.bundle.message" value="value1"/>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestPasswordTag1.jsp
  
  Index: TestPasswordTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestPasswordTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestPasswordTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestPasswordTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testPasswordPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:password property="string" altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="password" name="string" value="Test Value" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testPasswordPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:password property="string" altKey="default.bundle.message"/>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestRadioTag1.jsp
  
  Index: TestRadioTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestRadioTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestRadioTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestRadioTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testRadioPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:radio property="string" altKey="alternate.bundle.message" value="Put Some Value Here" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="radio" name="string" value="Put Some Value Here" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testRadioPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:radio property="string" altKey="default.bundle.message" value="Put Some Value Here"/>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestResetTag1.jsp
  
  Index: TestResetTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestResetTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestResetTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestResetTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testResetPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:reset property="propertyName" altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="reset" name="propertyName" value="Reset" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testResetPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:reset property="propertyName" altKey="default.bundle.message"/>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestSelectTag1.jsp
  
  Index: TestSelectTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestSelectTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestSelectTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestSelectTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -31,6 +31,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testSelectPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:select property="string" altKey="alternate.bundle.message" bundle="alternate">Some Body Here</html:select>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<select name="string" alt="Testing Message">Some Body Here</select>
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testSelectPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:select property="string" altKey="default.bundle.message">Some Body Here</html:select>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestSubmitTag1.jsp
  
  Index: TestSubmitTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestSubmitTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestSubmitTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestSubmitTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testSubmitPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:submit property="propertyName" altKey="alternate.bundle.message"  bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="submit" name="propertyName" value="Submit" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testSubmitPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:submit property="propertyName" altKey="default.bundle.message"/>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestTextTag1.jsp
  
  Index: TestTextTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestTextTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTextTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestTextTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testTextPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:text property="string" altKey="alternate.bundle.message"  bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<input type="text" name="string" value="Test Value" alt="Testing Message">
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testTextPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:text property="string" altKey="default.bundle.message"/>
  
  
  
  1.2       +9 -0      jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestTextareaTag1.jsp
  
  Index: TestTextareaTag1.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/test/test/org/apache/struts/taglib/html/TestTextareaTag1.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTextareaTag1.jsp	23 Sep 2004 00:37:24 -0000	1.1
  +++ TestTextareaTag1.jsp	24 Sep 2004 01:17:58 -0000	1.2
  @@ -49,6 +49,15 @@
   	</bean:define>
   </logic:equal>
   
  +<logic:equal name="runTest" value="testTextareaPropertyAltKey3">
  +	<bean:define id="TEST_RESULTS" toScope="page">
  +		<html:textarea property="string" altKey="alternate.bundle.message" bundle="alternate"/>
  +	</bean:define>
  +	<bean:define id="EXPECTED_RESULTS" toScope="page">
  +		<textarea name="string" alt="Testing Message">Test Value</textarea>
  +	</bean:define>
  +</logic:equal>
  +
   <logic:equal name="runTest" value="testTextareaPropertyAltKey1_fr">
   	<bean:define id="TEST_RESULTS" toScope="page">
   		<html:textarea property="string" altKey="default.bundle.message"/>
  
  
  

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