tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r612606 - in /tomcat/tc6.0.x/trunk: .classpath RELEASE-NOTES STATUS.txt build.properties.default extras.xml webapps/docs/changelog.xml
Date Wed, 16 Jan 2008 22:51:30 GMT
Author: markt
Date: Wed Jan 16 14:51:12 2008
New Revision: 612606

URL: http://svn.apache.org/viewvc?rev=612606&view=rev
Log:
Update commons-logging to 1.1.1 and NSIS to 2.34

Modified:
    tomcat/tc6.0.x/trunk/.classpath
    tomcat/tc6.0.x/trunk/RELEASE-NOTES
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.properties.default
    tomcat/tc6.0.x/trunk/extras.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/.classpath
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/.classpath?rev=612606&r1=612605&r2=612606&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/.classpath (original)
+++ tomcat/tc6.0.x/trunk/.classpath Wed Jan 16 14:51:12 2008
@@ -17,9 +17,11 @@
 -->
 <classpath>
 	<classpathentry excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/" kind="src"
path="java"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar"/>
-	<classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar"/>
+	<classpathentry kind="var" path="TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
 	<classpathentry kind="output" path=".settings/output"/>
 </classpath>

Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?rev=612606&r1=612605&r2=612606&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Wed Jan 16 14:51:12 2008
@@ -85,11 +85,10 @@
 * catalina-ant.jar (Tomcat Catalina Ant tasks)
 * catalina-ha.jar (High availability package)
 * catalina-tribes.jar (Group communication)
-* commons-logging-api.jar (Commons Logging API 1.0.x)
 * el-api.jar (EL 2.1 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
-* jasper-jdt.jar (Eclipse JDT 3.2 Java compiler)
+* jasper-jdt.jar (Eclipse JDT 3.3 Java compiler)
 * jsp-api.jar (JSP 2.1 API)
 * servlet-api.jar (Servlet 2.5 API)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612606&r1=612605&r2=612606&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:51:12 2008
@@ -36,21 +36,6 @@
   +1: markt, fhanik
   -1: 
 
-  Update libs. commons-logging-1.1.1, nsis 2.34
-  http://svn.apache.org/viewvc?rev=611635&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
-  Update the Eclipse classpath (needs libs update above)
-  http://svn.apache.org/viewvc?rev=611637&view=rev
-  +1: markt, pero, fhanik
-  -1:
-
-  Update release notes with available libraries
-  http://svn.apache.org/viewvc?rev=611940&view=rev
-  +1: markt, pero, fhanik
-  -1: 
-
   Add global flag to turn off reverse DNS lookups, performance improvement for tribes
   http://svn.apache.org/viewvc?view=rev&revision=612192
   +1: fhanik

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=612606&r1=612605&r2=612606&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Jan 16 14:51:12 2008
@@ -47,7 +47,8 @@
 base-tomcat.loc=http://archive.apache.org/dist/tomcat
 
 # ----- Commons Logging, version 1.1 or later -----
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz
+commons-logging-version=1.1.1
+commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
 
 # ----- Webservices -----
 jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -81,12 +82,12 @@
 commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
 
 # ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.22
+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/nsis-2.22-setup.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
 
 # ----- Commons Daemon, version 1.0-Alpha or later -----
 commons-daemon.home=${base.path}/commons-daemon-1.0.1

Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=612606&r1=612605&r2=612606&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Jan 16 14:51:12 2008
@@ -102,36 +102,36 @@
     <untar src="${tomcat.extras}/logging/commons-logging-src.tar" 
     	dest="${tomcat.extras}/logging/"/>
   	
-    <replace dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/commons"
>
+    <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
>
       <replacefilter token="org.apache.commons"
             value="org.apache.juli" />
     </replace>
-    <mkdir dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/juli"
/>
-    <move todir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/juli">
-      <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/src/java/org/apache/commons"
/>
+    <mkdir dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/juli"
/>
+    <move todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/juli">
+      <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
/>
     </move>
 
-    <replace dir="${tomcat.extras}/logging/commons-logging-1.1-src" >
+    <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
>
       <replacefilter token="org.apache.commons"
             value="org.apache.juli" />
         <replacefilter token="org/apache/commons/"
               value="org/apache/juli/" />
     </replace>
-    <copy tofile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml" 
-    	file="${tomcat.extras}/logging/commons-logging-1.1-src/build.xml" />
+    <copy tofile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"

+    	file="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build.xml"
/>
 
-  	<ant antfile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml"
-  	     dir="${tomcat.extras}/logging/commons-logging-1.1-src" 
+  	<ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+  	     dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src" 
   	     target="getlibs" />
-    <copy todir="${tomcat.extras}/logging/commons-logging-1.1-src">
-      <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/lib" />
+    <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src">
+      <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/lib"
/>
     </copy>
-  	<ant antfile="${tomcat.extras}/logging/commons-logging-1.1-src/build2.xml"
-  	     dir="${tomcat.extras}/logging/commons-logging-1.1-src"
+  	<ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+  	     dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
   	     target="compile" />
   
     <jar jarfile="${tomcat-juli.jar}">
-      <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/target/classes">
+      <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
         <include name="org/apache/juli/logging/*.class" /> 
         <include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" /> 
         <include name="org/apache/juli/logging/impl/WeakHashtable*.class" /> 
@@ -155,7 +155,7 @@
               forceOverwrite="yes" fileext=".md5" />
 
     <jar jarfile="${tomcat-juli-adapters.jar}">
-      <fileset dir="${tomcat.extras}/logging/commons-logging-1.1-src/target/classes">
+      <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/target/classes">
         <include name="org/apache/juli/logging/impl/**.class" /> 
         <exclude name="org/apache/juli/logging/impl/WeakHashtable*.class" /> 
         <exclude name="org/apache/juli/logging/impl/LogFactoryImpl.class" /> 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612606&r1=612605&r2=612606&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 16 14:51:12 2008
@@ -36,6 +36,10 @@
   <subsection name="General">
     <changelog>
       <update>
+        Update commons-logging to version 1.1.1 and the NSIS installer to 2.34.
+        (markt)
+      </update>
+      <update>
         Change chunked input parsing, always parse CRLF directly after a chunk has been
         received, except if data is not available. If data is not available for CRLF
         parsing, we run into BZ 11117, and must defer the parsing of CRLF to the next read
event.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message