Author: jmitchell Date: Wed Mar 16 10:15:09 2005 New Revision: 157782 URL: http://svn.apache.org/viewcvs?view=rev&rev=157782 Log: fix local ref since JSPs were moved from /test/test/org/* to /org/*
Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestIncludeTag.jsp struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestResourceTag.jsp struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestStrutsTag.jsp struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag5.jsp struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag6.jsp Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestIncludeTag.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestIncludeTag.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestIncludeTag.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestIncludeTag.jsp Wed Mar 16 10:15:09 2005 @@ -16,7 +16,7 @@ <logic:equal name="runTest" value="testIncludeTagHref"> <bean:define id="TEST_RESULTS" toScope="page"> - <bean:include id="INCLUDE_TAG_KEY" href="<%=request.getContextPath() + "/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"%>"/> + <bean:include id="INCLUDE_TAG_KEY" href="<%=request.getContextPath() + "/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"%>"/> <bean:write name="INCLUDE_TAG_KEY"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> @@ -26,7 +26,7 @@ <logic:equal name="runTest" value="testIncludeTagPage"> <bean:define id="TEST_RESULTS" toScope="page"> - <bean:include id="INCLUDE_TAG_KEY" page="/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/> + <bean:include id="INCLUDE_TAG_KEY" page="/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/> <bean:write name="INCLUDE_TAG_KEY"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestResourceTag.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestResourceTag.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestResourceTag.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestResourceTag.jsp Wed Mar 16 10:15:09 2005 @@ -4,12 +4,12 @@ <logic:equal name="runTest" value="testResourceTag"> <bean:resource id="PAGE_KEY" - name="/test/org/apache/struts/taglib/bean/resources/TextFileForTesting.txt"/> + name="/org/apache/struts/taglib/bean/resources/TextFileForTesting.txt"/> </logic:equal> <logic:equal name="runTest" value="testResourceTagInput"> <bean:resource id="stream" - name="/test/org/apache/struts/taglib/bean/resources/TextFileForTesting.txt" + name="/org/apache/struts/taglib/bean/resources/TextFileForTesting.txt" input="any value here gives you an InputStream"/> <% /* Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestStrutsTag.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestStrutsTag.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestStrutsTag.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/bean/TestStrutsTag.jsp Wed Mar 16 10:15:09 2005 @@ -18,7 +18,7 @@ </logic:equal> <logic:equal name="runTest" value="testStrutsTagMapping"> - <bean:struts id="PAGE_KEY" mapping="/testIncludeTagTransaction"/> + <bean:struts id="PAGE_KEY" mapping="IncludeTagTransaction"/> <bean:write name="PAGE_KEY" property="path"/> </logic:equal> Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestBaseTag.jsp Wed Mar 16 10:15:09 2005 @@ -16,7 +16,7 @@ <html:base/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/test/org/apache/struts/taglib/html/TestBaseTag.jsp"> + <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp"> </bean:define> </logic:equal> @@ -25,7 +25,7 @@ <html:base target="My-Other-Frame"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/test/org/apache/struts/taglib/html/TestBaseTag.jsp" target="My-Other-Frame"> + <base href="http://<%=server%><%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp" target="My-Other-Frame"> </bean:define> </logic:equal> @@ -34,7 +34,7 @@ <html:base server="www.my-server-name.com"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <base href="http://www.my-server-name.com<%=portString%><%= request.getContextPath() %>/test/org/apache/struts/taglib/html/TestBaseTag.jsp"> + <base href="http://www.my-server-name.com<%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp"> </bean:define> </logic:equal> @@ -43,7 +43,7 @@ <html:base server="www.my-server-name.com" target="My-Other-Frame"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <base href="http://www.my-server-name.com<%=portString%><%= request.getContextPath() %>/test/org/apache/struts/taglib/html/TestBaseTag.jsp" target="My-Other-Frame"> + <base href="http://www.my-server-name.com<%=portString%><%= request.getContextPath() %>/org/apache/struts/taglib/htmlBaseTag.jsp" target="My-Other-Frame"> </bean:define> </logic:equal> Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestFormTag1.jsp Wed Mar 16 10:15:09 2005 @@ -8,11 +8,11 @@ <logic:equal name="runTest" value="testFormAction"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag"> + <html:form action="FormTag"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> @@ -20,33 +20,33 @@ <logic:equal name="runTest" value="testFormActionEnctype"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" enctype="multipart/form-data"> + <html:form action="FormTag" enctype="multipart/form-data"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" enctype="multipart/form-data"> + <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" enctype="multipart/form-data"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionAcceptCharset"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" acceptCharset="UTF-8"> + <html:form action="FormTag" acceptCharset="UTF-8"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" accept-charset="UTF-8"> + <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" accept-charset="UTF-8"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionFocus"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" focus="string"> + <html:form action="FormTag" focus="string"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> <script type="text/javascript" language="JavaScript"> <!-- @@ -64,11 +64,11 @@ <logic:equal name="runTest" value="testFormActionFocusIndexed"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" focus="stringIndexed" focusIndex="2"> + <html:form action="FormTag" focus="stringIndexed" focusIndex="2"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> <script type="text/javascript" language="JavaScript"> <!-- @@ -85,66 +85,66 @@ <logic:equal name="runTest" value="testFormActionMethod1"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="post"> + <html:form action="FormTag" method="post"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionMethod2"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="Post"> + <html:form action="FormTag" method="Post"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="Post" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="Post" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionMethod3"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="get"> + <html:form action="FormTag" method="get"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="get" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="get" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionMethod4"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="Get"> + <html:form action="FormTag" method="Get"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="Get" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="Get" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionMethod5"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="GET"> + <html:form action="FormTag" method="GET"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="GET" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="GET" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionMethod6"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc"> + <html:form action="FormTag" method="misc"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"> </form> </bean:define> </logic:equal> @@ -152,22 +152,22 @@ <logic:equal name="runTest" value="testFormActionOnreset"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc" onreset="script goes here"> + <html:form action="FormTag" method="misc" onreset="script goes here"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" onreset="script goes here"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" onreset="script goes here"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionOnsubmit"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc" onsubmit="script goes here"> + <html:form action="FormTag" method="misc" onsubmit="script goes here"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" onsubmit="script goes here"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" onsubmit="script goes here"> </form> </bean:define> </logic:equal> @@ -175,44 +175,44 @@ <logic:equal name="runTest" value="testFormActionStyle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc" style="style.goes.here"> + <html:form action="FormTag" method="misc" style="style.goes.here"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" style="style.goes.here"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" style="style.goes.here"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionStyleClass"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc" styleClass="style.goes.here"> + <html:form action="FormTag" method="misc" styleClass="style.goes.here"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" class="style.goes.here"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" class="style.goes.here"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionStyleId"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc" styleId="id.goes.here"> + <html:form action="FormTag" method="misc" styleId="id.goes.here"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" id="id.goes.here"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" id="id.goes.here"> </form> </bean:define> </logic:equal> <logic:equal name="runTest" value="testFormActionTarget"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:form action="/testFormTag" method="misc" target="_new"> + <html:form action="FormTag" method="misc" target="_new"> </html:form> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>" target="_new"> + <form name="testFormBean" method="misc" action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>" target="_new"> </form> </bean:define> </logic:equal> Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag5.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag5.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag5.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag5.jsp Wed Mar 16 10:15:09 2005 @@ -7,228 +7,228 @@ <!-- --------Testing attributes using page------ --> <logic:equal name="runTest" value="testImageSrcAccesskey"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" accesskey="XXX"/> + <html:image src="/some/image.gif" accesskey="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" accesskey="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" accesskey="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcAlign"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" align="XXX"/> + <html:image src="/some/image.gif" align="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" align="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" align="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcAlt"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" alt="XXX"/> + <html:image src="/some/image.gif" alt="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" alt="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" alt="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcAltKeyDefaultBundle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" altKey="default.bundle.message"/> + <html:image src="/some/image.gif" altKey="default.bundle.message"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" alt="Testing Message"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" alt="Testing Message"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcAltKeyAlternateBundle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" altKey="alternate.bundle.message" bundle="alternate"/> + <html:image src="/some/image.gif" altKey="alternate.bundle.message" bundle="alternate"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" alt="Testing Message"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" alt="Testing Message"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcAltKeyDefaultBundle_fr"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" altKey="default.bundle.message"/> + <html:image src="/some/image.gif" altKey="default.bundle.message"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" alt="Message D'Essai"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" alt="Message D'Essai"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcAltKeyAlternateBundle_fr"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" altKey="alternate.bundle.message" bundle="alternate"/> + <html:image src="/some/image.gif" altKey="alternate.bundle.message" bundle="alternate"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" alt="Message D'Essai"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" alt="Message D'Essai"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcBorder"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" border="XXX"/> + <html:image src="/some/image.gif" border="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" border="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" border="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcDisabled1"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" disabled="true"/> + <html:image src="/some/image.gif" disabled="true"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" disabled="disabled"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" disabled="disabled"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcDisabled2"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" disabled="True"/> + <html:image src="/some/image.gif" disabled="True"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" disabled="disabled"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" disabled="disabled"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcDisabled3"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" disabled="TRUE"/> + <html:image src="/some/image.gif" disabled="TRUE"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" disabled="disabled"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" disabled="disabled"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcDisabled4"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" disabled="false"/> + <html:image src="/some/image.gif" disabled="false"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcDisabled5"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" disabled="False"/> + <html:image src="/some/image.gif" disabled="False"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcDisabled6"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" disabled="FALSE"/> + <html:image src="/some/image.gif" disabled="FALSE"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcLocale"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" locale="secret locale" altKey="default.bundle.message"/> + <html:image src="/some/image.gif" locale="secret locale" altKey="default.bundle.message"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" alt="Message D'Essai"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" alt="Message D'Essai"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnblur"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onblur="XXX"/> + <html:image src="/some/image.gif" onblur="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onblur="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onblur="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnchange"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onchange="XXX"/> + <html:image src="/some/image.gif" onchange="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onchange="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onchange="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnclick"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onclick="XXX"/> + <html:image src="/some/image.gif" onclick="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onclick="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onclick="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOndblclick"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" ondblclick="XXX"/> + <html:image src="/some/image.gif" ondblclick="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" ondblclick="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" ondblclick="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnfocus"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onfocus="XXX"/> + <html:image src="/some/image.gif" onfocus="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onfocus="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onfocus="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnkeydown"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onkeydown="XXX"/> + <html:image src="/some/image.gif" onkeydown="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onkeydown="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onkeydown="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnkeypress"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onkeypress="XXX"/> + <html:image src="/some/image.gif" onkeypress="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onkeypress="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onkeypress="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnkeyup"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onkeyup="XXX"/> + <html:image src="/some/image.gif" onkeyup="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onkeyup="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onkeyup="XXX"> </bean:define> </logic:equal> Modified: struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag6.jsp URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag6.jsp?view=diff&r1=157781&r2=157782 ============================================================================== --- struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag6.jsp (original) +++ struts/taglib/trunk/src/webapp/org/apache/struts/taglib/html/TestImageTag6.jsp Wed Mar 16 10:15:09 2005 @@ -7,160 +7,160 @@ <!-- --------Testing attributes using page------ --> <logic:equal name="runTest" value="testImageSrcOnmousedown"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onmousedown="XXX"/> + <html:image src="/some/image.gif" onmousedown="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onmousedown="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onmousedown="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnmousemove"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onmousemove="XXX"/> + <html:image src="/some/image.gif" onmousemove="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onmousemove="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onmousemove="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnmouseout"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onmouseout="XXX"/> + <html:image src="/some/image.gif" onmouseout="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onmouseout="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onmouseout="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnmouseover"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onmouseover="XXX"/> + <html:image src="/some/image.gif" onmouseover="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onmouseover="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onmouseover="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcOnmouseup"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" onmouseup="XXX"/> + <html:image src="/some/image.gif" onmouseup="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" onmouseup="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" onmouseup="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcProperty"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" property=""/> + <html:image src="/some/image.gif" property=""/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcStyle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" style="XXX"/> + <html:image src="/some/image.gif" style="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" style="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" style="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcStyleClass"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" styleClass="XXX"/> + <html:image src="/some/image.gif" styleClass="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" class="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" class="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcStyleId"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" styleId="XXX"/> + <html:image src="/some/image.gif" styleId="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" id="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" id="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcTabindex"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" tabindex="XXX"/> + <html:image src="/some/image.gif" tabindex="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" tabindex="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" tabindex="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcTitle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" title="XXX"/> + <html:image src="/some/image.gif" title="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" title="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" title="XXX"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcTitleKeyDefaultBundle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" titleKey="default.bundle.message"/> + <html:image src="/some/image.gif" titleKey="default.bundle.message"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" title="Testing Message"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" title="Testing Message"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcTitleKeyAlternateBundle"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" titleKey="alternate.bundle.message" bundle="alternate"/> + <html:image src="/some/image.gif" titleKey="alternate.bundle.message" bundle="alternate"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" title="Testing Message"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" title="Testing Message"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcTitleKeyDefaultBundle_fr"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" titleKey="default.bundle.message"/> + <html:image src="/some/image.gif" titleKey="default.bundle.message"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" title="Message D'Essai"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" title="Message D'Essai"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcTitleKeyAlternateBundle_fr"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" titleKey="alternate.bundle.message" bundle="alternate"/> + <html:image src="/some/image.gif" titleKey="alternate.bundle.message" bundle="alternate"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" title="Message D'Essai"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" title="Message D'Essai"> </bean:define> </logic:equal> <logic:equal name="runTest" value="testImageSrcValue"> <bean:define id="TEST_RESULTS" toScope="page"> - <html:image src="/test/some/image.gif" value="XXX"/> + <html:image src="/some/image.gif" value="XXX"/> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="" src="<%=response.encodeURL("/test/some/image.gif")%>" value="XXX"> + <input type="image" name="" src="<%=response.encodeURL("/some/image.gif")%>" value="XXX"> </bean:define> </logic:equal> @@ -168,12 +168,12 @@ <logic:equal name="runTest" value="testImageSrcIndexedArray"> <bean:define id="TEST_RESULTS" toScope="page"> <logic:iterate id="indivItem" name="lst"> - <html:image src="/test/some/image.gif" indexed="true"/> + <html:image src="/some/image.gif" indexed="true"/> </logic:iterate> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="[0]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[0]" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> @@ -181,12 +181,12 @@ <logic:equal name="runTest" value="testImageSrcIndexedArrayProperty"> <bean:define id="TEST_RESULTS" toScope="page"> <logic:iterate id="indivItem" name="lst" property="list"> - <html:image src="/test/some/image.gif" indexed="true"/> + <html:image src="/some/image.gif" indexed="true"/> </logic:iterate> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="[0]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[0]" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> @@ -194,12 +194,12 @@ <logic:equal name="runTest" value="testImageSrcIndexedMap"> <bean:define id="TEST_RESULTS" toScope="page"> <logic:iterate id="indivItem" name="lst"> - <html:image src="/test/some/image.gif" indexed="true"/> + <html:image src="/some/image.gif" indexed="true"/> </logic:iterate> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="[0]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[0]" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> @@ -207,12 +207,12 @@ <logic:equal name="runTest" value="testImageSrcIndexedMapProperty"> <bean:define id="TEST_RESULTS" toScope="page"> <logic:iterate id="indivItem" name="lst" property="map"> - <html:image src="/test/some/image.gif" indexed="true"/> + <html:image src="/some/image.gif" indexed="true"/> </logic:iterate> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="[0]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[0]" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> @@ -220,14 +220,14 @@ <logic:equal name="runTest" value="testImageSrcIndexedEnumeration"> <bean:define id="TEST_RESULTS" toScope="page"> <logic:iterate id="indivItem" name="lst"> - <html:image src="/test/some/image.gif" indexed="true"/> + <html:image src="/some/image.gif" indexed="true"/> </logic:iterate> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="[0]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[0]" src="<%=response.encodeURL("/some/image.gif")%>"> - <input type="image" name="[1]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[1]" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> @@ -235,14 +235,14 @@ <logic:equal name="runTest" value="testImageSrcIndexedEnumerationProperty"> <bean:define id="TEST_RESULTS" toScope="page"> <logic:iterate id="indivItem" name="lst" property="enumeration"> - <html:image src="/test/some/image.gif" indexed="true"/> + <html:image src="/some/image.gif" indexed="true"/> </logic:iterate> </bean:define> <bean:define id="EXPECTED_RESULTS" toScope="page"> - <input type="image" name="[0]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[0]" src="<%=response.encodeURL("/some/image.gif")%>"> - <input type="image" name="[1]" src="<%=response.encodeURL("/test/some/image.gif")%>"> + <input type="image" name="[1]" src="<%=response.encodeURL("/some/image.gif")%>"> </bean:define> </logic:equal> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]