Update to Commons Daemon 1.0.2 and use procrun from upsream distribution. Axe our...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@916700 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index 5ccafa4..b3bf2e1 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -35,7 +35,7 @@ version.suffix=-dev
 # Please note this path must be absolute, not relative,
 # as it is referenced with different working directory
 # contexts by the various build scripts.
-base.path=/usr/share/java
+base.path=/home/mturk/Workplace/tomcat/repository
 #base.path=C:/path/to/the/repository
 #base.path=/usr/local
 
@@ -103,11 +103,15 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
 
 # ----- Commons Daemon, version 1.0-Alpha or later -----
-commons-daemon.home=${base.path}/commons-daemon-1.0.1
+commons-daemon.version=1.0.2
+commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
 commons-daemon.lib=${commons-daemon.home}
-commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-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-daemon.jar=${commons-daemon.lib}/commons-daemon-${commons-daemon.version}.jar
+commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
 
 # ----- JUnit Unit Test Suite, version 3.7 or later -----
 junit.home=${base.path}/junit3.8.2

diff --git a/build.xml b/build.xml
index 6ab175f..101a4ca 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -624,9 +624,10 @@
 
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
             file="${tomcat-native.tar.gz}" />
+    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+            file="${commons-daemon.native.src.tgz}" />
 
-    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
+    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
 
     <!-- Copy scripts -->
     <copy todir="${tomcat.build}/bin">
@@ -1128,15 +1129,15 @@
 
     <!-- Windows binaries -->
     <!-- 32 bit -->
-    <copy file="res/procrun/tomcat${version.major}.exe"
+    <copy file="${commons-daemon.home}/windows/prunsrv.exe"
         tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
-    <copy file="res/procrun/tomcat${version.major}w.exe"
+    <copy file="${commons-daemon.home}/windows/prunmgr.exe"
         tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
     <!-- 64 bit amd -->
-    <copy file="res/procrun/amd64/tomcat${version.major}.exe"
+    <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe"
         tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
     <!-- 64 bit ia -->
-    <copy file="res/procrun/ia64/tomcat${version.major}.exe"
+    <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"
@@ -1643,11 +1644,18 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
+    <!-- Download src and build Commons Daemon -->
     <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-daemon.loc}"/>
+      <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
       <param name="destfile" value="${commons-daemon.jar}"/>
     </antcall>
 
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
+      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
+      <param name="destdir" value="${commons-daemon.home}"/>
+    </antcall>
+
     <!-- Download src and build Tomcat DBCP bundle -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-pool-src.loc}"/>
@@ -1716,6 +1724,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     </antcall>
 
     <antcall target="downloadzip">
+      <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
+      <param name="destdir" value="${commons-daemon.home}/windows"/>
+    </antcall>
+
+    <antcall target="downloadzip">
       <param name="sourcefile" value="${nsis.loc}"/>
       <param name="destfile" value="${nsis.exe}"/>
       <param name="destdir" value="${nsis.home}/.."/>

diff --git a/res/procrun/amd64/tomcat7.exe b/res/procrun/amd64/tomcat7.exe
deleted file mode 100644 (file)
index 4a9180f..0000000
Binary files a/res/procrun/amd64/tomcat7.exe and /dev/null differ

diff --git a/res/procrun/ia64/tomcat7.exe b/res/procrun/ia64/tomcat7.exe
deleted file mode 100644 (file)
index 87baf9f..0000000
Binary files a/res/procrun/ia64/tomcat7.exe and /dev/null differ

diff --git a/res/procrun/tomcat7.exe b/res/procrun/tomcat7.exe
deleted file mode 100644 (file)
index a5a85a3..0000000
Binary files a/res/procrun/tomcat7.exe and /dev/null differ

diff --git a/res/procrun/tomcat7w.exe b/res/procrun/tomcat7w.exe
deleted file mode 100644 (file)
index 7777751..0000000
Binary files a/res/procrun/tomcat7w.exe and /dev/null differ