Author: kkolinko
Date: Wed Jan 27 18:13:01 2010
New Revision: 903776
URL: http://svn.apache.org/viewvc?rev=903776&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47689
Enable the test Ant target to work
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/build.xml
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=903776&r1=903775&r2=903776&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Jan 27 18:13:01 2010
@@ -168,12 +168,6 @@
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47689
- Enable the test Ant target to work
- https://issues.apache.org/bugzilla/attachment.cgi?id=24704
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
Prevent use of non-RFC2616 compliant custom status messages
http://svn.apache.org/viewvc?rev=892612&view=rev
Modified: tomcat/tc5.5.x/trunk/container/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/build.xml?rev=903776&r1=903775&r2=903776&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/build.xml (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/build.xml Wed Jan 27 18:13:01 2010
@@ -42,6 +42,7 @@
<property name="tomcat-coyote.home" value="${jtc.home}/coyote"/>
<property name="tomcat-jk.home" value="${jtc.home}/jk"/>
<property name="tomcat-http11.home" value="${jtc.home}/http11"/>
+ <property name="tomcat-jni.home" value="${jtc.home}/jni"/>
<!-- Dependent JARs and files -->
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
@@ -53,7 +54,7 @@
<property name="tomcat-jk2.jar"
value="${tomcat-jk.home}/build/lib/tomcat-jk2.jar"/>
<property name="tomcat-jni.jar"
- value="${tomcat-jk.home}/build/lib/tomcat-jni.jar"/>
+ value="${tomcat-jni.home}/dist/tomcat-jni.jar"/>
<property name="jk2.properties"
value="${tomcat-jk.home}/build/conf/jk2.properties"/>
<property name="tomcat-http11.jar"
@@ -74,6 +75,7 @@
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${tomcat-util.jar}"/>
<pathelement location="${tomcat-coyote.jar}"/>
+ <pathelement location="${tomcat-http11.jar}"/>
<pathelement location="${jaas.jar}"/>
<pathelement location="${javagroups.jar}"/>
<pathelement location="${jcert.jar}"/>
@@ -591,7 +593,7 @@
<!-- =================== BUILD: Build tomcat-util ======================= -->
- <target name="build-tomcat-util">
+ <target name="build-tomcat-util" depends="build-tomcat-jni">
<ant dir="${tomcat-util.home}" target="build-main">
<property name="jmx.jar" value="${jmx.jar}" />
@@ -605,6 +607,25 @@
</target>
+ <!-- =================== BUILD: Build tomcat-jni ======================== -->
+ <target name="build-tomcat-jni">
+
+ <ant dir="${tomcat-jni.home}" target="jar" inheritAll="false" >
+ <property name="final.name" value="tomcat-jni" />
+ </ant>
+
+ </target>
+
+
+ <!-- =================== BUILD: Build tomcat-jni ======================== -->
+ <target name="build-webapps">
+
+ <ant dir="../webapps" target="ROOT" inheritAll="false" >
+ </ant>
+
+ </target>
+
+
<!-- ================ BUILD: Compile Catalina Components ================ -->
<target name="build-catalina"
depends="build-catalina-core,build-catalina-optional"/>
@@ -695,6 +716,7 @@
<target name="build-tomcat-coyote">
<ant dir="${tomcat-coyote.home}" target="compile">
+ <property name="build.home" value="${tomcat-coyote.home}/build" />
<property name="catalina.home" value="${catalina.deploy}"/>
<property name="servlet.jar" value="${servlet-api.jar}"/>
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
@@ -736,6 +758,7 @@
<target name="build-tomcat-http11">
<ant dir="${tomcat-http11.home}" target="compile">
+ <property name="build.home" value="${tomcat-http11.home}/build" />
<property name="commons-logging.jar" value="${commons-logging.jar}"/>
<property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
<property name="jmx.jar" value="${jmx.jar}"/>
@@ -749,7 +772,8 @@
<!-- ================= BUILD: Compile All Server Components ============= -->
- <target name="build-main"
depends="build-static,build-tomcat-util,build-catalina">
+ <target name="build-main"
+
depends="build-static,build-tomcat-util,build-tomcat-coyote,build-tomcat-http11,build-catalina,build-webapps">
</target>
@@ -797,9 +821,14 @@
<delete dir="${catalina.build}"/>
<ant dir="${tomcat-util.home}" target="clean"/>
- <ant dir="${tomcat-coyote.home}" target="clean"/>
+ <ant dir="${tomcat-coyote.home}" target="clean">
+ <property name="build.home" value="${tomcat-coyote.home}/build" />
+ </ant>
<ant dir="${tomcat-jk.home}" target="clean"/>
- <ant dir="${tomcat-http11.home}" target="clean"/>
+ <ant dir="${tomcat-http11.home}" target="clean" >
+ <property name="build.home" value="${tomcat-http11.home}/build" />
+ </ant>
+ <ant dir="${tomcat-jni.home}" target="clean"/>
</target>
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java?rev=903776&r1=903775&r2=903776&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/catalina/util/CookieToolsTestCase.java
Wed Jan 27 18:13:01 2010
@@ -77,13 +77,13 @@
*/
public void setUp() {
- version0 = new Cookie("Version 0 Name", "Version 0 Value");
+ version0 = new Cookie("Version-0-Name", "Version 0 Value");
version0.setComment("Version 0 Comment");
version0.setDomain("localhost");
version0.setPath("/version0");
version0.setVersion(0);
- version1 = new Cookie("Version 1 Name", "Version 1 Value");
+ version1 = new Cookie("Version-1-Name", "Version 1 Value");
version1.setComment("Version 1 Comment");
version1.setDomain("localhost");
version1.setPath("/version1");
@@ -139,13 +139,13 @@
sb = new StringBuffer();
CookieTools.getCookieHeaderValue(version0, sb);
assertEquals("Version 0 cookie header value",
- "Version 0 Name=Version 0
Value;Domain=localhost;Path=/version0",
+ "Version-0-Name=Version 0 Value; Domain=localhost;
Path=/version0",
sb.toString());
sb = new StringBuffer();
CookieTools.getCookieHeaderValue(version1, sb);
assertEquals("Version 1 cookie header value",
- "Version 1 Name=\"Version 1
Value\";Version=1;Comment=\"Version 1
Comment\";Domain=localhost;Discard;Path=\"/version1\"",
+ "Version-1-Name=\"Version 1 Value\"; Version=1;
Comment=\"Version 1 Comment\"; Domain=localhost; Discard; Path=\"/version1\"",
sb.toString());
}
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java?rev=903776&r1=903775&r2=903776&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/test/org/apache/naming/resources/BaseDirContextTestCase.java
Wed Jan 27 18:13:01 2010
@@ -85,7 +85,7 @@
* assumed to be Resources.
*/
protected static final String dirContextNames[] =
- { "classes", "images", "jsp", "lib", "META-INF", "WEB-INF" };
+ { "classes", "images", "jsp", "lib", "META-INF", "WEB-INF", "admin" };
/**
@@ -93,7 +93,8 @@
* directory context.
*/
protected static final String topLevelNames[] =
- { "index.jsp", "jakarta-banner.gif", "tomcat.gif", "tomcat-power.gif",
"META-INF", "WEB-INF" };
+ { "index.jsp", "asf-logo-wide.gif", "tomcat.gif", "tomcat-power.gif",
+ "admin", "META-INF", "WEB-INF", "favicon.ico" };
/**
* The set of names that should be present in the WEB-INF
@@ -310,7 +311,7 @@
next instanceof NameClassPair);
NameClassPair ncp = (NameClassPair) next;
- assertTrue("Name '" + ncp.getName() + "' is expected",
+ assertTrue("Name '" + ncp.getName() + "' is unexpected",
isListed(ncp.getName(), list));
if (isDirContext(ncp.getName())) {
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=903776&r1=903775&r2=903776&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Wed Jan 27
18:13:01 2010
@@ -40,6 +40,9 @@
in catalina.sh. (fhanik/kkolinko)
</add>
<fix>
+ <bug>47689</bug>: Enable the test Ant target to work. (markt)
+ </fix>
+ <fix>
<bug>47712</bug>: Loading tcnative was broken in 5.5.28. (rjung)
</fix>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
