Author: jim
Date: Fri Feb 8 09:39:21 2008
New Revision: 619954
URL: http://svn.apache.org/viewvc?rev=619954&view=rev
Log:
* Update to latest library versions (where possible). Tidy up build flags since
we require JDK 1.3+ to build. Update location of downloads for commons
libraries. Remove JNDI library since it is included in JDK 1.3+.
http://people.apache.org/~markt/patches/2008-01-17-tc4-lib-updates.patch
+1: markt, fhanik, jim
Modified:
tomcat/container/branches/tc4.1.x/BUILDING.txt
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/build.properties.default
tomcat/container/branches/tc4.1.x/catalina/build.xml
tomcat/container/branches/tc4.1.x/webapps/admin/build.xml
tomcat/container/branches/tc4.1.x/webapps/examples/build.xml
Modified: tomcat/container/branches/tc4.1.x/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/BUILDING.txt?rev=619954&r1=619953&r2=619954&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/BUILDING.txt (original)
+++ tomcat/container/branches/tc4.1.x/BUILDING.txt Fri Feb 8 09:39:21 2008
@@ -12,7 +12,7 @@
and installed and do the following:
-(0) Download and Install a Java Development Kit
+(1) Download and Install a Java Development Kit
* Download a Java Development Kit (JDK) release (version 1.4 or later) from:
@@ -28,7 +28,7 @@
components that will be excluded when building with a 1.3 JDK
-(1) Download and Install the Ant Binary Distribution
+(2) Download and Install the Ant Binary Distribution
* Download a binary distribution of Ant 1.5 or later from:
@@ -51,7 +51,7 @@
available, which will be used to actually perform the build.
-(2) Download and Install the Java XML Pack Binary Distribution
+(3) Download and Install the Java XML Pack Binary Distribution
* Download a binary distribution of Java XML Pack:
@@ -70,31 +70,13 @@
* This is optional with JDK 1.4 or later.
-(3) Download and Install the JNDI 1.2.1 Reference Implementation
-
-* Download the Java Naming and Directory Interface (JNDI) package,
- (version 1.2.1 or later) from
-
- http://java.sun.com/products/jndi/downloads/index.html
-
-* Unpack the reference implementation into a convenient location so that
- it resides in its own subdirectory.
-
-* You will also need the LDAP Service Provider Maintenance package,
- (version 1.2.3 or later) available on the same download page. Be sure
- that you unpack "ldap.jar" and "jaas.jar" into the "lib" subdirectory of
- the JNDI directory, parallel to "jndi.jar".
-
-* This is optional with JDK 1.3 or later.
-
-
(4) Download and Install the Xerces 1 or 2 Distribution
* Download a binary distribution from:
http://xerces.apache.org/xerces2-j/download.cgi
- (Tomcat was tested with "Xerces-J-bin.2.9.0.zip")
+ (Tomcat was tested with "Xerces-J-bin.2.9.1.zip")
* Unpack the binary distribution into a convenient location so that the
distribution resides in its own directory (conventionally named
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=619954&r1=619953&r2=619954&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Fri Feb 8 09:39:21
2008
@@ -188,6 +188,33 @@
[4.1.35] PureTLS
Upgrade to 0.9b5
+[4.1.37] Commons FileUpload
+ Upgrade to 1.2
+
+[4.1.37] Commons Logging
+ Upgrade to 1.1.1
+
+[4.1.37] JNDI
+ Remove JNDI 1.2 since it is included in 1.3+ JDKs
+
+[4.1.37] Commons Modeler
+ Upgrade to 2.0.1
+
+[4.1.37] Jakarta RegExp
+ Upgrade to 1.5
+
+[4.1.37] Xerces
+ Upgrade to 2.9.1
+
+[4.1.37] Commons DBCP
+ Upgrade to 1.2.2
+
+[4.1.37] Commons Pool
+ Upgrade to 1.4
+
+[4.1.37] NSIS
+ Upgrade to 2.34
+
---------------------
Catalina New Features:
@@ -654,6 +681,18 @@
using the request body of a previous request.
Note this connector is deprecated.
+[4.1.37] Docs
+ Simplfy sample application and prevent XSS.
+
+[4.1.37] Manager webapp
+ Fix CVE-2007-2450. Prevent XSS.
+
+[4.1.37] Examples webapp
+ Fix CVE-2007-2449. Prevent XSS.
+
+[4.1.37] Servlet API
+ Use string from resource bundle for error message in HttpServlet
+
------------------
Catalina Bug Fixes:
@@ -2452,13 +2491,12 @@
* activation.jar (JavaBeans Activation Framework 1.0.2)
* ant.jar (Apache Ant 1.7.0)
* commons-collections.jar (Commons Collections 3.2)
-* commons-dbcp.jar (Commons DBCP 1.2.1)
-* commons-logging-api.jar (Commons Logging 1.1)
-* commons-pool.jar (Commons Pool 1.3)
+* commons-dbcp.jar (Commons DBCP 1.2.2)
+* commons-logging-api.jar (Commons Logging 1.1.1)
+* commons-pool.jar (Commons Pool 1.4)
* jasper-compiler.jar (Jasper 2 Compiler)
* jasper-runtime.jar (Jasper 2 Runtime)
* jdbc2_0-stdext.jar (JDBC 2.0 Optional Package, javax.sql.*)
-* jndi.jar (JNDI 1.2 base API classes)
* jta.jar (Java Transacation API 1.1)
* mail.jar (JavaMail 1.3.3)
* naming-common.jar (JNDI Context implementation)
@@ -2470,7 +2508,7 @@
putting unpacked classes into a "classes" directory (not created by default),
or by placing them in JAR files in the "lib" directory.
-Tomcat 4.1 also makes available Xerces 2.9.0 to web applications.
+Tomcat 4.1 also makes available Xerces 2.9.1 to web applications.
--------------------------
Modified: tomcat/container/branches/tc4.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.properties.default?rev=619954&r1=619953&r2=619954&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.properties.default (original)
+++ tomcat/container/branches/tc4.1.x/build.properties.default Fri Feb 8
09:39:21 2008
@@ -49,6 +49,11 @@
# ----- Jakarta files base location -----
base-jakarta.loc=http://archive.apache.org/dist/jakarta
+
+# ----- Commons files base location -----
+base-commons.loc=http://archive.apache.org/dist/commons
+
+# ----- SourceForge base location ----
base-sourceforge.loc=http://switch.dl.sourceforge.net/sourceforge
# --------------------------------------------------
@@ -60,65 +65,56 @@
commons-beanutils.home=${base.path}/commons-beanutils-1.7.0
commons-beanutils.lib=${commons-beanutils.home}
commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
-commons-beanutils.loc=${base-jakarta.loc}/commons/beanutils/binaries/commons-beanutils-1.7.0.tar.gz
+commons-beanutils.loc=${base-commons.loc}/beanutils/binaries/commons-beanutils-1.7.0.tar.gz
# ----- Commons Collections, version 1.0 or later -----
commons-collections.home=${base.path}/commons-collections-3.2
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
+commons-collections.loc=${base-commons.loc}/collections/binaries/commons-collections-3.2.tar.gz
# ----- Commons Digester, version 1.1.1 or later -----
commons-digester.home=${base.path}/commons-digester-1.8
commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester-1.8.jar
-commons-digester.loc=${base-jakarta.loc}/commons/digester/binaries/commons-digester-1.8.tar.gz
+commons-digester.loc=${base-commons.loc}/digester/binaries/commons-digester-1.8.tar.gz
# ----- Commons FileUpload, version 1.0 or later -----
-commons-fileupload.home=${base.path}/commons-fileupload-1.1.1
-commons-fileupload.lib=${commons-fileupload.home}
-commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.1.1.jar
-commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.1.1.tar.gz
+commons-fileupload.home=${base.path}/commons-fileupload-1.2
+commons-fileupload.lib=${commons-fileupload.home}/lib
+commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.2.jar
+commons-fileupload.loc=${base-commons.loc}/fileupload/binaries/commons-fileupload-1.2-bin.tar.gz
# ----- Commons IO, version 1.1 or later -----
commons-io.home=${base.path}/commons-io-1.3
commons-io.lib=${commons-io.home}
commons-io.jar=${commons-io.lib}/commons-io-1.3.jar
-commons-io.loc=${base-jakarta.loc}/commons/io/binaries/commons-io-1.3.tar.gz
+commons-io.loc=${base-commons.loc}/io/binaries/commons-io-1.3.tar.gz
# ----- Commons Logging, version 1.1 or later -----
-commons-logging.home=${base.path}/commons-logging-1.1
+commons-logging.home=${base.path}/commons-logging-1.1.1
commons-logging.lib=${commons-logging.home}
-commons-logging-api.jar=${commons-logging.lib}/commons-logging-api-1.1.jar
-commons-logging.jar=${commons-logging.lib}/commons-logging-1.1.jar
-commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.1.tar.gz
-
-
-# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
-# Note: Optional with JDK 1.3+
-jndi.home=${base.path}/jndi-1.2.1
-jndi.lib=${jndi.home}/lib
-jndi.jar=${jndi.lib}/jndi.jar
-ldap.jar=${jndi.lib}/ldap.jar
-jaas.jar=${jndi.lib}/jaas.jar
+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api-1.1.1.jar
+commons-logging.jar=${commons-logging.lib}/commons-logging-1.1.1.jar
+commons-logging.loc=${base-commons.loc}/logging/binaries/commons-logging-1.1.1-bin.tar.gz
# ----- Commons Modeler, version 1.1 or later -----
-commons-modeler.home=${base.path}/commons-modeler-2.0
+commons-modeler.home=${base.path}/commons-modeler-2.0.1
commons-modeler.lib=${commons-modeler.home}
-commons-modeler.jar=${commons-modeler.lib}/commons-modeler-2.0.jar
-commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/commons-modeler-2.0.tar.gz
+commons-modeler.jar=${commons-modeler.lib}/commons-modeler-2.0.1.jar
+commons-modeler.loc=${base-commons.loc}/modeler/binaries/commons-modeler-2.0.1.tar.gz
# ----- Jakarta Regular Expressions Library, version 1.2 -----
-regexp.home=${base.path}/jakarta-regexp-1.4
+regexp.home=${base.path}/jakarta-regexp-1.5
regexp.lib=${regexp.home}
-regexp.jar=${regexp.lib}/jakarta-regexp-1.4.jar
-regexp.loc=${base-jakarta.loc}/regexp/source/jakarta-regexp-1.4.tar.gz
+regexp.jar=${regexp.lib}/jakarta-regexp-1.5.jar
+regexp.loc=${base-jakarta.loc}/regexp/source/jakarta-regexp-1.5.tar.gz
# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
@@ -127,18 +123,11 @@
servlet.jar=${servlet.lib}/servlet.jar
-# ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----
-# Note: Optional with JDK 1.4+
-#xerces.home=${base.path}/xerces-1_4_4
-#xerces.lib=${xerces.home}
-#xerces.jar=${xerces.lib}/xerces.jar
-
-
# ----- Xerces XML Parser, version 2.0.0 or later -----
# Note: Optional with JDK 1.4+, or if Xerces 1.x is present
-xerces.home=${base.path}/xerces-2_9_0
+xerces.home=${base.path}/xerces-2_9_1
xerces.lib=${xerces.home}
-xerces.loc=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.0.tar.gz
+xerces.loc=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.tar.gz
xercesImpl.jar=${xerces.lib}/xercesImpl.jar
xmlParserAPIs.jar=${xerces.lib}/xml-apis.jar
@@ -159,23 +148,22 @@
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-#commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/daemon-1.0.1.tar.gz
-commons-daemon.loc=http://www.apache.org/dist/jakarta/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
# ----- Commons DBCP, version 1.0 or later -----
-commons-dbcp.home=${base.path}/commons-dbcp-1.2.1
+commons-dbcp.home=${base.path}/commons-dbcp-1.2.2
commons-dbcp.lib=${commons-dbcp.home}
-commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.2.1.jar
-commons-dbcp.loc=${base-jakarta.loc}/commons/dbcp/binaries/commons-dbcp-1.2.1.tar.gz
+commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp-1.2.2.jar
+commons-dbcp.loc=${base-commons.loc}/dbcp/binaries/commons-dbcp-1.2.2.tar.gz
# ----- Commons Pool, version 1.0 or later -----
# Note Commons Pool 2.0 is available but requires JDK 1.4+
-commons-pool.home=${base.path}/commons-pool-1.3
+commons-pool.home=${base.path}/commons-pool-1.4
commons-pool.lib=${commons-pool.home}
-commons-pool.jar=${commons-pool.lib}/commons-pool-1.3.jar
-commons-pool.loc=${base-jakarta.loc}/commons/pool/binaries/commons-pool-1.3.tar.gz
+commons-pool.jar=${commons-pool.lib}/commons-pool-1.4.jar
+commons-pool.loc=${base-commons.loc}/pool/binaries/commons-pool-1.4.tar.gz
# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
@@ -201,7 +189,7 @@
# ----- Java Transaction API (JTA), version 1.0.1 or later -----
-jta.home=${base.path}/jta-1.1
+jta.home=${base.path}/jta-1_1
jta.lib=${jta.home}
jta.jar=${jta.lib}/jta.jar
@@ -223,8 +211,8 @@
# ----- NSIS, version 2.14 or later -----
nsis.home=C:/Program Files/nsis
-nsis.loc=${base-sourceforge.loc}/nsis/nsis-2.24-setup.exe?download
-nsis.install.exe=${nsis.home}/nsis-224.exe
+nsis.loc=${base-sourceforge.loc}/nsis/nsis-2.34-setup.exe?download
+nsis.install.exe=${nsis.home}/nsis-234.exe
# ----- PureTLS Extension, version 0.9 or later -----
Modified: tomcat/container/branches/tc4.1.x/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/build.xml?rev=619954&r1=619953&r2=619954&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/build.xml Fri Feb 8 09:39:21
2008
@@ -62,15 +62,12 @@
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${tomcat-util.jar}"/>
- <pathelement location="${jaas.jar}"/>
<pathelement location="${jcert.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${jmx.jar}"/>
- <pathelement location="${jndi.jar}"/>
<pathelement location="${jnet.jar}"/>
<pathelement location="${jsse.jar}"/>
<pathelement location="${jta.jar}"/>
- <pathelement location="${ldap.jar}"/>
<pathelement location="${mail.jar}"/>
<pathelement location="${regexp.jar}"/>
<pathelement location="${servlet.jar}"/>
@@ -95,15 +92,12 @@
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-modeler.jar}"/>
<pathelement location="${commons-pool.jar}"/>
- <pathelement location="${jaas.jar}"/>
<pathelement location="${jcert.jar}"/>
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${jmx.jar}"/>
- <pathelement location="${jndi.jar}"/>
<pathelement location="${jnet.jar}"/>
<pathelement location="${jsse.jar}"/>
<pathelement location="${jta.jar}"/>
- <pathelement location="${ldap.jar}"/>
<pathelement location="${mail.jar}"/>
<pathelement location="${regexp.jar}"/>
<pathelement location="${servlet.jar}"/>
@@ -129,7 +123,6 @@
<target name="flags">
<!-- JDK flags -->
- <available property="jdk.1.2.present" classname="java.util.HashMap" />
<available property="jdk.1.3.present"
classname="java.lang.reflect.Proxy" />
<available property="jdk.1.4.present" classname="java.nio.Buffer" />
@@ -169,9 +162,6 @@
<available property="modeler.present"
classname="org.apache.commons.modeler.Registry"
classpathref="catalina.classpath"/>
- <available property="jaas.present"
- classname="javax.security.auth.Subject"
- classpath="${jaas.jar}" />
<condition property="jaxp.present">
<and>
<available classname="javax.xml.parsers.SAXParser"
@@ -191,9 +181,6 @@
<available property="jmx.present"
classname="javax.management.MBeanServer"
classpath="${jmx.jar}" />
- <available property="jndi.present"
- classname="javax.naming.Context"
- classpath="${jndi.jar}" />
<condition property="jsse.present">
<and>
<available classname="javax.security.cert.Certificate"
@@ -215,9 +202,6 @@
<available property="junit.present"
classname="junit.framework.TestCase"
classpath="${junit.jar}" />
- <available property="ldap.present"
- classname="com.sun.jndi.ldap.LdapClient"
- classpath="${ldap.jar}" />
<available property="pool.present"
classname="org.apache.commons.pool.ObjectPool"
classpath="${commons-pool.jar}"/>
@@ -239,7 +223,6 @@
<available property="dbcp.jar.present" file="${commons-dbcp.jar}" />
<available property="fileupload.jar.present"
file="${commons-fileupload.jar}" />
<available property="io.jar.present" file="${commons-io.jar}" />
- <available property="jaas.jar.present" file="${jaas.jar}" />
<condition property="javamail.jar.present">
<and>
<available file="${activation.jar}" />
@@ -249,12 +232,10 @@
<available property="jdbc20ext.jar.present" file="${jdbc20ext.jar}" />
<available property="jmx.jar.present" file="${jmx.jar}" />
<available property="jcert.jar.present" file="${jcert.jar}" />
- <available property="jndi.jar.present" file="${jndi.jar}" />
<available property="jnet.jar.present" file="${jnet.jar}" />
<available property="jsse.jar.present" file="${jsse.jar}" />
<available property="jta.jar.present" file="${jta.jar}" />
<available property="junit.jar.present" file="${junit.jar}" />
- <available property="ldap.jar.present" file="${ldap.jar}" />
<available property="logging.jar.present" file="${commons-logging.jar}" />
<available property="modeler.jar.present" file="${commons-modeler.jar}" />
<available property="pool.jar.present" file="${commons-pool.jar}" />
@@ -288,12 +269,6 @@
</and>
</or>
</condition>
- <condition property="compile.jaas">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jaas.present}" arg2="true" />
- </or>
- </condition>
<condition property="compile.javamail">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -309,13 +284,6 @@
</and>
</or>
</condition>
- <condition property="compile.jndi">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jndi.present}" arg2="true" />
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- </or>
- </condition>
<condition property="compile.jsse">
<or>
<equals arg1="${full.dist}" arg2="on" />
@@ -335,13 +303,6 @@
<equals arg1="${junit.present}" arg2="true" />
</or>
</condition>
- <condition property="compile.ldap">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${ldap.present}" arg2="true" />
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- </or>
- </condition>
<property name="compile.ssi" value="true"/>
<condition property="compile.tyrex">
<or>
@@ -369,22 +330,6 @@
</or>
</and>
</condition>
- <condition property="copy.jaas.jar">
- <and>
- <not>
- <equals arg1="${light.dist}" arg2="on" />
- </not>
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jaas.jar.present}" arg2="true" />
- <not>
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </not>
- </and>
- </or>
- </and>
- </condition>
<condition property="copy.jdbc20ext.jar">
<and>
<not>
@@ -401,25 +346,6 @@
</or>
</and>
</condition>
- <condition property="copy.jndi.jar">
- <and>
- <not>
- <equals arg1="${light.dist}" arg2="on" />
- </not>
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jndi.jar.present}" arg2="true" />
- <not>
- <or>
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </or>
- </not>
- </and>
- </or>
- </and>
- </condition>
<condition property="copy.javamail.jar">
<and>
<not>
@@ -448,25 +374,6 @@
</or>
</and>
</condition>
- <condition property="copy.ldap.jar">
- <and>
- <not>
- <equals arg1="${light.dist}" arg2="on" />
- </not>
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${ldap.jar.present}" arg2="true" />
- <not>
- <or>
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </or>
- </not>
- </and>
- </or>
- </and>
- </condition>
<condition property="copy.jsse.jar">
<and>
<not>
@@ -576,7 +483,6 @@
<echo message="<style> task available (required)=${style.available}"
/>
<echo message="--- JDK ---" />
- <echo message="jdk.1.2.present=${jdk.1.2.present}" />
<echo message="jdk.1.3.present=${jdk.1.3.present}" />
<echo message="jdk.1.4.present=${jdk.1.4.present}" />
@@ -588,7 +494,6 @@
<echo message="collections.present=${collections.present}" />
<echo message="digester.present=${digester.present}" />
<echo message="jaxp.present=${jaxp.present}" />
- <echo message="jndi.present=${jndi.present}" />
<echo message="logging.present=${logging.present}" />
<echo message="regexp.present=${regexp.present}" />
<echo message="servlet.present=${servlet.present}" />
@@ -598,19 +503,16 @@
<echo message="dbcp.present=${dbcp.present}" />
<echo message="fileupload.present=${fileupload.present}" />
<echo message="io.present=${io.present}" />
- <echo message="jaas.present=${jaas.present}" />
<echo message="javamail.present=${javamail.present}" />
<echo message="jmx.present=${jmx.present}" />
<echo message="jsse.present=${jsse.present}" />
<echo message="jta.present=${jta.present}" />
<echo message="junit.present=${junit.present}" />
- <echo message="ldap.present=${ldap.present}" />
<echo message="modeler.present=${modeler.present}" />
<echo message="pool.present=${pool.present}" />
<echo message="tyrex.present=${tyrex.present}" />
<echo message="--- Required JARs ---" />
- <echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
<echo message="regexp.jar.present=${regexp.jar.present}" />
<echo message="servlet.jar.present=${servlet.jar.present}" />
<echo message="xerces.jar.present(except JDK 1.4+ or
xerces2)=${xerces.jar.present}" />
@@ -621,13 +523,11 @@
<echo message="dbcp.jar.present=${dbcp.jar.present}" />
<echo message="fileupload.jar.present=${fileupload.jar.present}" />
<echo message="io.jar.present=${io.jar.present}" />
- <echo message="jaas.jar.present=${jaas.jar.present}" />
<echo message="javamail.jar.present=${javamail.jar.present}" />
<echo message="jdbc20ext.jar.present=${jdbc20ext.jar.present}" />
<echo message="jmx.jar.present=${jmx.jar.present}" />
<echo message="jta.jar.present=${jta.jar.present}" />
<echo message="junit.jar.present=${junit.jar.present}" />
- <echo message="ldap.jar.present=${ldap.jar.present}" />
<echo message="modeler.jar.present=${modeler.jar.present}" />
<echo message="pool.jar.present=${pool.jar.present}" />
<echo message="tyrex.jar.present=${tyrex.jar.present}" />
@@ -635,27 +535,21 @@
<echo message="--- Conditional compilation flags ---" />
<echo message="compile.daemon=${compile.daemon}" />
<echo message="compile.dbcp=${compile.dbcp}" />
- <echo message="compile.jaas=${compile.jaas}" />
<echo message="compile.javamail=${compile.javamail}" />
<echo message="compile.jmx=${compile.jmx}" />
- <echo message="compile.jndi=${compile.jndi}" />
<echo message="compile.jsse=${compile.jsse}" />
<echo message="compile.jta=${compile.jta}" />
<echo message="compile.junit=${compile.junit}" />
- <echo message="compile.ldap=${compile.ldap}" />
<echo message="compile.ssi=${compile.ssi}" />
<echo message="compile.tyrex=${compile.tyrex}" />
<echo message="--- Distribution flags ---" />
<echo message="copy.daemon.jar=${copy.daemon.jar}" />
<echo message="copy.dbcp.jar=${copy.dbcp.jar}" />
- <echo message="copy.jaas.jar=${copy.jaas.jar}" />
<echo message="copy.jdbc20ext.jar=${copy.jdbc20ext.jar}" />
<echo message="copy.javamail.jar=${copy.javamail.jar}" />
<echo message="copy.jmx.jar=${copy.jmx.jar}" />
- <echo message="copy.jndi.jar=${copy.jndi.jar}" />
<echo message="copy.jta.jar=${copy.jta.jar}" />
- <echo message="copy.ldap.jar=${copy.ldap.jar}" />
<echo message="copy.logging.jar=${copy.logging.jar}" />
<echo message="copy.modeler.jar=${copy.modeler.jar}" />
<echo message="copy.pool.jar=${copy.pool.jar}" />
@@ -704,9 +598,6 @@
<copy todir="${catalina.build}/server/lib"
file="${commons-io.jar}"/>
</target>
- <target name="copy-jaas.jar" if="copy.jaas.jar">
- <copy todir="${catalina.build}/server/lib" file="${jaas.jar}"/>
- </target>
<target name="copy-jdbc20ext.jar" if="copy.jdbc20ext.jar">
<copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
</target>
@@ -714,17 +605,9 @@
<copy todir="${catalina.build}/server/lib" file="${jmx.jar}"/>
<copy tofile="${catalina.build}/server/lib/mx4j.license"
file="${jmx.license}"/>
</target>
- <target name="copy-jndi.jar" if="copy.jndi.jar">
- <copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/>
- </target>
<target name="copy-jta.jar" if="copy.jta.jar">
<copy todir="${catalina.build}/common/lib" file="${jta.jar}"/>
</target>
- <target name="copy-ldap.jar" if="copy.ldap.jar">
- <!-- Cannot redistribute LDAP
- <copy todir="${catalina.build}/common/lib" file="${ldap.jar}"/>
- -->
- </target>
<target name="copy-jsse.jar" if="copy.jsse.jar">
<!-- Cannot redistribute JSSE
<copy todir="${catalina.build}/common/lib" file="${jcert.jar}"/>
@@ -757,7 +640,7 @@
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-daemon.jar,copy-dbcp.jar,copy-fileupload.jar,copy-io.jar,copy-jaas.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
+ <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-daemon.jar,copy-dbcp.jar,copy-fileupload.jar,copy-io.jar,copy-jdbc20ext.jar,copy-jmx.jar,copy-jsse.jar,copy-jta.jar,copy-modeler.jar,copy-pool.jar,copy-tyrex.jar,copy-xerces.jar,copy-xerces2.jars">
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
@@ -824,6 +707,13 @@
value="public CharChunk subSequence" />
</replace>
+ <!-- Remove references to 1.5 annotations -->
+ <replace dir="${tomcat-util.home}/java">
+ <replacefilter
+ token="@Deprecated"
+ value="" />
+ </replace>
+
<ant dir="${tomcat-util.home}" target="build-main" inheritAll="false" >
<property name="jmx.jar" value="${jmx.jar}" />
<property name="puretls.jar" value="${puretls.jar}" />
@@ -848,10 +738,6 @@
optimize="${compile.optimize}"
excludes="**/CVS/**">
<classpath refid="catalina.classpath" />
- <exclude name="org/apache/catalina/util/ProcessHelper.java"
- unless="jdk.1.3.present"/>
- <exclude name="org/apache/catalina/servlets/CGIServlet.java"
- unless="jdk.1.3.present"/>
<exclude name="org/apache/naming/NamingService.java"
unless="compile.jmx"/>
<exclude name="org/apache/naming/factory/DbcpDataSourceFactory.java"
@@ -862,8 +748,6 @@
unless="compile.jmx"/>
<exclude name="org/apache/catalina/net/SSLServerSocketFactory.java"
unless="compile.jsse"/>
- <exclude name="org/apache/catalina/realm/JAAS**"
- unless="compile.jaas"/>
<exclude name="org/apache/catalina/startup/BootstrapService.java"
unless="compile.daemon"/>
<exclude name="org/apache/catalina/startup/BootstrapServiceContext.java"
Modified: tomcat/container/branches/tc4.1.x/webapps/admin/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/admin/build.xml?rev=619954&r1=619953&r2=619954&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/admin/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/admin/build.xml Fri Feb 8
09:39:21 2008
@@ -32,7 +32,6 @@
<target name="flags">
<!-- JDK flags -->
- <available property="jdk.1.2.present" classname="java.util.HashMap" />
<available property="jdk.1.3.present"
classname="java.lang.reflect.Proxy" />
<available property="jdk.1.4.present" classname="java.nio.Buffer" />
@@ -124,7 +123,6 @@
<echo message="<style> task available (required)=${style.available}"
/>
<echo message="--- JDK ---" />
- <echo message="jdk.1.2.present=${jdk.1.2.present}" />
<echo message="jdk.1.3.present=${jdk.1.3.present}" />
<echo message="jdk.1.4.present=${jdk.1.4.present}" />
Modified: tomcat/container/branches/tc4.1.x/webapps/examples/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/examples/build.xml?rev=619954&r1=619953&r2=619954&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/examples/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/examples/build.xml Fri Feb 8
09:39:21 2008
@@ -18,7 +18,6 @@
<!-- Construct Catalina classpath -->
<path id="examples.classpath">
<pathelement location="${activation.jar}"/>
- <pathelement location="${jndi.jar}"/>
<pathelement location="${mail.jar}"/>
<pathelement location="${servlet.jar}"/>
</path>
@@ -27,7 +26,6 @@
<target name="flags">
<!-- JDK flags -->
- <available property="jdk.1.2.present" classname="java.util.HashMap" />
<available property="jdk.1.3.present"
classname="java.lang.reflect.Proxy" />
<available property="jdk.1.4.present" classname="java.nio.Buffer" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
