Author: mturk Date: Wed Jul 16 23:14:31 2008 New Revision: 677507 URL: http://svn.apache.org/viewvc?rev=677507&view=rev Log: Backport r676510 from trunk.
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/res/tomcat.nsi Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677507&r1=677506&r2=677507&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jul 16 23:14:31 2008 @@ -69,12 +69,6 @@ +1: markt, remm, fhanik -1: -* Backport r676510 from trunk. The patch embeds tcnative-1.dll inside - exe installer and uses the released binary from ASF site instead - downloading tomcat-native at install time from tomcat.heanet.ie. - +1: mturk, remm, fhanik - -1: - * Fix comet behavior Invoke READ when there is a body and make sure END is called if CometEvent.close is called during an invokation http://svn.apache.org/viewvc?rev=677473&view=rev Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=677507&r1=677506&r2=677507&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Wed Jul 16 23:14:31 2008 @@ -62,9 +62,11 @@ 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-1.1.12 +tomcat-native.version=1.1.14 +tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version} tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz -tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.12-src.tar.gz +tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-${tomcat-native.version}-src.tar.gz +tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries # ----- Commons DBCP, version 1.1 or later ----- commons-dbcp.version=1.2.2 Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=677507&r1=677506&r2=677507&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Wed Jul 16 23:14:31 2008 @@ -667,6 +667,18 @@ <param name="destdir" value="${tomcat-native.home}"/> </antcall> + <antcall target="downloadfile"> + <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/> + <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/> + <param name="destdir" value="${tomcat-native.home}"/> + </antcall> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/> + <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/> + <param name="destdir" value="${tomcat-native.home}"/> + </antcall> + <antcall target="downloadgz"> <param name="sourcefile" value="${commons-daemon.loc}"/> <param name="destfile" value="${commons-daemon.jar}"/> Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=677507&r1=677506&r2=677507&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Wed Jul 16 23:14:31 2008 @@ -449,6 +449,8 @@ tofile="${tomcat.dist}/bin/tomcat6.exe" /> <copy file="res/procrun/tomcat6w.exe" tofile="${tomcat.dist}/bin/tomcat6w.exe" /> + <copy file="${tomcat-native.home}/tcnative-1.dll.x86" + tofile="${tomcat.dist}/bin/tcnative-1.dll" /> <filter token="VERSION" value="${version}"/> <filter token="VERSION_NUMBER" value="${version.number}"/> @@ -470,6 +472,7 @@ forceOverwrite="yes" fileext=".md5" /> <echo file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" message="${md5sum.binary-prefix}${final.name}.exe${line.separator}" append="true" /> + <delete file="${tomcat.dist}/bin/tcnative-1.dll"/> </target> Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=677507&r1=677506&r2=677507&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jul 16 23:14:31 2008 @@ -95,7 +95,7 @@ LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container." LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core." LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP." - LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs APR based Tomcat native .dll for better performance and scalability in production environments." + LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat native .dll for better performance and scalability in production environments." ; LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat source code." LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat." LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors." @@ -211,16 +211,8 @@ SectionIn 3 - ; tcnative-1.dll is a symlink to the tcnative-1-ipv4.dll - ; If IPV6 support is required, download the tcnative-1-ipv6.dll insted - ; The tcnative-1.dll from heanet.ie comes with APR 1.2.8 and OpenSSL 0.9.8e compiled in. - ; TODO: Depending on the JVM download the 32 or 64 bit version. - NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll - Pop $0 - StrCmp $0 success success - SetDetailsView show - DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.10/binaries/win32/tcnative-1.dll: $0" - success: + SetOutPath $INSTDIR\bin + File bin\tcnative-1.dll ClearErrors --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]