tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1345556 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default build.xml dist.xml webapps/docs/changelog.xml
Date Sat, 02 Jun 2012 19:02:58 GMT
Author: kkolinko
Date: Sat Jun  2 19:02:56 2012
New Revision: 1345556

URL: http://svn.apache.org/viewvc?rev=1345556&view=rev
Log:
Update Apache Commons Daemon to 1.0.10.
Update the native component of the Tomcat APR/native connector to
1.1.23 and take advantage of the simplified distribution.
It is backport of the following revs of Tomcat 7: r1300557 r1301269 r1305197

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.properties.default
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/dist.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1345556&r1=1345555&r2=1345556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun  2 19:02:56 2012
@@ -139,15 +139,6 @@ PATCHES PROPOSED TO BACKPORT:
   Add WebSocket support to Tomcat 6
   +1: fhanik
 
-* Update Apache Commons Daemon to 1.0.10.
-  Update the native component of the Tomcat APR/native connector to
-  1.1.23 and take advantage of the simplified distribution.
-  It is backport of the following revs of 7.0.x:
-  r1300557 r1301269 r1305197
-  http://people.apache.org/~kkolinko/patches/2012-03-26_tc6_update_deps.patch
-  +1: kkolinko, rjung, markt
-  -1:
-
 * Backport UserDataHelper class (issue 52184)
   Provide greater control over the logging of errors triggered by invalid
   input data (i.e. data over which Tomcat has no control).

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1345556&r1=1345555&r2=1345556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sat Jun  2 19:02:56 2012
@@ -117,16 +117,13 @@ jdt.loc.1=http://archive.eclipse.org/ecl
 jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
 
 # ----- Tomcat native library -----
-tomcat-native.version=1.1.22
+tomcat-native.version=1.1.23
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.dll.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries
-tomcat-native.dll.win32=${tomcat-native.home}/tcnative-1.dll.x86
-tomcat-native.dll.x64=${tomcat-native.home}/tcnative-1.dll.x64
-tomcat-native.dll.i64=${tomcat-native.home}/tcnative-1.dll.i64
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
 # ----- Commons DBCP, version 1.1 or later -----
 commons-dbcp.version=1.3
@@ -149,7 +146,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
 nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
 
 # ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.version=1.0.9
+commons-daemon.version=1.0.10
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
 commons-daemon.native.win.home=${commons-daemon.home}/windows

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1345556&r1=1345555&r2=1345556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sat Jun  2 19:02:56 2012
@@ -784,24 +784,10 @@
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
-      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.dll.win32}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
-      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.dll.x64}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile-2">
-      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
-      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.dll.i64}"/>
+    <antcall target="downloadzip-2">
+      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
+      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1345556&r1=1345555&r2=1345556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sat Jun  2 19:02:56 2012
@@ -209,14 +209,12 @@
     <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
         tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
     <!-- tc native -->
-    <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
-        tofile="${tomcat.dist}/bin/tcnative-1.dll" />
-    <!-- tc native 64 bit for amd/emt -->
-    <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
-        tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" />
-    <!-- tc native 64 bit for ia -->
-    <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
-        tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
+    <copy todir="${tomcat.dist}/bin">
+      <fileset dir="${tomcat-native.home}/bin">
+        <include name="*.dll"/>
+        <include name="**/*.dll"/>
+      </fileset>
+    </copy>
 
     <!-- Correct permissions and line endings on "bin" scripts -->
     <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh"  eol="lf"   encoding="ISO-8859-1"
fixlast="false" />

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=1345556&r1=1345555&r2=1345556&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Jun  2 19:02:56 2012
@@ -221,10 +221,10 @@
         wagon-ssh. (jfclere)
       </fix>
       <fix>
-        Update Apache Commons Daemon to 1.0.9 to resolve <bug>52548</bug>
+        Update Apache Commons Daemon to 1.0.10. It resolves <bug>52548</bug>
         which meant that services created with service.bat did not set the
         <code>catalina.home</code> and <code>catalina.base</code>
system
-        properties. (markt)
+        properties. (markt, kkolinko)
       </fix>
       <update>
         Update Apache Commons Pool to 1.5.7. (kkolinko)
@@ -232,6 +232,10 @@
       <update>
         <bug>52805</bug>: Update to Eclipse JDT Compiler 3.7.2. (kkolinko)
       </update>
+      <update>
+        Update the native component of the APR/native connectors to 1.1.23
+        and take advantage of the simplified distribution. (kkolinko) 
+      </update>
       <fix>
         When building a Windows installer do not copy whole "res" folder to
         output/dist, but only the files that we need. Apply fixcrlf filter



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


Mime
View raw message