Author: markt Date: Fri Jan 18 11:00:00 2008 New Revision: 613225 URL: http://svn.apache.org/viewvc?rev=613225&view=rev Log: Apply a couple of library updates.
Modified: tomcat/build/tc5.5.x/build.properties.default tomcat/build/tc5.5.x/build.xml tomcat/build/tc5.5.x/tomcat.nsi tomcat/connectors/trunk/.classpath tomcat/container/tc5.5.x/.classpath tomcat/container/tc5.5.x/catalina/etc/bootstrap.MF tomcat/container/tc5.5.x/webapps/admin/build.xml tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/current/tc5.5.x/STATUS.txt tomcat/jasper/tc5.5.x/.classpath Modified: tomcat/build/tc5.5.x/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/build/tc5.5.x/build.properties.default (original) +++ tomcat/build/tc5.5.x/build.properties.default Fri Jan 18 11:00:00 2008 @@ -48,14 +48,14 @@ #base.path=C:/path/to/the/repository #base.path=/usr/local -# ----- 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 # ----- Logging files base location ----- base-logging.loc=http://archive.apache.org/dist/logging -# ----- XML files base location ----- -base-xml.loc=http://archive.apache.org/dist/xml +# ----- Xerces files base location ----- +base-xerces.loc=http://archive.apache.org/dist/xerces # ----- Struts files base location ----- base-struts.loc=http://archive.apache.org/dist/struts @@ -66,7 +66,7 @@ #base-sf.loc=http://internap.dl.sourceforge.net/sourceforge # ----- Additional Tomcat files base location ----- -base-tomcat.loc=http://archive.apache.org/dist/tomcat +base-tomcat.loc=http://tomcat.apache.org/dev/dist # -------------------------------------------------- # REQUIRED LIBRARIES @@ -77,72 +77,72 @@ 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 Launcher, version 0.9 or later ----- -commons-launcher.home=${base.path}/commons-launcher-0.9 +commons-launcher.home=${base.path}/commons-launcher commons-launcher.lib=${commons-launcher.home} commons-launcher.bin=${commons-launcher.home}/bin commons-launcher.jar=${commons-launcher.bin}/commons-launcher.jar commons-launcher.bootstrap.class=${commons-launcher.bin}/LauncherBootstrap.class -commons-launcher.loc=${base-jakarta.loc}/commons/launcher/binaries/launcher-0.9.tar.gz +commons-launcher.loc=${base-commons.loc}/launcher/binaries/commons-launcher-1.1.tar.gz # ----- Commons Daemon, version 1.0-Alpha or later ----- 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/commons-daemon-1.0.1.tar.gz +commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz # ----- Commons Digester, version 1.4 or later ----- -commons-digester.home=${base.path}/commons-digester-1.7 +commons-digester.home=${base.path}/commons-digester-1.8 commons-digester.lib=${commons-digester.home} -commons-digester.jar=${commons-digester.lib}/commons-digester-1.7.jar -commons-digester.loc=${base-jakarta.loc}/commons/digester/binaries/commons-digester-1.7.tar.gz +commons-digester.jar=${commons-digester.lib}/commons-digester-1.8.jar +commons-digester.loc=${base-commons.loc}/digester/binaries/commons-digester-1.8.tar.gz # ----- Commons Expression Language (EL), version 1.0 or later ----- commons-el.home=${base.path}/commons-el-1.0 commons-el.lib=${commons-el.home} commons-el.jar=${commons-el.lib}/commons-el.jar -commons-el.loc=${base-jakarta.loc}/commons/el/binaries/commons-el-1.0.tar.gz +commons-el.loc=${base-commons.loc}/el/binaries/commons-el-1.0.tar.gz # ----- Commons Logging, version 1.0.1 or later ----- -commons-logging.home=${base.path}/commons-logging-1.0.4 +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.jar -commons-logging.jar=${commons-logging.lib}/commons-logging.jar -commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz +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 2.0 or later ----- 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.1.jar -commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/commons-modeler-2.0.1.tar.gz +commons-modeler.loc=${base-commons.loc}/modeler/binaries/commons-modeler-2.0.1.tar.gz # ----- Xerces XML Parser, version 2.8.0 ----- -xerces.home=${base.path}/xerces-2_8_0 +xerces.home=${base.path}/xerces-2_9_1 xerces.lib=${xerces.home} xercesImpl.jar=${xerces.lib}/xercesImpl.jar xml-apis.jar=${xerces.lib}/xml-apis.jar -xerces.loc=${base-xml.loc}/xerces-j/binaries/Xerces-J-bin.2.8.0.tar.gz +xerces.loc=${base-xerces.loc}/j/binaries/Xerces-J-bin.2.9.1.tar.gz # ----- Eclipse JDT, version 3.3.1 or later ----- jdt.home=${base.path}/eclipse/plugins jdt.lib=${jdt.home} jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar -jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip +jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip # ----- Tomcat native library ----- -tomcat-native.home=${base.path}/tomcat-native-current +tomcat-native.home=${base.path}/tomcat-native-1.1.12 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz -tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-current.tar.gz +tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.12-src.tar.gz # -------------------------------------------------- @@ -153,49 +153,42 @@ # ----- Commons DBCP, version 1.1 or later ----- commons-dbcp.version=1.2.2 commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src -commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz - - -# ----- Commons HttpClient, version 2.0 or later ----- -commons-httpclient.home=${base.path}/commons-httpclient-2.0 -commons-httpclient.lib=${commons-httpclient.home} -commons-httpclient.jar=${commons-httpclient.lib}/commons-httpclient-2.0.jar -commons-httpclient.loc=${base-jakarta.loc}/commons/httpclient/binary/commons-httpclient-2.0.tar.gz +commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz # ----- Commons Pool, version 1.1 or later ----- commons-pool.home=${base.path}/commons-pool-1.3-src -commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz +commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.3-src.tar.gz # ----- Commons Collections, version 2.0 or later ----- -commons-collections.home=${base.path}/commons-collections-3.1 +commons-collections.home=${base.path}/commons-collections-3.2 commons-collections.lib=${commons-collections.home} -commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar -commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz -commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz +commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar +commons-collections.loc=${base-commons.loc}/collections/binaries/commons-collections-3.2.tar.gz +commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz # ----- Commons FileUpload, version 1.0-20030531 or later ----- -commons-fileupload.home=${base.path}/commons-fileupload-1.0 -commons-fileupload.lib=${commons-fileupload.home} -commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.0.jar -commons-fileupload.loc=${base-jakarta.loc}/commons/fileupload/binaries/commons-fileupload-1.0.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 # ----- Java Management Extensions (JMX), JMX RI 1.2.1 or later or MX4J 2.0.1 or later ----- -jmx.home=${base.path}/mx4j-3.0.1 +jmx.home=${base.path}/mx4j-3.0.2 jmx.lib=${jmx.home}/lib jmx.jar=${jmx.lib}/mx4j.jar jmx-tools.jar=${jmx.lib}/mx4j-tools.jar jmx-remote.jar=${jmx.lib}/mx4j-remote.jar -jmx.loc=${base-sf.loc}/mx4j/mx4j-3.0.1.tar.gz +jmx.loc=${base-sf.loc}/mx4j/mx4j-3.0.2.tar.gz # ----- JUnit Unit Test Suite, version 3.7 or later ----- -junit.home=${base.path}/junit3.8.1 +junit.home=${base.path}/junit3.8.2 junit.lib=${junit.home} junit.jar=${junit.lib}/junit.jar -junit.loc=${base-sf.loc}/junit/junit3.8.1.zip +junit.loc=${base-sf.loc}/junit/junit3.8.2.zip # ----- Rhino ------ @@ -204,19 +197,19 @@ rhino.loc=http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R2.zip # ----- NSIS, version 2.0 or later ----- -nsis.home=${base.path}/nsis-2.0 +nsis.home=${base.path}/nsis-2.34 nsis.exe=${nsis.home}/makensis.exe nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll -nsis.nsisdl.dll=${nsis.home}/Plugins/nsisdl.dll -nsis.loc=${base-sf.loc}/nsis/nsis20.exe +nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll +nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe # ----- Struts, version 1.2.4 or later ----- -struts.home=${base.path}/struts-1.2.7 +struts.home=${base.path}/struts-1.2.9-bin struts.lib=${struts.home}/lib struts.jar=${struts.lib}/struts.jar -struts.loc=${base-struts.loc}/binaries/struts-1.2.7.tar.gz +struts.loc=${base-struts.loc}/binaries/struts-1.2.9-bin.tar.gz # -------------------------------------------------- @@ -225,7 +218,7 @@ # ----- Java Activation Framework (JAF), version 1.0.1 or later ----- -activation.home=${base.path}/jaf-1.0.2 +activation.home=${base.path}/jaf-1.1.1 activation.lib=${activation.home} activation.jar=${activation.lib}/activation.jar @@ -237,17 +230,17 @@ jsse.jar=${jsse.lib}/jsse.jar # ----- Java Transaction API (JTA), version 1.0.1a or later ----- -jta.home=${base.path}/jta-1_0_1b +jta.home=${base.path}/jta-1_1 jta.lib=${jta.home} jta.jar=${jta.lib}/jta.jar # ----- Java Mail, version 1.2 or later ----- -mail.home=${base.path}/javamail-1.3.3_01 +mail.home=${base.path}/javamail-1.4.1 mail.lib=${mail.home} mail.jar=${mail.lib}/mail.jar # ----- PureTLS Extension, version 0.9 or later ----- -puretls.home=${base.path}/puretls-0.9b4 +puretls.home=${base.path}/puretls-0.9b5 puretls.lib=${puretls.home}/build puretls.jar=${puretls.lib}/puretls.jar Modified: tomcat/build/tc5.5.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/build/tc5.5.x/build.xml (original) +++ tomcat/build/tc5.5.x/build.xml Fri Jan 18 11:00:00 2008 @@ -1898,11 +1898,6 @@ description="Download binary packages" > <mkdir dir="${base.path}" /> - <!-- commons-digester needs ../LICENSE --> - <!-- That is ugly XXX needs a review --> - <copy file="LICENSE" tofile="../LICENSE"/> - <copy file="LICENSE" tofile="${base.path}/LICENSE"/> - <!-- Downdown any sub package or tools needed. --> <antcall target="downloadgz"> <param name="sourcefile" value="${commons-beanutils.loc}"/> @@ -1930,11 +1925,6 @@ </antcall> <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-digester.loc}"/> - <param name="destfile" value="${commons-digester.jar}"/> - </antcall> - - <antcall target="downloadgz"> <param name="sourcefile" value="${commons-fileupload.loc}"/> <param name="destfile" value="${commons-fileupload.jar}"/> </antcall> @@ -1959,24 +1949,6 @@ <antcall target="downloadgz"> <param name="sourcefile" value="${commons-launcher.loc}"/> <param name="destfile" value="${commons-launcher.jar}"/> - </antcall> - - <!-- - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-pool.loc}"/> - <param name="destfile" value="${commons-pool.jar}"/> - </antcall> - - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-dbcp.loc}"/> - <param name="destfile" value="${commons-dbcp.jar}"/> - <param name="destdir" value="${base.path}"/> - </antcall> - --> - - <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-httpclient.loc}"/> - <param name="destfile" value="${commons-httpclient.jar}"/> </antcall> <antcall target="downloadfile"> Modified: tomcat/build/tc5.5.x/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/tomcat.nsi?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/build/tc5.5.x/tomcat.nsi (original) +++ tomcat/build/tc5.5.x/tomcat.nsi Fri Jan 18 11:00:00 2008 @@ -146,7 +146,7 @@ File /nonfatal /r temp SetOutPath $INSTDIR\bin File bin\bootstrap.jar - File bin\commons-logging-api.jar + File bin\commons-logging-api-1.1.1.jar File bin\tomcat-juli.jar File bin\*.exe SetOutPath $INSTDIR\conf Modified: tomcat/connectors/trunk/.classpath URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/.classpath?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/connectors/trunk/.classpath (original) +++ tomcat/connectors/trunk/.classpath Fri Jan 18 11:00:00 2008 @@ -17,7 +17,7 @@ --> <classpath> <classpathentry excluding="org/apache/coyote/tomcat3/|org/apache/coyote/tomcat4/" kind="src" path="coyote/src/java"/> - <classpathentry excluding="org/apache/ajp/tomcat33/|org/apache/ajp/tomcat4/" kind="src" path="jk/java"/> + <classpathentry excluding="org/apache/ajp/tomcat33/|org/apache/ajp/tomcat4/|org/apache/jk/config/" kind="src" path="jk/java"/> <classpathentry kind="src" path="http11/src/java"/> <classpathentry kind="src" path="jni/examples"/> <classpathentry kind="src" path="jni/java"/> @@ -25,10 +25,8 @@ <classpathentry excluding="org/apache/tomcat/util/net/puretls/" kind="src" path="util/java"/> <classpathentry kind="src" path="util/loader"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging-api.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/mx4j-3.0.1/lib/mx4j.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-modeler-1.1/commons-modeler.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-collections-3.1/commons-collections-3.1.jar"/> <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-modeler-2.0.1/commons-modeler-2.0.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: tomcat/container/tc5.5.x/.classpath URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/.classpath?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/container/tc5.5.x/.classpath (original) +++ tomcat/container/tc5.5.x/.classpath Fri Jan 18 11:00:00 2008 @@ -27,21 +27,15 @@ <classpathentry kind="src" path="webapps/manager/WEB-INF/classes"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging-api.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/mx4j-3.0.1/lib/mx4j.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-launcher-0.9/bin/commons-launcher.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/antlr.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/commons-beanutils.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/commons-digester.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/commons-fileupload.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/commons-logging.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/commons-validator.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/jakarta-oro.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.7/lib/struts.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/connectors"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/struts-1.2.9-bin/lib/struts.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/servlet-api-2.4/lib/servlet-api.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-modeler-2.0.1/commons-modeler-2.0.1.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/jsp-api-2.0/lib/jsp-api.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-modeler-2.0/commons-modeler-2.0.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-fileupload-1.2/lib/commons-fileupload-1.2.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-launcher/bin/commons-launcher.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-beanutils-1.7.0/commons-beanutils.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: tomcat/container/tc5.5.x/catalina/etc/bootstrap.MF URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/etc/bootstrap.MF?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/etc/bootstrap.MF (original) +++ tomcat/container/tc5.5.x/catalina/etc/bootstrap.MF Fri Jan 18 11:00:00 2008 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap -Class-Path: jmx.jar commons-daemon.jar commons-logging-api.jar tomcat-juli.jar +Class-Path: jmx.jar commons-daemon.jar commons-logging-api-1.1.1.jar tomcat-juli.jar Specification-Title: Catalina Specification-Version: 1.0 Modified: tomcat/container/tc5.5.x/webapps/admin/build.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/build.xml?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/build.xml (original) +++ tomcat/container/tc5.5.x/webapps/admin/build.xml Fri Jan 18 11:00:00 2008 @@ -177,6 +177,11 @@ <target name="copy-struts.jar" if="struts.present"> <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${struts-core.jar}"/> <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${struts-taglib.jar}" /> + <copy todir="${webapps.build}/${webapp.name}/WEB-INF"> + <fileset dir="${struts.lib}"> + <include name="*.tld" /> + </fileset> + </copy> </target> Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Jan 18 11:00:00 2008 @@ -37,6 +37,51 @@ <update> Use Eclipse JDT 3.3.1. (pero) </update> + <update> + Use new commons download location. (markt) + </update> + <update> + Use commons-launcher 1.1. (markt) + </update> + <update> + Use commons-digester 1.8. (markt) + </update> + <update> + Use Xerces 2.9.1. (markt) + </update> + <update> + Remove usused commons-httpclient. (funkman) + </update> + <update> + Use commons-collections 3.2. (markt) + </update> + <update> + Use commons-fileupload 1.2. (markt) + </update> + <update> + Use MX4J 3.0.2. (markt) + </update> + <update> + Use JUnit 3.8.2. (markt) + </update> + <update> + Use NSIS 2.34. (markt) + </update> + <update> + Use Struts 1.2.9. (markt) + </update> + <update> + Use JAF 1.1.1. (markt) + </update> + <update> + Use JTA 1.1. (markt) + </update> + <update> + Use JavaMail 1.4.1. (markt) + </update> + <update> + Use PureTLS 0.9b5. (markt) + </update> <fix> <bug>43594</bug>: Use setenv from CATALINA_BASE (if set) in preference to the one in CATALINA_HOME. Patch provided by Shaddy Baddah. (markt) Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jan 18 11:00:00 2008 @@ -25,12 +25,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* JDT location return 404 - http://people.apache.org/~fhanik/patches/jdt-loc.patch - Backport from Tomcat 6 - +1: pero, markt, rjung - -1: - * Fix NPE situation http://people.apache.org/~pero/patches/tc55/2007-11-16-AccessLogValve-tc55.patch +1: pero, markt, rjung @@ -48,17 +42,6 @@ 0: fhanik, this needs to be reworked completely, so I'm neutral martk - change "FarmWarDeployer can only work as parent from " to "FarmWarDeployer can only work if parent of " - -* Remove unused dependency on HttpClient - http://people.apache.org/~funkman/tc5.5-build.properties.patch - +1: funkman, pero, markt - -1: - -* Update to latest versions of all libraries (assumes HttpClient patch) - Update Eclipse classpaths to new versions - http://people.apache.org/~markt/patches/2008-01-15-tc5-lib-updates.patch - +1: markt, pero, fhanik - -1: * Backport from Tc6 trunk: Set correct sessionCounter at StandardManager after reload sessions http://svn.apache.org/viewvc?view=rev&revision=612455 Modified: tomcat/jasper/tc5.5.x/.classpath URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/.classpath?rev=613225&r1=613224&r2=613225&view=diff ============================================================================== --- tomcat/jasper/tc5.5.x/.classpath (original) +++ tomcat/jasper/tc5.5.x/.classpath Fri Jan 18 11:00:00 2008 @@ -18,11 +18,11 @@ <classpath> <classpathentry kind="src" path="src/share"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging-api.jar"/> <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-el-1.0/commons-el.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/jsp-api-2.0/lib/jsp-api.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/servlet-api-2.4/lib/servlet-api.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-el-1.0/commons-el.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/commons-logging-1.1.1/commons-logging-1.1.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]