Author: rjung
Date: Wed Jan 6 17:38:33 2010
New Revision: 896565
URL: http://svn.apache.org/viewvc?rev=896565&view=rev
Log:
No functional change.
Sync 6.0 ant files a bit better with trunk to make
backports easier and more robust:
- detab
- remove trailing whitespace
- line breaks
- attribute order
- "toDir" -> "todir" once
Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896565&r1=896564&r2=896565&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 6 17:38:33 2010
@@ -51,13 +51,13 @@
<property name="final-src.name" value="${project}-${version}-src" />
<!-- Build Defaults -->
- <property name="tomcat.home" value="${basedir}"/>
- <property name="tomcat.build" value="${basedir}/output/build"/>
- <property name="tomcat.classes" value="${basedir}/output/classes"/>
- <property name="tomcat.dist" value="${basedir}/output/dist"/>
- <property name="tomcat.tmp" value="${basedir}/output/tmp"/>
- <property name="test.failonerror" value="true"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
+ <property name="tomcat.home" value="${basedir}"/>
+ <property name="tomcat.build" value="${basedir}/output/build"/>
+ <property name="tomcat.classes" value="${basedir}/output/classes"/>
+ <property name="tomcat.dist" value="${basedir}/output/dist"/>
+ <property name="tomcat.tmp" value="${basedir}/output/tmp"/>
+ <property name="test.failonerror" value="true"/>
+ <property name="test.runner" value="junit.textui.TestRunner"/>
<!-- Can't be lower - jsp uses templates -->
<property name="compile.source" value="1.5"/>
@@ -115,7 +115,7 @@
<target name="build-prepare">
<available classname="junit.framework.TestCase" property="junit.present" />
-
+
<mkdir dir="${tomcat.classes}"/>
<delete dir="${tomcat.build}/temp" />
@@ -142,7 +142,9 @@
optimize="${compile.optimize}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1">
-<!-- Comment this in to show unchecked warnings: <compilerarg
value="-Xlint:unchecked"/> -->
+<!-- Comment this in to show unchecked warnings:
+ <compilerarg value="-Xlint:unchecked"/>
+ -->
<classpath refid="tomcat.classpath" />
<exclude name="org/apache/naming/factory/webservices/**" />
</javac>
@@ -182,7 +184,7 @@
<include name="javax/servlet/http/*" />
<include name="javax/servlet/resources/*" />
</patternset>
-
+
<patternset id="files.jsp-api">
<include name="javax/servlet/jsp/**" />
</patternset>
@@ -217,7 +219,7 @@
<exclude name="org/apache/catalina/ant/**" />
<exclude name="org/apache/catalina/cluster/**" />
<exclude name="org/apache/catalina/ha/**" />
- <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
+ <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
<exclude name="org/apache/catalina/tribes/**" />
<exclude name="org/apache/catalina/launcher/**" />
<exclude name="org/apache/catalina/storeconfig/**" />
@@ -249,7 +251,7 @@
<include name="org/apache/*" />
<include name="org/apache/jasper/**" />
</patternset>
-
+
<patternset id="files.jasper-el">
<include name="org/apache/el/**" />
</patternset>
@@ -276,14 +278,14 @@
</macrodef>
<target name="build-manifests" >
- <!-- Filtering tokens for JAR manifests-->
+ <!-- Filtering tokens for JAR manifests-->
<filter token="source.jdk" value="${compile.source}"/>
<filter token="target.jdk" value="${compile.target}"/>
<filter token="servlet.revision" value="${servlet.revision}"/>
<filter token="jsp.revision" value="${jsp.revision}"/>
<mkdir dir="${tomcat.tmp}" />
- <copy toDir="${tomcat.tmp}" overwrite="yes" filtering="yes"
+ <copy todir="${tomcat.tmp}" overwrite="yes" filtering="yes"
encoding="ISO-8859-1">
<filterset refid="version.filters"/>
<fileset dir="res/META-INF" includes="*.manifest" />
@@ -486,13 +488,13 @@
<param name="relative-path" expression=".."/>
</xslt>
</target>
-
+
<target name="warn.dbcp" unless="tomcat-dbcp.present">
<echo>WARNING: tomcat-dbcp.jar not included, this build can't be used
in a release. Please run 'ant download' with JDK1.5 if you are
building a tomcat release.</echo>
</target>
-
+
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
@@ -507,7 +509,7 @@
<exclude name="**/*.launch"/>
</fileset>
</copy>
- <!-- Copy doesn't retain permissions -->
+ <!-- Copy doesn't retain permissions -->
<chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
<!-- Copy static resource files -->
@@ -634,14 +636,14 @@
</fileset>
</txt2html>
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
failonerror="false"/>
<copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
</target>
<target name="clean-depend"
- description="Clean depend src components">
+ description="Clean depend src components">
<delete dir="${tomcat-dbcp.home}"/>
<delete dir="${jasper-jdt.home}"/>
</target>
@@ -698,7 +700,7 @@
<target name="download"
description="Download (and build as necessary) dependent components"
- depends="build-manifests">
+ depends="build-manifests">
<antcall target="downloadfile">
<param name="sourcefile" value="${tomcat-native.loc}"/>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=896565&r1=896564&r2=896565&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 6 17:38:33 2010
@@ -89,7 +89,7 @@
<!-- Files that need to have their line endings changed for src distros -->
<patternset id="src.files" >
<include name="**/INSTALLLICENSE"/>
- <include name="**/KEYS"/>
+ <include name="**/KEYS"/>
<include name="**/LICENSE"/>
<include name="**/NOTICE"/>
<include name="**/RELEASE-NOTES"/>
@@ -131,7 +131,7 @@
<delete dir="${tomcat.deployer}"/>
<delete dir="${tomcat.dist}" failonerror="false"/>
- <!-- This is why releasing must be done on a Windows box:
+ <!-- This is why releasing must be done on a Windows box:
otherwise this check fails and the .exe distro is not generated -->
<condition property="execute.installer">
<and>
@@ -156,8 +156,8 @@
<mkdir dir="${tomcat.dist}/temp"/>
<mkdir dir="${tomcat.dist}/webapps"/>
<mkdir dir="${tomcat.dist}/work"/>
- <mkdir dir="${tomcat.release}/v${version}/bin" />
- <mkdir dir="${tomcat.release}/v${version}/src" />
+ <mkdir dir="${tomcat.release}/v${version}/bin" />
+ <mkdir dir="${tomcat.release}/v${version}/src" />
</target>
@@ -189,7 +189,7 @@
</fileset>
</copy>
- <copy todir="${tomcat.dist}/webapps">
+ <copy todir="${tomcat.dist}/webapps">
<fileset dir="${tomcat.build}/webapps">
<exclude name="**/ROOT/WEB-INF/classes/**" />
<exclude name="**/WEB-INF/src/**" />
@@ -199,8 +199,8 @@
<touch file="${tomcat.dist}/temp/safeToDelete.tmp" />
<!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
fixlast="false" encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
encoding="ISO-8859-1" fixlast="false" />
<chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
</target>
@@ -213,7 +213,7 @@
author="true" version="true"
windowtitle="Tomcat API Documentation"
doctitle="Tomcat API"
- bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
additionalparam="-breakiterator"
maxmemory="256m" >
</javadoc>
@@ -282,7 +282,6 @@
</target>
-
<!-- ================= DIST: Create Windows Installer =================== -->
<target name="installer"
description="Create Windows installer" unless="skip.installer">
@@ -293,24 +292,24 @@
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
- <!-- 32 bit -->
+ <!-- 32 bit -->
<copy file="res/procrun/tomcat${version.major}.exe"
tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
<copy file="res/procrun/tomcat${version.major}w.exe"
tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
- <!-- 64 bit amd -->
+ <!-- 64 bit amd -->
<copy file="res/procrun/amd64/tomcat${version.major}.exe"
tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
- <!-- 64 bit ia -->
+ <!-- 64 bit ia -->
<copy file="res/procrun/ia64/tomcat${version.major}.exe"
tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
- <!-- tc native -->
+ <!-- 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 -->
+ <!-- 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 -->
+ <!-- tc native 64 bit for ia -->
<copy file="${tomcat-native.home}/tcnative-1.dll.i64"
tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
@@ -334,7 +333,7 @@
<arg value="tomcat.nsi" />
</exec>
- <!-- Restore original line ending-->
+ <!-- Restore original line ending-->
<fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
includes="RELEASE-NOTES.txt" encoding="ISO-8859-1" fixlast="false" />
@@ -355,7 +354,7 @@
todir="${tomcat.release}/v${version}"/>
<copy file="RELEASE-NOTES"
todir="${tomcat.release}/v${version}"
- filtering="true"
+ filtering="true"
encoding="ISO-8859-1" />
<copy file="res/welcome.main.html"
tofile="${tomcat.release}/v${version}/README.html"
@@ -372,7 +371,7 @@
<include name="*.*"/>
</fileset>
</copy>
-
+
</target>
<!-- Packages the core zip distro -->
@@ -426,9 +425,8 @@
<exclude name="bin/x64/"/>
<exclude name="bin/i64/"/>
</zipfileset>
-
- </zip>
+ </zip>
<antcall target="md5sum">
<param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip" />
</antcall>
@@ -451,7 +449,7 @@
<include name="BENCHMARKS.txt"/>
<exclude name="bin/x64/"/>
<exclude name="bin/i64/"/>
- <exclude name="bin/*.dll"/>
+ <exclude name="bin/*.dll"/>
<exclude name="bin/tomcat${version.major}.exe"/>
</zipfileset>
<zipfileset dir="${tomcat.dist}/bin/x64" prefix="${final.name}/bin">
@@ -459,7 +457,6 @@
<include name="*.exe"/>
</zipfileset>
</zip>
-
<antcall target="md5sum">
<param name="file"
value="${tomcat.release}/v${version}/bin/${final.name}-windows-x64.zip" />
</antcall>
@@ -514,8 +511,8 @@
<!-- Packages the core tar.gz distro -->
<target name="package-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
- <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" fixlast="false"
encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" encoding="ISO-8859-1"
fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
<tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}">
@@ -552,6 +549,7 @@
<exclude name="bin/digest.sh" />
<exclude name="bin/jasper.sh" />
<exclude name="bin/jspc.sh" />
+ <exclude name="bin/service.bat"/>
<exclude name="bin/setclasspath.sh" />
<exclude name="bin/startup.sh" />
<exclude name="bin/shutdown.sh" />
@@ -560,7 +558,6 @@
<exclude name="bin/shutdown-using-launcher.sh" />
<exclude name="bin/startup-using-launcher.sh" />
<exclude name="bin/version.sh" />
- <exclude name="bin/service.bat"/>
<exclude name="conf/**" />
<exclude name="src/**" />
<exclude name="bin/x64/"/>
@@ -578,8 +575,8 @@
<!-- Packages the deployer Tomcat distro in tar.gz format -->
<target name="package-deployer-tgz">
<fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf" fixlast="false"
encoding="ISO-8859-1" />
- <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
+ includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1"
fixlast="false" />
+ <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"
encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz">
@@ -603,7 +600,7 @@
<target name="package-docs-tgz">
<!-- Package gocs -->
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=896565&r1=896564&r2=896565&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Jan 6 17:38:33 2010
@@ -102,21 +102,21 @@
</target>
<target name="clean">
- <delete dir="${tomcat.extras}"/>
+ <delete dir="${tomcat.extras}"/>
</target>
<target name="commons-logging">
-
+
<antcall target="downloadfile">
<param name="sourcefile" value="${commons-logging-src.loc}"/>
<param name="destfile"
value="${tomcat.extras}/logging/commons-logging-src.tar.gz"/>
<param name="destdir" value="${tomcat.extras}/logging/"/>
</antcall>
- <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz"
- dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
- <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
- dest="${tomcat.extras}/logging/"/>
-
+ <gunzip src="${tomcat.extras}/logging/commons-logging-src.tar.gz"
+ dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
+ <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
+ dest="${tomcat.extras}/logging/"/>
+
<replace
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
@@ -128,34 +128,34 @@
</move>
<replace
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
- encoding="ISO-8859-1">
+ encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
- value="org.apache.juli" />
- <replacefilter token="org/apache/commons/"
- value="org/apache/juli/" />
+ value="org.apache.juli" />
+ <replacefilter token="org/apache/commons/"
+ value="org/apache/juli/" />
</replace>
- <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"
/>
+ <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-${commons-logging-version}-src/build2.xml"
-
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
- target="getlibs" />
+ <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-${commons-logging-version}-src">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/lib"
/>
</copy>
- <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" />
-
+ <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}"
manifest="${tomcat.tmp}/default.manifest" >
<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" />
- <include name="org/apache/juli/logging/impl/SimpleLog*.class" />
- <include name="org/apache/juli/logging/impl/NoOpLog*.class" />
- <include name="org/apache/juli/logging/impl/Jdk14Logger.class" />
+ <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" />
+ <include name="org/apache/juli/logging/impl/SimpleLog*.class" />
+ <include name="org/apache/juli/logging/impl/NoOpLog*.class" />
+ <include name="org/apache/juli/logging/impl/Jdk14Logger.class" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -176,11 +176,11 @@
</antcall>
<jar jarfile="${tomcat-juli-adapters.jar}"
- manifest="${tomcat.tmp}/default.manifest" >
+ manifest="${tomcat.tmp}/default.manifest" >
<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" />
+ <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" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -196,55 +196,55 @@
</target>
<target name="webservices">
-
- <mkdir dir="${tomcat.extras}/webservices"/>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-src.loc}"/>
- <param name="destfile"
value="${tomcat.extras}/webservices/jaxrpc.jar"/>
- <param name="destdir" value="${tomcat.extras}/webservices/"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-src.loc}"/>
- <param name="destfile"
value="${tomcat.extras}/webservices/wsdl4j.jar"/>
- <param name="destdir" value="${tomcat.extras}/webservices/"/>
- </antcall>
-
- <!-- Classpath -->
- <path id="tomcat.webservices.classpath">
- <pathelement path="${tomcat.classpath}"/>
- <fileset dir="${tomcat.extras}/webservices">
- <include name="jaxrpc.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </path>
-
- <!-- Compile internal server components -->
- <javac srcdir="java" destdir="${tomcat.classes}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- optimize="${compile.optimize}"
- encoding="ISO-8859-1">
- <classpath refid="tomcat.webservices.classpath" />
- <include name="org/apache/naming/factory/webservices/**" />
- </javac>
-
- <!-- Catalina Main JAR File -->
- <jar jarfile="${catalina-ws.jar}"
- manifest="${tomcat.tmp}/default.manifest">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/naming/factory/webservices/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- <zipfileset file="res/META-INF/default.notice"
- fullpath="META-INF/NOTICE" />
- <zipfileset file="res/META-INF/default.license"
- fullpath="META-INF/LICENSE" />
- </jar>
+
+ <mkdir dir="${tomcat.extras}/webservices"/>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-src.loc}"/>
+ <param name="destfile" value="${tomcat.extras}/webservices/jaxrpc.jar"/>
+ <param name="destdir" value="${tomcat.extras}/webservices/"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${wsdl4j-src.loc}"/>
+ <param name="destfile" value="${tomcat.extras}/webservices/wsdl4j.jar"/>
+ <param name="destdir" value="${tomcat.extras}/webservices/"/>
+ </antcall>
+
+ <!-- Classpath -->
+ <path id="tomcat.webservices.classpath">
+ <pathelement path="${tomcat.classpath}"/>
+ <fileset dir="${tomcat.extras}/webservices">
+ <include name="jaxrpc.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Compile internal server components -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
+ <classpath refid="tomcat.webservices.classpath" />
+ <include name="org/apache/naming/factory/webservices/**" />
+ </javac>
+
+ <!-- Catalina Main JAR File -->
+ <jar jarfile="${catalina-ws.jar}"
+ manifest="${tomcat.tmp}/default.manifest">
+ <fileset dir="${tomcat.classes}">
+ <include name="org/apache/naming/factory/webservices/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ <zipfileset file="res/META-INF/default.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="res/META-INF/default.license"
+ fullpath="META-INF/LICENSE" />
+ </jar>
<antcall target="md5sum">
<param name="file" value="${catalina-ws.jar}" />
</antcall>
@@ -262,14 +262,13 @@
<zipfileset file="res/META-INF/default.license"
fullpath="META-INF/LICENSE" />
</jar>
-
<antcall target="md5sum">
<param name="file" value="${catalina-jmx-remote.jar}" />
</antcall>
</target>
<target name="extras"
- depends="prepare,commons-logging,webservices,jmx-remote">
+ depends="prepare,commons-logging,webservices,jmx-remote">
</target>
<!-- Download and dependency building -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
