Author: jmitchell
Date: Tue Mar 22 18:05:43 2005
New Revision: 158707
URL: http://svn.apache.org/viewcvs?view=rev&rev=158707
Log:
fix for taglibs, skip TestBaseTag (for now) since request.getServerPort() does
not return the same thing when called from the jsp and from RequestUtils
Modified:
struts/taglib/trunk/project.properties
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
Modified: struts/taglib/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/project.properties?view=diff&r1=158706&r2=158707
==============================================================================
--- struts/taglib/trunk/project.properties (original)
+++ struts/taglib/trunk/project.properties Tue Mar 22 18:05:43 2005
@@ -20,4 +20,5 @@
maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir = src/conf/merge
cactus.src.mergewebxml = src/conf/cactus-web.xml
-cactus.src.includes = **/Test*.java
+cactus.test.includes = **/Test*.class
+cactus.test.excludes = **/TestBase*.class
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=158706&r2=158707
==============================================================================
---
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
Tue Mar 22 18:05:43 2005
@@ -18,7 +18,7 @@
</logic:equal>
<logic:equal name="runTest" value="testStrutsTagMapping">
- <bean:struts id="PAGE_KEY" mapping="IncludeTagTransaction"/>
+ <bean:struts id="PAGE_KEY" mapping="/testIncludeTagTransaction"/>
<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=158706&r2=158707
==============================================================================
---
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
Tue Mar 22 18:05:43 2005
@@ -8,6 +8,12 @@
String server = request.getServerName();
int port = request.getServerPort();
String portString = (port == 80 ? "" : ":" + port);
+
+// for some reason, getContextPath() from the jsp returns "/Test", but
+// when called from RequestUtils, request ""
+System.out.println("request.getServerName()=" + request.getServerName());
+System.out.println("request.getServerPort()=" + request.getServerPort());
+System.out.println("request.getContextPath()=" + request.getContextPath());
%>
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=158706&r2=158707
==============================================================================
---
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
Tue Mar 22 18:05:43 2005
@@ -1,6 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<[EMAIL PROTECTED] import="org.apache.struts.taglib.TaglibTestBase"%>
-<[EMAIL PROTECTED] import="org.apache.oro.text.perl.Perl5Util"%>
+<%@ page import="org.apache.struts.taglib.TaglibTestBase"%>
+<%@ page import="org.apache.oro.text.perl.Perl5Util"%>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
@@ -8,11 +8,11 @@
<logic:equal name="runTest" value="testFormAction">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:form action="FormTag">
+ <html:form action="/testFormTag">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" enctype="multipart/form-data">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
enctype="multipart/form-data">
+ <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" acceptCharset="UTF-8">
+ <html:form action="/testFormTag" acceptCharset="UTF-8">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>"
accept-charset="UTF-8">
+ <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" focus="string">
+ <html:form action="/testFormTag" focus="string">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" focus="stringIndexed"
focusIndex="2">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>">
+ <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="post">
+ <html:form action="/testFormTag" method="post">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>">
</form>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testFormActionMethod2">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:form action="FormTag" method="Post">
+ <html:form action="/testFormTag" method="Post">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="Post"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="Post"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>">
</form>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testFormActionMethod3">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:form action="FormTag" method="get">
+ <html:form action="/testFormTag" method="get">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="get"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="get"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>">
</form>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testFormActionMethod4">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:form action="FormTag" method="Get">
+ <html:form action="/testFormTag" method="Get">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="Get"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="Get"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>">
</form>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testFormActionMethod5">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:form action="FormTag" method="GET">
+ <html:form action="/testFormTag" method="GET">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="GET"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="GET"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>">
</form>
</bean:define>
</logic:equal>
<logic:equal name="runTest" value="testFormActionMethod6">
<bean:define id="TEST_RESULTS" toScope="page">
- <html:form action="FormTag" method="misc">
+ <html:form action="/testFormTag" method="misc">
</html:form>
</bean:define>
<bean:define id="EXPECTED_RESULTS" toScope="page">
- <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "FormTag.do")%>">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="misc" onreset="script goes
here">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
onreset="script goes here">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="misc" onsubmit="script goes
here">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
onsubmit="script goes here">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="misc"
style="style.goes.here">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
style="style.goes.here">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="misc"
styleClass="style.goes.here">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
class="style.goes.here">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="misc"
styleId="id.goes.here">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
id="id.goes.here">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.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="FormTag" method="misc" target="_new">
+ <html:form action="/testFormTag" 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() + "FormTag.do")%>"
target="_new">
+ <form name="testFormBean" method="misc"
action="<%=response.encodeURL( request.getContextPath() + "/testFormTag.do")%>"
target="_new">
</form>
</bean:define>
</logic:equal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
