[pkg-java] r2789 - in tags/tomcat5.5: . 5.5.20-2 5.5.20-2/build
5.5.20-2/connectors/util
5.5.20-2/connectors/util/java/org/apache/tomcat/util/net/jsse
5.5.20-2/container/catalina 5.5.20-2/container/catalina/src/bin
5.5.20-2/container/catalina/src/share/org/apache/naming/factory
5.5.20-2/container/webapps/admin
Marcus Better
marcusb-guest at alioth.debian.org
Thu Nov 23 09:53:19 CET 2006
Author: marcusb-guest
Date: 2006-11-23 09:53:17 +0100 (Thu, 23 Nov 2006)
New Revision: 2789
Added:
tags/tomcat5.5/5.5.20-2/
tags/tomcat5.5/5.5.20-2/build.xml
tags/tomcat5.5/5.5.20-2/build/build.xml
tags/tomcat5.5/5.5.20-2/connectors/util/build.xml
tags/tomcat5.5/5.5.20-2/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tags/tomcat5.5/5.5.20-2/container/catalina/build.xml
tags/tomcat5.5/5.5.20-2/container/catalina/src/bin/catalina.sh
tags/tomcat5.5/5.5.20-2/container/catalina/src/share/org/apache/naming/factory/Constants.java
tags/tomcat5.5/5.5.20-2/container/webapps/admin/build.xml
tags/tomcat5.5/5.5.20-2/debian/
Removed:
tags/tomcat5.5/5.5.20-2/build.xml
tags/tomcat5.5/5.5.20-2/build/build.xml
tags/tomcat5.5/5.5.20-2/connectors/util/build.xml
tags/tomcat5.5/5.5.20-2/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tags/tomcat5.5/5.5.20-2/container/catalina/build.xml
tags/tomcat5.5/5.5.20-2/container/catalina/src/bin/catalina.sh
tags/tomcat5.5/5.5.20-2/container/catalina/src/share/org/apache/naming/factory/Constants.java
tags/tomcat5.5/5.5.20-2/container/webapps/admin/build.xml
tags/tomcat5.5/5.5.20-2/debian/
Log:
Tag release.
Copied: tags/tomcat5.5/5.5.20-2 (from rev 2742, branches/tomcat5.5/feature/debian)
Deleted: tags/tomcat5.5/5.5.20-2/build/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/build/build.xml 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/build/build.xml 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,2067 +0,0 @@
-<project name="Tomcat 5.5" default="deploy" basedir=".">
-
-
- <!-- ===================== Initialize Property Values =================== -->
-
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
- <property file="${user.home}/build.properties"/>
- <property file="build.properties"/>
-
- <property file="build.properties.default"/>
-
- <!-- Project Properties -->
- <property name="name" value="Apache Tomcat" />
- <property name="year" value="2005" />
- <property name="version.major" value="5" />
- <property name="version.minor" value="5" />
- <property name="version.build" value="0" />
- <property name="version.patch" value="0" />
- <property name="version" value="5.5.0-dev" />
- <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
-
- <property name="project" value="apache-tomcat" />
- <property name="final.name" value="${project}-${version}" />
- <property name="final-src.name" value="${project}-${version}-src" />
-
- <!-- Subprojects -->
- <property name="api.project" value="servletapi" />
- <property name="tomcat.project" value="build" />
- <property name="catalina.project" value="container" />
- <property name="jtc.project" value="connectors" />
- <property name="jasper.project" value="jasper" />
- <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
- <property name="ant-launcher.jar" value="${ant.home}/lib/ant-launcher.jar"/>
-
- <!-- Source dependencies -->
- <property name="api.home"
- value="${basedir}/../${api.project}"/>
- <property name="catalina.home"
- value="${basedir}/../${catalina.project}"/>
- <property name="jasper.home"
- value="${basedir}/../${jasper.project}"/>
- <property name="jtc.home"
- value="${basedir}/../${jtc.project}"/>
- <property name="tomcat.home"
- value="${basedir}/../${tomcat.project}"/>
-
- <!-- Build Defaults -->
- <property name="catalina.build" value="${catalina.home}/build"/>
- <property name="jasper.build" value="${jasper.home}/build"/>
- <property name="tomcat.build" value="${basedir}/build"/>
- <property name="build.home" value="${tomcat.build}"/>
-
- <property name="tomcat.dist" value="${basedir}/dist"/>
- <property name="tomcat.embed" value="${basedir}/embed"/>
- <property name="tomcat.compat" value="${basedir}/compat"/>
- <property name="tomcat.deployer" value="${basedir}/deployer"/>
- <property name="tomcat.release" value="${basedir}/release"/>
- <property name="webapps.build" value="${catalina.home}/webapps/build"/>
- <property name="webapps.dist" value="${catalina.home}/webapps/dist"/>
- <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
- <property name="tomcat-dbcp.jar"
- value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
- <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
- <property name="jasper-compiler-jdt.jar"
- value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
-
- <!-- Some compilers will disable debugging if true. And it doesn't do anything
- in most cases -->
- <property name="compile.optimize" value="false"/>
- <property name="compile.debug" value="true" />
- <property name="compile.deprecation" value="false" />
- <property name="compile.source" value="1.4" />
- <property name="tester.delay" value="8" />
-
- <!-- constant to declare a file binary for md5sum -->
- <property name="md5sum.binary-prefix" value=" *" />
-
- <!-- =================== DETECT: Display configuration ================== -->
- <target name="detect"
- description="Display configuration and conditional compilation flags">
-
- <echo message="--- ${name} ${version} Build ---"/>
- <echo message="api.home=${api.home}"/>
- <echo message="catalina.home=${catalina.home}"/>
- <echo message="jasper.home=${jasper.home}"/>
- <echo message="jtc.home=${jtc.home}"/>
-
- <ant dir="${catalina.home}" target="flags.display"/>
-
- </target>
-
-
- <!-- ===================== DEPLOY: Create Directories =================== -->
- <target name="init">
- <mkdir dir="${tomcat.build}"/>
- <mkdir dir="${tomcat.build}/classes" />
- <mkdir dir="${tomcat.build}/server/lib" />
- <mkdir dir="${tomcat.build}/common/lib" />
-
- <uptodate property="servletapi.build.notrequired"
- targetfile="${servlet-api.jar}">
- <srcfiles dir="${api.home}/jsr154/src" includes="**" />
- </uptodate>
-
- <uptodate property="jspapi.build.notrequired"
- targetfile="${jsp-api.jar}">
- <srcfiles dir="${api.home}/jsr152/src" includes="**" />
- </uptodate>
-
- <uptodate property="tomcatutil.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
- <srcfiles dir="${jtc.home}/util/java" includes="**" />
- </uptodate>
-
- <uptodate property="tomcatjk.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-ajp.jar">
- <srcfiles dir="${jtc.home}/jk/java" includes="**" />
- </uptodate>
-
- <uptodate property="tomcatjkstatus.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-jkstatus-ant.jar">
- <srcfiles dir="${jtc.home}/jk/jkstatus/src/share" includes="**" />
- </uptodate>
-
- <uptodate property="tomcatcoyote.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-coyote.jar">
- <srcfiles dir="${jtc.home}/coyote/src" includes="**" />
- </uptodate>
-
- <uptodate property="tomcathttp11.build.notrequired"
- targetfile="${tomcat.build}/server/lib/tomcat-http11.jar">
- <srcfiles dir="${jtc.home}/http11/src" includes="**" />
- </uptodate>
-
- <uptodate property="admin.build.notrequired"
- targetfile="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml">
- <srcfiles dir="${catalina.home}/webapps/admin" includes="**" />
- </uptodate>
-
- </target>
-
-
- <!-- ====================== DEPLOY: Copy Static Files =================== -->
- <target name="deploy-static" depends="init">
- <copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/>
- <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
-
- <copy file="${commons-el.jar}"
- todir="${tomcat.build}/common/lib"/>
-
- <copy todir="${tomcat.build}/bin"
- file="${commons-logging-api.jar}" />
-
- <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
-
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
- failonerror="false" />
-
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
-
- <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
- <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
- <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
- </target>
-
- <!-- ====================== Build all components =================== -->
- <target name="build-servletapi" unless="servletapi.build.notrequired" description="Build servlet API">
- <echo>========== Building: ${servlet-api.jar}</echo>
- <ant dir="${api.home}/jsr154" target="dist" >
- <property name="servlet-api.dist" value="${servlet-api.home}" />
- </ant>
- </target>
-
- <target name="build-jspapi" unless="jspapi.build.notrequired" description="Build JSP API">
- <echo>========== Building: ${jsp-api.jar}</echo>
- <ant dir="${api.home}/jsr152" target="dist">
- <property name="jsp-api.dist" value="${jsp-api.home}" />
- </ant>
- </target>
-
- <target name="build-tomcatutil" unless="tomcatutil.build.notrequired" description="Build j-t-c/util">
- <echo>========== Building: tomcat-util to ${tomcat.build} </echo>
-
- <ant dir="${jtc.home}/util" target="build-main">
- <property name="jmx.jar" value="${jmx.jar}" />
- <property name="puretls.jar" value="${puretls.jar}" />
- <property name="jsse.lib" value="${jsse.lib}" />
-
- <property name="tomcat-util.build" value="${tomcat.build}" />
- <property name="tomcat-util.lib" value="${tomcat.build}/server/lib" />
- </ant>
-
- </target>
-
- <target name="build-tomcatjk" unless="tomcatjk.build.notrequired"
- description="build j-t-c/jk" >
- <echo>========== Building: tomcat-jk ${catalina.build} </echo>
-
- <ant dir="${jtc.home}/jk" target="jkjava">
- <property name="tomcat5.home" value="${catalina.build}"/>
- <property name="tomcat5.detect" value="true"/>
- <property name="commons-logging.jar" value="${commons-logging.jar}"/>
- <property name="jmx.jar" value="${jmx.jar}"/>
- <property name="jmx.detect" value="true"/>
-
- <property name="jk.build" value="${tomcat.build}"/>
-
- <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- <!--
- <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- <property name="tomcat-jk2.jar" value="${tomcat.build}/server/lib/tomcat-ajp.jar" />
- <property name="tomcat-jk.jar" value="${tomcat.build}/server/lib/tomcat-jk.jar" />
- <property name="tomcat-jkconfig.jar" value="${tomcat.build}/server/lib/jkconfig.jar" />
- <property name="tomcat-jkshm.jar" value="${tomcat.build}/server/lib/jkshm.jar" />
- <property name="tomcat-jni.jar" value="${tomcat.build}/server/lib/tomcat-jni.jar" />
- -->
-
- </ant>
-
- <!--
- <copy file="${jtc.home}/jk/conf/jk2.properties"
- todir="${tomcat.build}/conf" />
- -->
-
- <!-- Protocol handlers - AJP -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-ajp.jar" index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/coyote/ajp/**" />
- <include name="org/apache/jk/**" />
- <exclude name="org/apache/jk/ant/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-tomcatcoyote"
- unless="tomcatcoyote.build.notrequired"
- depends="init" description="Build j-t-c/coyote">
- <echo>========== Building: tomcat-coyote </echo>
-
- <ant dir="${jtc.home}/coyote" target="compile.tomcat5">
- <property name="catalina.home" value="${tomcat.build}"/>
- <property name="build.home" value="${tomcat.build}"/>
- <property name="tomcat5.detect" value="true"/>
- <property name="tomcat-util.jar"
- value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="servlet.jar" value="${servlet-api.jar}"/>
- </ant>
-
- <!-- Coyote API -->
- <delete file="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- <jar jarfile="${tomcat.build}/server/lib/tomcat-coyote.jar" index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/coyote/*" />
- <include name="org/apache/coyote/memory/*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-tomcatjkstatus"
- unless="tomcatjkstatus.build.notrequired"
- depends="init" description="Build j-t-c/jkstatus">
- <echo>========== Building: tomcat-jkstatus-ant </echo>
-
- <ant dir="${jtc.home}/jk/jkstatus" target="dist">
- <property name="catalina.build" value="${tomcat.build}"/>
- <property name="jtc.home" value="${jtc.home}"/>
- </ant>
-
- <!-- jkstatus ant API -->
- <!--<delete file="${tomcat.build}/server/lib/tomcat-jkstatus-ant.jar" />-->
- <ant dir="${jtc.home}/jk/jkstatus" target="copy">
- <property name="catalina.build" value="${tomcat.build}"/>
- <property name="jtc.home" value="${jtc.home}"/>
- </ant>
-
- </target>
-
- <target name="build-tomcathttp11"
- unless="tomcathttp11.build.notrequired"
- depends="init" description="builds j-t-c/http11">
- <echo>========== Building: tomcat-http11 </echo>
-
- <ant dir="${jtc.home}/http11" target="compile-only">
- <property name="build.home" value="${tomcat.build}"/>
- <!--
- <property name="tomcat-http11.jar" value="${tomcat.build}/server/lib/tomcat-http11.jar"/>
- <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- -->
- <property name="commons-logging.jar" value="${commons-logging.jar}"/>
- </ant>
-
- <!-- Protocol handlers - HTTP -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-http.jar" index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/coyote/http11/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-tomcatapr"
- unless="tomcatapr.build.notrequired"
- depends="init" description="builds j-t-c/apr">
- <echo>========== Building: tomcat-apr </echo>
-
- <ant dir="${jtc.home}/jni" target="compile-only">
- <property name="build.home" value="${tomcat.build}"/>
- <!--
- <property name="tomcat-http11.jar" value="${tomcat.build}/server/lib/tomcat-http11.jar"/>
- <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- -->
- <property name="commons-logging.jar" value="${commons-logging.jar}"/>
- </ant>
-
- <!-- APR -->
- <jar jarfile="${tomcat.build}/server/lib/tomcat-apr.jar" index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/jni/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-juli"
- unless="tomcatjuli.build.notrequired"
- depends="init" description="builds j-t-c/juli">
- <echo>========== Building: tomcat-juli </echo>
-
- <ant dir="${jtc.home}/juli" target="compile-only">
- <property name="build.home" value="${tomcat.build}"/>
- </ant>
-
- <!-- Java.util.logging Implementation -->
- <jar jarfile="${tomcat.build}/bin/tomcat-juli.jar" index="true">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/juli/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <copy file="${basedir}/resources/logging.properties"
- todir="${tomcat.build}/conf" />
-
- </target>
-
- <target name="build-jasper"
- unless="jasper.build.notrequired"
- depends="init" description="build jasper">
- <echo>========== Building: jasper </echo>
-
- <ant dir="${jasper.home}" target="build-only">
- <property name="jasper.classes" value="${tomcat.build}/classes"/>
- <property name="jasper.build" value="${tomcat.build}"/>
- <property name="jasper-compiler.jar" value="${tomcat.build}/common/lib/jasper-compiler.jar"/>
- <property name="jasper-runtime.jar" value="${tomcat.build}/common/lib/jasper-runtime.jar"/>
- <property name="catalina.home" value="${tomcat.build}"/>
- <property name="commons-el.jar" location="${commons-el.jar}" />
- </ant>
- </target>
-
- <target name="build-admin" unless="admin.build.notrequired"
- depends="init" description="build admin" >
-
- <echo>========== Building: admin </echo>
- <ant dir="${catalina.home}/webapps/admin" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/server/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar" value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" />
- </target>
-
- <target name="build-webapps-precompile"
- depends="init" description="Precompile webapps" >
-
- <!-- JSPC -->
- <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
- <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
- <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-
- <mkdir dir="${admin.base}/WEB-INF/src/admin" />
- <mkdir dir="${ROOT.base}/WEB-INF/src" />
- <mkdir dir="${ROOT.base}/WEB-INF/classes" />
- <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-
- <path id="jspc.classpath">
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${tomcat.build}/server/classes"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/common/classes"/>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/common/classes"/>
- <fileset dir="${tomcat.build}/common/endorsed">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
- <classpath refid="jspc.classpath"/>
- </taskdef>
-
- <jasper2
- compile="false"
- validateXml="false"
- uriroot="${ROOT.base}"
- webXmlFragment="${ROOT.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${ROOT.base}/WEB-INF/src" />
-
- <jasper2
- compile="false"
- validateXml="false"
- uriroot="${jsp-examples.base}"
- webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${jsp-examples.base}/WEB-INF/src" />
-
- <jasper2
- package="admin"
- compile="false"
- validateXml="false"
- uriroot="${admin.base}"
- webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
- addWebXmlMappings="true"
- outputDir="${admin.base}/WEB-INF/src/admin" />
-
- <javac destdir="${ROOT.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- failonerror="false"
- srcdir="${ROOT.base}/WEB-INF/src"
- excludes="**/*.smap">
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- </classpath>
- <include name="**" />
- </javac>
-
- <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
- <copy todir="${jsp-examples.base}/WEB-INF/classes">
- <fileset dir="${jsp-examples.base}/WEB-INF/src">
- <include name="**/*.class" />
- </fileset>
- </copy>
-
- <javac destdir="${jsp-examples.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- failonerror="false"
- srcdir="${jsp-examples.base}/WEB-INF/src"
- excludes="**/*.smap">
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jsp-examples.base}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
- </classpath>
- <include name="**" />
- <exclude name="tags/**" />
- </javac>
-
- <javac destdir="${admin.base}/WEB-INF/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- failonerror="false"
- srcdir="${admin.base}/WEB-INF/src"
- excludes="**/*.smap">
- <classpath>
- <pathelement location="${java.home}/../lib/tools.jar"/>
- <fileset dir="${tomcat.build}/server/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${admin.base}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${tomcat.build}/common/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tomcat.build}/classes"/>
- </classpath>
- <include name="admin/**" />
- </javac>
- </target>
-
- <target name="build-catalina" depends="init"
- description="Builds catalina">
- <echo>========== Building: catalina in ${tomcat.build}</echo>
-
- <ant dir="${catalina.home}/catalina" target="build-static">
- <property name="catalina.build" value="${tomcat.build}" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar"
- value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <ant dir="${catalina.home}/catalina" target="catalina-jars">
- <!-- in-place building -->
- <property name="tomcat-coyote.jar" value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
- <property name="catalina.build" value="${tomcat.build}" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar"
- value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <ant dir="${catalina.home}/catalina" target="deploy-static-only">
- <property name="catalina.build" value="${tomcat.build}" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar"
- value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="false" />
- </ant>
-
- <ant dir="${catalina.home}/modules" target="build">
- <property name="catalina.build" value="${tomcat.build}" />
- <property name="cluster.dist" value="${tomcat.build}/server/lib" />
- <property name="config.dist" value="${tomcat.build}/server/lib" />
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- </target>
-
- <target name="build" depends="init"
- description="Builds all components">
-
- <antcall target="build-tomcatapr"/>
- <antcall target="build-tomcatutil"/>
- <antcall target="build-tomcatcoyote"/>
- <antcall target="build-tomcathttp11"/>
-
- <antcall target="build-catalina"/>
-
- <antcall target="build-tomcatjk"/>
- <antcall target="build-tomcatjkstatus"/>
-
- <antcall target="build-juli"/>
-
- <antcall target="build-jasper"/>
-
- <antcall target="build-i18n"/>
-
- <!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/>
- <chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
-
- </target>
-
- <target name="build-i18n">
-
- <!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-es.jar">
- <fileset dir="${tomcat.build}/classes">
- <include name="**/LocalStrings_es.properties" />
- <exclude name="**/tomcat4/**" />
- </fileset>
- </jar>
- <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-fr.jar">
- <fileset dir="${tomcat.build}/classes">
- <include name="**/LocalStrings_fr.properties" />
- <exclude name="**/tomcat4/**" />
- </fileset>
- </jar>
- <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-ja.jar">
- <fileset dir="${tomcat.build}/classes">
- <include name="**/LocalStrings_ja.properties" />
- <exclude name="**/tomcat4/**" />
- </fileset>
- </jar>
-
- <!-- Build baseline _en bundle to ease -->
- <copy todir="${tomcat.build}/classes" includeemptydirs="false">
- <fileset dir="${tomcat.build}/classes">
- <include name="**/LocalStrings.properties"/>
- </fileset>
- <mapper type="glob" from="*.properties" to="*_en.properties"/>
- </copy>
- <jar jarfile="${tomcat.build}/common/i18n/tomcat-i18n-en.jar">
- <fileset dir="${tomcat.build}/classes">
- <include name="**/LocalStrings_en.properties" />
- <exclude name="**/tomcat4/**" />
- </fileset>
- </jar>
-
- </target>
-
- <!-- ====================== Build dependent code =================== -->
-
- <target name="build-all" depends="init,deploy-static,build,build-webapps,compat,deployer"
- description="build tomcat, webapps, embed, compat, deployer" />
-
-
- <target name="build-depends" depends="init"
- description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
- <antcall target="build-servletapi"/>
- <antcall target="build-jspapi"/>
-
- <!-- <antcall target="build-commons-modeler" /> -->
- <!-- <antcall target="build-commons-daemon" /> -->
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-collections-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-pool-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
-
- <antcall target="build-tomcat-dbcp" />
-
- <antcall target="downloadzip">
- <param name="sourcefile" value="${jdt.loc}"/>
- <param name="destfile" value="${jdt.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- <antcall target="build-jasper-compiler-jdt" />
- </target>
-
- <target name="build-tomcat-dbcp">
- <mkdir dir="${tomcat-dbcp.home}"/>
- <antcall target="-build-tomcat-dbcp">
- <param name="basedir" value="${tomcat-dbcp.home}" />
- </antcall>
- </target>
-
- <target name="-build-tomcat-dbcp">
- <copy todir="${tomcat-dbcp.home}">
- <fileset dir="${commons-collections.home}" >
- <include name="**/collections/CursorableLinkedList.java" />
- <include name="**/collections/KeyValue.java" />
- <include name="**/collections/LRUMap.java" />
- <include name="**/collections/SequencedHashMap.java" />
- </fileset>
- <fileset dir="${commons-pool.home}">
- <include name="**/*.java" />
- <exclude name="**/Stack*.java" />
- <exclude name="**/SoftReferenceObjectPool.java" />
- <exclude name="**/test/**" />
- </fileset>
- <fileset dir="${commons-dbcp.home}">
- <include name="**/*.java" />
- <exclude name="**/test/**" />
- </fileset>
- </copy>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
- <replacefilter token="return UnmodifiableList.decorate(l);"
- value="return l;" />
- <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
- value=" " />
- </replace>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
- <replacefilter token="org.apache.commons"
- value="org.apache.tomcat.dbcp" />
- </replace>
- <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
- <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
- <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
- </move>
- <mkdir dir="${tomcat-dbcp.home}/classes"/>
- <javac destdir="classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- sourcepath="${tomcat-dbcp.home}/src/java"
- srcdir="src/java" >
- <include name="**" />
- </javac>
- <jar jarfile="${tomcat-dbcp.jar}"
- index="true">
- <fileset dir="${tomcat-dbcp.home}/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- </target>
-
- <target name="build-jasper-compiler-jdt">
- <mkdir dir="${jasper-compiler-jdt.home}"/>
- <antcall target="-build-jasper-compiler-jdt">
- <param name="basedir" value="${jasper-compiler-jdt.home}" />
- </antcall>
- </target>
-
- <target name="-build-jasper-compiler-jdt">
- <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
- <jar destfile="${jasper-compiler-jdt.jar}" index="true">
- <fileset dir="${jasper-compiler-jdt.home}">
- <include name="org/eclipse/jdt/core/compiler/**"/>
- <include name="org/eclipse/jdt/internal/compiler/**"/>
- <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
- </fileset>
- </jar>
- </target>
-
- <target name="build-webapps" depends="init"
- description="build webapps">
-
- <echo>========== Building: webapps </echo>
-
- <mkdir dir="${tomcat.build}/webapps" />
- <mkdir dir="${tomcat.build}/server/webapps" />
-
- <!-- The build files are far too difficult to hack - just build it and copy -->
- <ant dir="${api.home}/jsr154" target="dist">
- </ant>
- <ant dir="${api.home}/jsr152" target="dist">
- </ant>
-
- <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
- <copy todir="${tomcat.build}/webapps/servlets-examples">
- <fileset dir="${api.home}/jsr154/build/examples" includes="**"/>
- </copy>
-
- <mkdir dir="${tomcat.build}/webapps/jsp-examples"/>
- <copy todir="${tomcat.build}/webapps/jsp-examples">
- <fileset dir="${api.home}/jsr152/build/examples">
- <exclude name="WEB-INF/tagPlugins.xml" />
- </fileset>
- </copy>
-
- <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar" value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <ant dir="${catalina.home}/webapps/docs" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar" value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <antcall target="build-admin" />
-
- <ant dir="${catalina.home}/webapps/manager" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/server/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar" value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <ant dir="${catalina.home}/webapps/host-manager" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/server/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar" value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <ant dir="${catalina.home}/webapps/balancer" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar" value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
-
- <ant dir="${catalina.home}/webapps/webdav" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/webapps" />
- </ant>
-
- <!-- Precompiling and fixing webapps -->
- <antcall target="build-webapps-precompile" />
- <antcall target="fix-webapps" />
-
- </target>
-
- <target name="fix-webapps" depends="init" >
- <!-- Extra build steps for webapps -->
-
- <filter token="VERSION" value="${version}"/>
-
- <!-- Add release notes to the root webapp -->
- <copy file="${basedir}/RELEASE-NOTES"
- tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
- filtering="true" />
-
- <!-- Add documents to the tomcat-docs webapp -->
- <copy file="${basedir}/resources/build.xml"
- todir="${tomcat.build}/webapps/tomcat-docs" />
- <copy file="./RELEASE-NOTES"
- tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt"
- filtering="true" />
-
- <!-- Build JARs for webapps classes -->
- <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
- index="true">
- <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
- index="true">
- <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar"
- index="true">
- <fileset dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar"
- index="true">
- <fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- <mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" />
- <jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar"
- index="true">
- <fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
-
- <!-- Add XML declarations for admin, manager and balancer -->
- <copy file="${tomcat.build}/server/webapps/manager/manager.xml"
- todir="${tomcat.build}/conf/Catalina/localhost" />
- <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
- todir="${tomcat.build}/conf/Catalina/localhost" />
- <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
- todir="${tomcat.build}/conf/Catalina/localhost" />
-
- </target>
-
- <!-- ====================== Embed target =================== -->
-
- <target name="embed" description="Create a set of jars for embedded tomcat" >
-
- <!-- Generic libraries -->
- <copy todir="embed/lib" file="${commons-logging.jar}"/>
- <copy todir="embed/lib" file="${commons-modeler.jar}"/>
-
- <!-- Connector -->
- <copy todir="embed/lib">
- <fileset dir="build/server/lib">
- <!--<include name="tomcat-ajp.jar"/>-->
- <include name="tomcat-coyote.jar"/>
- <include name="tomcat-http.jar"/>
- <include name="tomcat-util.jar"/>
- </fileset>
- </copy>
-
- <!-- Servlet API implementation -->
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
- <include name="naming-factory.jar"/>
- <include name="servlet-api.jar"/>
- <include name="naming-resources.jar"/>
- </fileset>
- <fileset dir="build/server/lib">
- <include name="catalina.jar"/>
- <include name="catalina-optional.jar"/>
- <include name="servlets-default.jar"/>
- </fileset>
- </copy>
-
- <!-- JNDI extra
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
- <include name="naming-factory.jar"/>
- </fileset>
- </copy>
- -->
-
- <!-- JSP runtime -->
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
- <include name="commons-el.jar"/>
- <include name="jsp-api.jar"/>
- <include name="jasper-runtime.jar"/>
- </fileset>
- </copy>
-
- <!-- JSP compiler - not needed for an minimal server if it
- uses precompilation -->
- <copy todir="embed/lib">
- <fileset dir="build/common/lib">
- <include name="jasper-compiler.jar"/>
- <include name="jasper-compiler-jdt.jar"/>
- </fileset>
- </copy>
-
- <copy tofile="embed/build.xml" file="resources/mbeans/tomcat5-ant.xml" />
- <!--
- <copy tofile="embed/tomcat5-mbeans.xml" file="resources/mbeans/tomcat5-mbeans.xml" />
- <copy tofile="embed/tomcat5-mlet.xml" file="resources/mbeans/tomcat5-mlet.xml" />
- <copy tofile="embed/tomcat5-service.xml" file="resources/mbeans/tomcat5-service.xml" />
- -->
-
- <mkdir dir="embed/conf"/>
- <delete file="embed/conf/context.xml" />
- <copy todir="embed/conf">
- <fileset dir="build/conf">
- <include name="context.xml"/>
- <include name="tomcat-users.xml"/>
- <include name="web.xml"/>
- <!-- no longer needed
- <include name="server.xml"/>
- -->
- </fileset>
- </copy>
- <replace file="embed/conf/context.xml" token="<Context" value="<Context privileged='true'" />
-
- <mkdir dir="embed/webapps"/>
- <copy todir="embed/webapps" >
- <fileset dir="dist/webapps" includes="ROOT/**"/>
- </copy>
- <copy todir="embed/webapps" >
- <fileset dir="dist/server/webapps" includes="manager/**"/>
- </copy>
-
- </target>
-
- <!-- ====================== Deployer target =================== -->
-
- <target name="deployer" description="Create the Tomcat deployer binary" >
-
- <!-- Servlet and JSP -->
- <copy todir="${tomcat.deployer}/lib">
- <fileset dir="${tomcat.build}/common/lib">
- <include name="commons-el.jar"/>
- <include name="jsp-api.jar"/>
- <include name="jasper-runtime.jar"/>
- <include name="jasper-compiler.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
- </copy>
-
- <!-- Digester and dependencies -->
- <copy todir="${tomcat.deployer}/lib"
- file="${tomcat.build}/server/lib/catalina-ant.jar"/>
- <copy todir="${tomcat.deployer}/lib" file="${commons-logging.jar}"/>
- <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar">
- <fileset dir="${tomcat.build}/classes">
- <include name="org/apache/catalina/startup/DigesterFactory.class" />
- <include name="org/apache/catalina/util/SchemaResolver.class" />
- <include name="org/apache/catalina/util/StringManager.class" />
- <include name="org/apache/tomcat/util/*" />
- <include name="org/apache/tomcat/util/digester/*" />
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Main build script -->
- <copy todir="${tomcat.deployer}">
- <fileset dir="${basedir}/resources/deployer" />
- </copy>
-
- <!-- Copy deployer documentation -->
- <copy todir="${tomcat.deployer}">
- <fileset dir="${tomcat.build}/webapps/tomcat-docs">
- <include name="images/jakarta-logo.gif" />
- <include name="images/tomcat.gif" />
- </fileset>
- </copy>
- <copy tofile="${tomcat.deployer}/docs/manual.html"
- file="${tomcat.build}/webapps/tomcat-docs/printer/deployer-howto.html" />
-
- </target>
-
- <!-- ====================== Compat target =================== -->
-
- <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
-
- <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
- <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
- <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
-
- </target>
-
- <!-- ====================== DEPLOY: Deploy Components =================== -->
-
- <target name="deploy" depends="deploy-static,build-all,build-webapps"
- description="Build and deploy all components" />
-
- <target name="deploy.old" depends="deploy-static">
-
- <echo>Target: Modeler - Dist ...</echo>
- <ant dir="${commons-modeler.home}" target="dist"/>
-
- <echo>Target: Catalina - Deploy ...</echo>
- <ant dir="${catalina.home}" target="deploy"/>
- <!--
- <antcall target="build-tomcat-coyote"/>
- <antcall target="build-tomcat-jk"/>
- <antcall target="build-tomcat-http11"/>
- <ant dir="${catalina.home}" target="deploy-catalina"/>
- -->
- <copy todir="${tomcat.build}">
- <fileset dir="${catalina.home}/build"/>
- </copy>
-
- <filter token="VERSION" value="${version}"/>
-
- <antcall target="build-jasper"/>
-
- <!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/>
- <chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
-
- <antcall target="fix-webapps"/>
-
- <!-- Copy the examples webapps -->
- <copy todir="${tomcat.build}/webapps/jsp-examples">
- <fileset dir="${api.home}/jsr152/build/examples"/>
- </copy>
- <copy todir="${tomcat.build}/webapps/servlets-examples">
- <fileset dir="${api.home}/jsr154/build/examples"/>
- </copy>
-
- <!-- Copy Unix JSVC from commons-daemon -->
- <copy file="${commons-daemon.jsvc.tar.gz}"
- tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-
- <echo>Target: Webapps precompilation ...</echo>
-
- <antcall target="build-admin"/>
-
- <ant dir="." target="build-webapps-precompile" />
-
- </target>
-
-
- <!-- ====================== COMBO: Clean All Directories ================ -->
- <target name="clean"
- description="Clean all components">
-
- <delete dir="${tomcat.build}"/>
-
- <delete dir="${tomcat.embed}"/>
- <delete dir="${tomcat.compat}"/>
- <delete dir="${tomcat.deployer}"/>
-
- <echo>Target: Servlet API - Clean ...</echo>
- <ant dir="${api.home}/jsr154" target="clean"/>
-
- <echo>Target: JSP API - Clean ...</echo>
- <ant dir="${api.home}/jsr152" target="clean"/>
-
- <echo>Target: Catalina - Clean ...</echo>
- <ant dir="${catalina.home}" target="clean"/>
-
- <echo>Target: Jasper - Clean ...</echo>
- <ant dir="${jasper.home}" target="clean">
- <property name="catalina.home" value="${tomcat.build}"/>
- </ant>
-
- <delete dir="${tomcat.dist}"/>
-
- </target>
-
-
- <!-- ======================= COMBO: Build All Components ================ -->
- <target name="all"
- description="Clean, build, and deploy all components">
-
- <echo>Target: Servlet API - Dist ...</echo>
- <ant dir="${api.home}/jsr154" target="dist"/>
-
- <echo>Target: JSP API - Dist ...</echo>
- <ant dir="${api.home}/jsr152" target="dist"/>
-
- <echo>Target: Catalina - All ...</echo>
- <ant dir="${catalina.home}" target="all"/>
-
- <echo>Target: Jasper - All ...</echo>
- <ant dir="${jasper.home}" target="all">
- <property name="catalina.home" value="${tomcat.build}"/>
- </ant>
- </target>
-
-
- <!-- ======================= COMBO: Test All Components ================= -->
- <target name="test"
- description="Unit tests on all components">
- <echo>Target: Catalina - Test ...</echo>
- <ant dir="${catalina.home}" target="test"/>
- <echo>Target: Jasper - Test ...</echo>
- <ant dir="${jasper.home}" target="test">
- <property name="catalina.home" value="${tomcat.build}"/>
- </ant>
- </target>
-
- <!-- ======================= TESTER: Run Catalina Tester Tests=========== -->
-
- <target name="dist-tester"
- description="Build the Catalina tester">
-
- <ant dir="${catalina.home}/tester" target="dist">
- <property name="tester.deploy" value="${tomcat.build}"/>
- </ant>
- <ant dir="${catalina.home}/tester" target="deploy">
- <property name="tester.deploy" value="${tomcat.build}"/>
- </ant>
-
- </target>
-
- <target name="clean-tester"
- description="Clean the Catalina tester">
-
- <ant dir="${catalina.home}/tester" target="clean" />
-
- </target>
-
- <target name="run-tester"
- description="Catalina Tests" depends="dist-tester">
-
- <!-- For Java 1.4 -->
- <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
- <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
- <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
-
- <parallel>
-
- <java classname="LauncherBootstrap" fork="yes">
- <arg value="-launchfile"/>
- <arg value="catalina.xml"/>
- <arg value="-verbose"/>
- <arg value="catalina"/>
- <arg value="start"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
-
- <sequential>
- <!-- Let tomcat starts before starting Tester -->
- <sleep seconds="${tester.delay}"/>
-
- <ant dir="${catalina.home}/tester/dist/bin" antfile="tester.xml"
- target="all">
- <property name="catalina.home" value="${tomcat.build}"/>
- </ant>
-
- <java classname="LauncherBootstrap" fork="yes">
- <arg value="-launchfile"/>
- <arg value="catalina.xml"/>
- <arg value="-verbose"/>
- <arg value="catalina"/>
- <arg value="stop"/>
- <classpath>
- <pathelement path="${java.class.path}"/>
- <pathelement path="${tomcat.build}/bin"/>
- </classpath>
- </java>
- </sequential>
-
- </parallel>
-
- </target>
-
- <!-- ====================== DIST: Create Directories ==================== -->
- <target name="dist-prepare">
- <mkdir dir="${tomcat.dist}"/>
- <mkdir dir="${tomcat.dist}/bin"/>
- <mkdir dir="${tomcat.dist}/common"/>
- <mkdir dir="${tomcat.dist}/common/classes"/>
- <mkdir dir="${tomcat.dist}/common/endorsed"/>
- <mkdir dir="${tomcat.dist}/common/lib"/>
- <mkdir dir="${tomcat.dist}/conf"/>
- <mkdir dir="${tomcat.dist}/logs"/>
- <mkdir dir="${tomcat.dist}/server"/>
- <mkdir dir="${tomcat.dist}/server/classes"/>
- <mkdir dir="${tomcat.dist}/server/lib"/>
- <mkdir dir="${tomcat.dist}/shared/classes"/>
- <mkdir dir="${tomcat.dist}/shared/lib"/>
- <mkdir dir="${tomcat.dist}/webapps"/>
- <mkdir dir="${tomcat.dist}/work"/>
- <mkdir dir="${tomcat.dist}/temp"/>
- </target>
-
-
- <!-- ====================== DIST: Copy Static Files ===================== -->
- <target name="dist-static" depends="dist-prepare">
-
- <!-- Copy the top-level documentation files -->
- <copy todir="${tomcat.dist}">
- <fileset dir=".">
- <include name="INSTALLING.txt"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- <include name="README.txt"/>
- <include name="RELEASE*"/>
- <include name="RUNNING.txt"/>
- </fileset>
- </copy>
-
- <!-- Copy the contents of each "build" directory -->
- <copy todir="${tomcat.dist}/bin">
- <fileset dir="${tomcat.build}/bin">
- <exclude name="catalina.xml"/>
- <exclude name="commons-launcher.jar"/>
- <exclude name="*-using-launcher.*"/>
- <exclude name="LauncherBootstrap.class"/>
- <exclude name="launcher.properties"/>
- </fileset>
- </copy>
- <copy todir="${tomcat.dist}/common/classes">
- <fileset dir="${tomcat.build}/common/classes" />
- </copy>
- <copy todir="${tomcat.dist}/common/endorsed">
- <fileset dir="${tomcat.build}/common/endorsed" />
- </copy>
- <copy todir="${tomcat.dist}/common/i18n">
- <fileset dir="${tomcat.build}/common/i18n" />
- </copy>
- <copy todir="${tomcat.dist}/common/lib">
- <fileset dir="${tomcat.build}/common/lib" />
- </copy>
- <copy todir="${tomcat.dist}/conf">
- <fileset dir="${tomcat.build}/conf">
- <exclude name="MANIFEST.MF" />
- <exclude name="jk2.manifest" />
- <exclude name="jk2.properties" />
- <exclude name="jkconf.ant.xml" />
- <exclude name="jkconfig.manifest" />
- <exclude name="shm.manifest" />
- <exclude name="tomcat-jk2.manifest" />
- <exclude name="uriworkermap.properties" />
- <exclude name="workers2.properties" />
- <exclude name="workers2.properties.minimal" />
- <exclude name="workers.properties" />
- <exclude name="workers.properties.minimal" />
- </fileset>
- </copy>
- <copy todir="${tomcat.dist}/server/lib">
- <fileset dir="${tomcat.build}/server/lib" />
- </copy>
- <copy todir="${tomcat.dist}/server/webapps">
- <fileset dir="${tomcat.build}/server/webapps">
- <exclude name="admin/**/*.jsp" />
- <exclude name="admin/**/*.jspf" />
- <exclude name="admin/WEB-INF/classes/**" />
- <exclude name="admin/WEB-INF/src/**" />
- <exclude name="manager/WEB-INF/classes/**" />
- <exclude name="host-manager/WEB-INF/classes/**" />
- </fileset>
- </copy>
-<!--
- <copy todir="${tomcat.dist}/shared/lib">
- <fileset dir="${tomcat.build}/shared/lib" />
- </copy>
--->
- <copy todir="${tomcat.dist}/webapps">
- <fileset dir="${tomcat.build}/webapps">
- <exclude name="**/balancer/WEB-INF/classes/**" />
- <exclude name="**/ROOT/WEB-INF/classes/**" />
- <exclude name="**/WEB-INF/src/**" />
- </fileset>
- </copy>
-
- <!-- Bugzilla 37035: http://issues.apache.org/bugzilla/show_bug.cgi?id=37035 -->
- <touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" />
-
- <!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"/>
- <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
-
- </target>
-
-
- <!-- ====================== DIST: Create Javadoc ======================== -->
- <target name="dist-javadoc">
- <!--
- <ant dir="${catalina.home}" target="dist-javadoc"/>
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
- <fileset dir="${catalina.build}/javadoc" />
- </copy>
- <ant dir="${jasper.home}" target="javadoc"/>
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api">
- <fileset dir="${jasper.build}/javadoc" />
- </copy>
- -->
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/servletapi"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/servletapi">
- <fileset dir="${api.home}/jsr154/dist/docs/api" />
- </copy>
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/jspapi"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/jspapi">
- <fileset dir="${api.home}/jsr152/dist/docs/api" />
- </copy>
- </target>
-
-
- <!-- ====================== DIST: Create Sources ======================== -->
- <target name="dist-source">
-
- <mkdir dir="${tomcat.dist}/src"/>
- <mkdir dir="${tomcat.dist}/src/${api.project}"/>
- <mkdir dir="${tomcat.dist}/src/${tomcat.project}"/>
- <mkdir dir="${tomcat.dist}/src/${catalina.project}"/>
- <mkdir dir="${tomcat.dist}/src/${jtc.project}"/>
- <mkdir dir="${tomcat.dist}/src/${jasper.project}"/>
-
- <!-- Main build file -->
- <copy todir="${tomcat.dist}/src">
- <fileset dir="${basedir}/resources">
- <include name="build.xml" />
- </fileset>
- </copy>
-
- <!-- tomcat-5 source -->
- <copy todir="${tomcat.dist}/src/${tomcat.project}">
- <fileset dir="${basedir}">
- <exclude name="build/**"/>
- <exclude name="dist/**"/>
- <exclude name="release/**"/>
- <exclude name="compat/**"/>
- <exclude name="deployer/**"/>
- <exclude name="embed/**"/>
- <exclude name="build.properties"/>
- </fileset>
- </copy>
-
- <!-- servletapi-5 source -->
- <copy todir="${tomcat.dist}/src/${api.project}">
- <fileset dir="${api.home}">
- <include name="jsr154/**"/>
- <include name="jsr152/**"/>
- <exclude name="**/build/**"/>
- <exclude name="**/dist/**"/>
- <exclude name="build.properties"/>
- </fileset>
- </copy>
-
- <!-- tomcat container source -->
- <copy todir="${tomcat.dist}/src/${catalina.project}">
- <fileset dir="${catalina.home}">
- <exclude name="**/build/**"/>
- <exclude name="**/dist/**"/>
- </fileset>
- </copy>
-
- <!-- tomcat jasper source -->
- <copy todir="${tomcat.dist}/src/${jasper.project}">
- <fileset dir="${jasper.home}">
- <exclude name="**/build/**"/>
- <exclude name="**/dist/**"/>
- </fileset>
- </copy>
-
- <!-- tomcat connectors source -->
- <copy todir="${tomcat.dist}/src/${jtc.project}">
- <fileset dir="${jtc.home}">
- <exclude name="coyote/build/**"/>
- <exclude name="http11/build/**"/>
- <exclude name="jk/build/**"/>
- <exclude name="util/build/**"/>
- <exclude name="webapp/**"/>
- <exclude name="lib/**"/>
- <exclude name="build.properties"/>
- </fileset>
- </copy>
- </target>
-
-
- <!-- ====================== DIST: Create Archives ======================= -->
- <target name="dist" depends="deploy,dist-static,dist-javadoc,embed"
- description="Create binary distribution">
- </target>
-
-
- <!-- ================= DIST: Create Windows Installer =================== -->
- <target name="installer"
- description="Create Windows installer" if="execute.installer">
- <echo message="Builds a Windows installer based on Nullsoft Installer"/>
- <copy todir="${tomcat.dist}">
- <fileset dir="resources" />
- </copy>
- <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
- <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
- <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
- <copy file="${jtc.home}/procrun/bin/tomcat5.exe"
- tofile="${tomcat.dist}/bin/tomcat5.exe" />
- <copy file="${jtc.home}/procrun/bin/tomcat5w.exe"
- tofile="${tomcat.dist}/bin/tomcat5w.exe" />
-
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
-
- <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true"/>
- <exec dir="${tomcat.dist}" executable="${nsis.exe}">
- <arg value="/DNSISDIR=${nsis.home}" />
- <arg value="tomcat.nsi" />
- </exec>
-
- <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}.exe"
- 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" />
- </target>
-
-
- <!-- ==================== RELEASE: Create Release ======================= -->
- <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,package-docs-tgz,clean-tester,run-tester"
- description="Create a Tomcat 5 packaged distribution">
-
- <filter token="VERSION" value="${version}"/>
- <copy file="KEYS"
- todir="${tomcat.release}/v${version}"/>
- <copy file="RELEASE-NOTES"
- todir="${tomcat.release}/v${version}"
- filtering="true"/>
- <copy file="resources/welcome.main.html"
- tofile="${tomcat.release}/v${version}/README.html"
- filtering="true"/>
- <copy file="resources/welcome.bin.html"
- tofile="${tomcat.release}/v${version}/bin/README.html"
- filtering="true"/>
-
- </target>
-
- <!-- Packages the core zip distro -->
- <target name="package-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="bin/**"/>
- <include name="common/**"/>
- <include name="conf/**"/>
- <include name="logs/**"/>
- <include name="server/**"/>
- <include name="shared/**"/>
- <include name="webapps/**"/>
- <include name="work/**"/>
- <include name="temp/**"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- <include name="README.txt"/>
- <include name="RELEASE-NOTES"/>
- <include name="RUNNING.txt"/>
- <include name="BENCHMARKS.txt"/>
- <exclude name="server/webapps/admin/**"/>
- <exclude name="conf/Catalina/localhost/admin.xml"/>
- </zipfileset>
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5"
- message="${md5sum.binary-prefix}${final.name}.zip${line.separator}" append="true" />
- </target>
-
- <!-- Packages the embedded Tomcat distro in zip format -->
- <target name="package-embed-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-embed.zip">
- <zipfileset dir="${tomcat.embed}" prefix="${final.name}-embed"
- includes="**" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
- includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
- includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
- includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-embed"
- includes="RELEASE-NOTES" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-embed.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-embed.zip.md5"
- message="${md5sum.binary-prefix}${final.name}-embed.zip${line.separator}" append="true" />
- </target>
-
- <!-- Packages the deployer distribution in zip format -->
- <target name="package-deployer-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip">
- <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer" includes="**" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="RELEASE-NOTES" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip.md5"
- message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}" append="true" />
- </target>
-
- <!-- Packages the JDK 1.4 compatibility distro in zip format -->
- <target name="package-compat-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-compat.zip">
- <zipfileset dir="${tomcat.compat}" prefix="${final.name}" includes="**" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="RELEASE-NOTES" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-compat.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-compat.zip.md5"
- message="${md5sum.binary-prefix}${final.name}-compat.zip${line.separator}" append="true" />
- </target>
-
- <!-- Packages the admin webapp distro in zip format -->
- <target name="package-admin-zip">
- <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-admin.zip">
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="server/webapps/admin/**"/>
- <include name="conf/Catalina/localhost/admin.xml"/>
- <exclude name="*.jsp" />
- </zipfileset>
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="LICENSE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="NOTICE" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="README.txt" />
- <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="RELEASE-NOTES" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip.md5"
- message="${md5sum.binary-prefix}${final.name}-admin.zip${line.separator}" append="true" />
- </target>
-
- <!-- Prepares for cutting the release -->
- <target name="prepare-release">
- <mkdir dir="${tomcat.release}"/>
- <mkdir dir="${tomcat.release}/v${version}"/>
- <mkdir dir="${tomcat.release}/v${version}/bin"/>
- <mkdir dir="${tomcat.release}/v${version}/src"/>
-
- <!-- 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>
- <os family="windows" />
- <available file="${nsis.exe}" />
- <available file="${nsis.installoptions.dll}" />
- <available file="${nsis.nsexec.dll}" />
- <available file="${nsis.nsisdl.dll}" />
- </and>
- </condition>
-
- </target>
-
- <!-- Packages the core tar.gz distro -->
- <target name="package-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/>
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
- <tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}">
- <include name="bin/catalina.sh" />
- <include name="bin/digest.sh" />
- <include name="bin/jasper.sh" />
- <include name="bin/jspc.sh" />
- <include name="bin/setclasspath.sh" />
- <include name="bin/startup.sh" />
- <include name="bin/shutdown.sh" />
- <include name="bin/tool-wrapper.sh" />
- <include name="bin/tool-wrapper-using-launcher.sh" />
- <include name="bin/shutdown-using-launcher.sh" />
- <include name="bin/startup-using-launcher.sh" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
- <include name="conf/**" />
- <exclude name="conf/Catalina/localhost/admin.xml" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="bin/**" />
- <include name="common/**" />
- <include name="logs/**" />
- <include name="server/**" />
- <include name="shared/**" />
- <include name="temp/**" />
- <include name="webapps/**" />
- <include name="work/**" />
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- <include name="RUNNING.txt" />
- <include name="BENCHMARKS.txt" />
- <exclude name="bin/catalina.sh" />
- <exclude name="bin/digest.sh" />
- <exclude name="bin/jasper.sh" />
- <exclude name="bin/jspc.sh" />
- <exclude name="bin/setclasspath.sh" />
- <exclude name="bin/startup.sh" />
- <exclude name="bin/shutdown.sh" />
- <exclude name="bin/tool-wrapper.sh" />
- <exclude name="bin/tool-wrapper-using-launcher.sh" />
- <exclude name="bin/shutdown-using-launcher.sh" />
- <exclude name="bin/startup-using-launcher.sh" />
- <exclude name="conf/**" />
- <exclude name="src/**" />
- <exclude name="server/webapps/admin/**" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- Packages the embedded Tomcat distro in tar.gz format -->
- <target name="package-embed-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.embed}" includes="*.xml" eol="lf"/>
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}-embed">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.embed}" prefix="${final.name}-embed">
- <include name="**" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}-embed.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- Packages the deployer Tomcat distro in tar.gz format -->
- <target name="package-deployer-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}-deployer">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer">
- <include name="**" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- Packages the 1.4 compatibility distro in tar.gz format -->
- <target name="package-compat-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}-compat.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.compat}" prefix="${final.name}">
- <include name="**" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-compat.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-compat.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}-compat.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- Packages the admin webapp distro in tar.gz format -->
- <target name="package-admin-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RELEASE-NOTES" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" prefix="${final.name}">
- <include name="server/webapps/admin/**" />
- <exclude name="*.jsp" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}">
- <include name="conf/Catalina/localhost/admin.xml" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}-admin.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- Packages the documentation distro in tar.gz format -->
- <target name="package-docs-tgz" depends="prepare-release">
- <!-- Generate docs -->
- <ant dir="${catalina.home}" target="dist-javadoc"/>
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
- <fileset dir="${catalina.build}/javadoc" />
- </copy>
- <ant dir="${jasper.home}" target="javadoc"/>
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api">
- <fileset dir="${jasper.build}/javadoc" />
- </copy>
-
- <!-- Package gocs -->
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
- <tarfileset dir="${tomcat.dist}" prefix="tomcat-5.5-doc">
- <include name="LICENSE" />
- <include name="NOTICE" />
- <include name="README.txt" />
- <include name="RUNNING.txt" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}/webapps/tomcat-docs" prefix="tomcat-5.5-doc">
- <include name="**" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz.md5"
- message="${md5sum.binary-prefix}${final.name}-fulldocs.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- Packages the source code distribution in zip format -->
- <target name="package-src-zip">
- <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
- <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
- </zip>
-
- <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.zip"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/src/${final-src.name}.zip.md5"
- message="${md5sum.binary-prefix}${final-src.name}.zip${line.separator}" append="true" />
- </target>
-
- <!-- Packages the source code distribution in tar.gz format -->
- <target name="package-src-tgz">
- <fixcrlf srcdir="${tomcat.dist}"
- excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war" eol="lf"/>
-
- <tar longfile="gnu" compression="gzip"
- tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
- <tarfileset dir="${tomcat.dist}/src" mode="755" prefix="${final-src.name}">
- <include name="${jtc.project}/jk/native/buildconf.sh" />
- <include name="${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" />
- <include name="${jtc.project}/jk/native/apache-1.3/build-solaris.sh" />
- <include name="${jtc.project}/jk/native/apache-1.3/build-unix.sh" />
- <include name="${jtc.project}/jk/native/apache-2.0/build-unix.sh" />
- <include name="${jtc.project}/jk/native/apache-2.0/install-unix.sh" />
- <include name="${jtc.project}/jk/native/domino/mkini.sh" />
- </tarfileset>
- <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}">
- <exclude name="${jtc.project}/jk/native/buildconf.sh" />
- <exclude name="${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" />
- <exclude name="${jtc.project}/jk/native/apache-1.3/build-solaris.sh" />
- <exclude name="${jtc.project}/jk/native/apache-1.3/build-unix.sh" />
- <exclude name="${jtc.project}/jk/native/apache-2.0/build-unix.sh" />
- <exclude name="${jtc.project}/jk/native/apache-2.0/install-unix.sh" />
- <exclude name="${jtc.project}/jk/native/domino/mkini.sh" />
- </tarfileset>
- </tar>
-
- <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz"
- forceOverwrite="yes" fileext=".md5" />
- <echo file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz.md5"
- message="${md5sum.binary-prefix}${final-src.name}.tar.gz${line.separator}" append="true" />
- </target>
-
- <!-- ==================== Download or build the required binary packages ==================== -->
-
- <target name="download" depends="proxyflags"
- description="Download binary packages" >
- <mkdir dir="${base.path}" />
-
- <!-- commons-digester needs ../LICENSE -->
- <!-- That is ugly XXX needs a review -->
- <copy file="LICENSE" tofile="../LICENSE"/>
- <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
-
- <!-- Downdown any sub package or tools needed. -->
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-beanutils.loc}"/>
- <param name="destfile" value="${commons-beanutils.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-collections.loc}"/>
- <param name="destfile" value="${commons-collections.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-el.loc}"/>
- <param name="destfile" value="${commons-el.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-logging.loc}"/>
- <param name="destfile" value="${commons-logging.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-modeler.loc}"/>
- <param name="destfile" value="${commons-modeler.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${log4j.loc}"/>
- <param name="destfile" value="${log4j.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-digester.loc}"/>
- <param name="destfile" value="${commons-digester.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-fileupload.loc}"/>
- <param name="destfile" value="${commons-fileupload.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <!-- xerces2 brings 2 files, test for one of them -->
- <param name="sourcefile" value="${xerces.loc}"/>
- <param name="destfile" value="${xml-apis.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${jmx.loc}"/>
- <param name="destfile" value="${jmx.jar}"/>
- </antcall>
-
- <antcall target="downloadzip">
- <param name="sourcefile" value="${junit.loc}"/>
- <param name="destfile" value="${junit.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-launcher.loc}"/>
- <param name="destfile" value="${commons-launcher.jar}"/>
- </antcall>
-
- <!--
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-pool.loc}"/>
- <param name="destfile" value="${commons-pool.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-dbcp.loc}"/>
- <param name="destfile" value="${commons-dbcp.jar}"/>
- <param name="destdir" value="${base.path}"/>
- </antcall>
- -->
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-httpclient.loc}"/>
- <param name="destfile" value="${commons-httpclient.jar}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${nsis.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
- <param name="destdir" value="${nsis.home}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${struts.loc}"/>
- <param name="destfile" value="${struts.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-daemon.loc}"/>
- <param name="destfile" value="${commons-daemon.jar}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${tomcat-native.loc}"/>
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
- <!-- Build the dependencies that are not yet released -->
- <antcall target="build-depends"/>
-
- </target>
-
- <target name="proxyflags">
- <!-- check proxy parameters. -->
- <condition property="useproxy">
- <equals arg1="${proxy.use}" arg2="on" />
- </condition>
- </target>
-
- <target name="setproxy" if="useproxy">
- <taskdef name="setproxy"
- classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
- </target>
-
- <target name="testexist">
- <echo message="Testing for ${destfile}"/>
- <available file="${destfile}" property="exist"/>
- </target>
-
- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
- <!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
- <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
- <untar src="${base.path}/file.tar" dest="${base.path}"/>
- <delete file="${base.path}/file.tar"/>
- <delete file="${base.path}/file.tar.gz"/>
- </target>
-
- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
- <!-- Download and extract the package -->
- <get src="${sourcefile}" dest="${base.path}/file.zip" />
- <mkdir dir="${destdir}" />
- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
- <delete file="${base.path}/file.zip"/>
- </target>
-
-
- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
- <!-- Download extract the file -->
- <mkdir dir="${destdir}" />
- <get src="${sourcefile}" dest="${destfile}" />
- </target>
-
-
- <!-- ==================== Modeler tricks ====================
- -->
- <target name="convert-mbeans" description="Hack: regenerate the ser form of the descriptors">
- <path id="tomcatCP" >
- <fileset dir="${tomcat.build}/common/lib" includes="*.jar"/>
- <fileset dir="${tomcat.build}/server/lib" includes="*.jar" />
- </path>
- <taskdef resource="org/apache/commons/modeler/ant/ant.properties"
- classpathref="tomcatCP" />
-
- <mbeans-descriptors file="${catalina.home}/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml"
- out="build/classes/org/apache/catalina/mbeans/mbeans-descriptors.xml.ser" />
- <mbeans-descriptors file="${catalina.home}/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml"
- out="build/classes/org/apache/catalina/core/mbeans-descriptors.xml.ser" />
- <mbeans-descriptors file="${catalina.home}/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml"
- out="build/classes/org/apache/catalina/valves/mbeans-descriptors.xml.ser" />
- <mbeans-descriptors file="${jtc.home}/coyote/src/java/org/apache/coyote/tomcat5/mbeans-descriptors.xml"
- out="build/classes/org/apache/coyote/tomcat5/mbeans-descriptors.xml.ser" />
- </target>
-
- <target name="gumpy-build" description="Target for Gump builds"
- depends="gumpy-prepare,prepare-release,dist,dist-source,installer,package-zip,package-tgz,package-src-zip,package-src-tgz" />
-
- <target name="gumpy-prepare" description="Collect Gump-built jar files" >
- <mkdir dir="${tomcat.build}"/>
- <mkdir dir="${tomcat.build}/classes" />
- <mkdir dir="${tomcat.build}/server/lib" />
- <mkdir dir="${tomcat.build}/common/lib" />
- <copy file="${tomcat-util.jar}" tofile="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <copy file="${tomcat-ajp.jar}" tofile="${tomcat.build}/server/lib/tomcat-ajp.jar"/>
- <copy file="${tomcat-coyote.jar}" tofile="${tomcat.build}/server/lib/tomcat-coyote.jar"/>
- <copy file="${tomcat-http11.jar}" tofile="${tomcat.build}/server/lib/tomcat-http11.jar"/>
- <copy file="${tomcat-jni.jar}" tofile="${tomcat.build}/server/lib/tomcat-apr.jar" />
- <property name="tomcat.aprbuild.notrequired" value="true" />
- <copy file="${jasper-runtime.jar}" tofile="${tomcat.build}/common/lib/jasper-runtime.jar"/>
- <copy file="${jasper-compiler.jar}" tofile="${tomcat.build}/common/lib/jasper-compiler.jar"/>
- <property name="jasper.build.notrequired" value="true" />
- </target>
-</project>
Copied: tags/tomcat5.5/5.5.20-2/build/build.xml (from rev 2754, branches/tomcat5.5/feature/debian/build/build.xml)
Deleted: tags/tomcat5.5/5.5.20-2/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/build.xml 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/build.xml 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,91 +0,0 @@
-<project name="Tomcat 5.0 Netbuild" default="build" basedir=".">
-
-
- <!-- ===================== Initialize Property Values =================== -->
-
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
- <property file="${user.home}/build.properties"/>
- <property file="build.properties"/>
- <property file="build.properties.default"/>
-
- <!-- Project Properties -->
- <property name="name" value="Apache Tomcat" />
- <property name="year" value="2005" />
- <property name="version" value="5.5" />
- <property name="project" value="jakarta-tomcat" />
- <property name="final.name" value="${project}-${version}" />
- <property name="final-src.name" value="${project}-${version}-src" />
-
- <!-- SVNROOT -->
- <property name="svnroot"
- value="http://svn.apache.org/repos/asf/" />
-
- <!-- Subprojects -->
- <property name="api.project" value="servletapi" />
- <property name="tomcat.project" value="build" />
- <property name="catalina.project" value="container" />
- <property name="jtc.project" value="connectors" />
- <property name="jasper.project" value="jasper" />
-
- <property name="current.loc" value="tomcat/current/tc5.5.x" />
-
- <!-- Source dependencies -->
- <property name="api.home"
- value="${basedir}/${api.project}"/>
- <property name="catalina.home"
- value="${basedir}/${catalina.project}"/>
- <property name="jasper.home"
- value="${basedir}/${jasper.project}"/>
- <property name="jtc.home"
- value="${basedir}/${jtc.project}"/>
- <property name="tomcat.home"
- value="${basedir}/${tomcat.project}"/>
-
- <target name="build" depends="check.source,get.source"
- description="Builds all components">
-
- <ant dir="${tomcat.home}" target="download" />
- <ant dir="${tomcat.home}" target="deploy" />
-
- </target>
-
- <!-- Top-level clean target added per Bugzilla 33325 -->
- <target name="clean"
- description="Clean (delete) all project files">
- <echo message="Deleting all project files" />
- <delete dir="${api.home}" />
- <delete dir="${catalina.home}" />
- <delete dir="${jasper.home}" />
- <delete dir="${jtc.home}" />
- <delete dir="${tomcat.home}" />
- </target>
-
- <target name="checkout"
- description="Update or checkout required sources from SVN">
-
- <echo level="info"
- message="If the checkout fails, - todo - " />
-
- <exec dir="${basedir}" executable="svn">
- <arg line="checkout ${svnroot}/${current.loc} ${basedir}" />
- </exec>
-
- </target>
-
- <!-- *************** UTILITY TARGETS *************** -->
-
- <target name="check.source">
-
- <available property="source.exists"
- file="${basedir}/${tomcat.project}" type="dir" />
-
- </target>
-
- <target name="get.source" unless="source.exists">
-
- <antcall target="checkout" />
-
- </target>
-
-</project>
Copied: tags/tomcat5.5/5.5.20-2/build.xml (from rev 2757, branches/tomcat5.5/feature/debian/build.xml)
Deleted: tags/tomcat5.5/5.5.20-2/connectors/util/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/connectors/util/build.xml 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/connectors/util/build.xml 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,151 +0,0 @@
-<project name="tomcat-util" default="build-main" basedir=".">
-
- <!-- ===================== Initialize Property Values =================== -->
- <property file="${user.home}/build.properties"/>
- <property file="build.properties"/>
- <property file="../build.properties.default"/>
- <property file="build.properties.sample"/>
-
- <property name="tomcat-util.build" value="${basedir}/build"/>
-
- <property name="jsse.home" location="${base.path}/jsse1.0.2"/>
- <property name="jsse.lib" location="${jsse.home}/lib"/>
- <property name="jsse.jar" location="${jsse.lib}/jsse.jar"/>
- <property name="jnet.jar" location="${jsse.lib}/jnet.jar"/>
- <property name="jcert.jar" location="${jsse.lib}/jcert.jar"/>
-
- <property name="puretls.home" location="${base.path}/puretls"/>
- <property name="puretls.lib" location="${puretls.home}"/>
- <property name="puretls.jar" location="${puretls.lib}/puretls.jar"/>
-
- <property name="commons-logging.jar" location="${base.path}/commons-logging-1.0.4/commons-logging.jar" />
- <property name="jmx.jar" location="${base.path}/mx4j-2.0.1/lib/mx4j.jar" />
- <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
- <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
- <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
- <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
-
- <path id="compile.classpath">
- <pathelement location="${jmx.jar}" />
- <pathelement location="${jsse.jar}" />
- <pathelement location="${java.home}/lib/jsse.jar" />
- <pathelement location="${jnet.jar}" />
- <pathelement location="${jcert.jar}" />
- <pathelement location="${puretls.jar}" />
- <pathelement location="${commons-logging.jar}" />
- <pathelement location="${commons-modeler.jar}" />
- <pathelement location="${tomcat-jni.jar}" />
- </path>
-
- <target name="detect">
- <available property="jsse.present" classname="javax.net.ssl.SSLSocket"/>
- <available property="jmx.present" file="${jmx.jar}"/>
- <available property="puretls.present" file="${puretls.jar}"/>
- <available property="commons-logging.present" file="${commons-logging.jar}"/>
- <available property="modeler.present" file="${commons-modeler.jar}"/>
- <available property="jdk1.4.present" classname="java.lang.CharSequence" />
- <available property="jdk1.5.present" classname="javax.net.ssl.CertPathTrustManagerParameters" />
- </target>
-
- <target name="build-prepare" depends="detect">
- <mkdir dir="${tomcat-util.build}"/>
- <mkdir dir="${tomcat-util.build}/classes"/>
- <mkdir dir="${tomcat-util.lib}"/>
- </target>
-
- <target name="build-main" depends="tomcat-util.jar"/> <!--tomcat-loader.jar -->
-
- <target name="tomcat-util.jar" depends="build-prepare">
- <echo message="----- Java-utils -----" />
- <echo message="-- puretls.present = ${puretls.present}" />
- <echo message="-- jsse.present = ${jsse.present} ${jsse.jar}"/>
- <echo message="-- commons-logging = ${commons-logging.present}"/>
- <echo message="-- jmx = ${jmx.present} ${jmx.jar}"/>
- <echo message="-- modeler = ${modeler.present} ${commons-modeler.jar}"/>
- <echo message="-- skip.digester = ${skip.digester}" />
- <echo message="-- JDK14 = ${jdk1.4.present}"/>
- <echo message="-- JDK15 = ${jdk1.5.present}" />
-
- <javac srcdir="java"
- destdir="${tomcat-util.build}/classes"
- deprecation="${compile.deprecation}"
- debug="${compile.debug}"
- optimize="off"
- verbose="off"
- excludes="**/CVS/**">
- <classpath refid="compile.classpath"/>
- <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
- <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
- <exclude name="**/util/net/puretls/*" unless="puretls.present"/>
- <exclude name="**/util/mx/*" unless="jmx.present"/>
- <exclude name="**/util/threads/ThreadPoolMX*" unless="modeler.present"/>
- <exclude name="**/util/compat/Jdk14Compat.java" unless="jdk1.4.present" />
- <exclude name="**/util/net/jsse/JSSE14*" unless="jdk1.4.present" />
- <exclude name="**/util/net/jsse/JSSE15*" unless="jdk1.5.present" />
- <exclude name="**/util/net/jsse/JSSEKeyManager.java" unless="jdk1.4.present" />
- <exclude name="**/util/digester/*" if="skip.digester" />
- </javac>
-
- <!-- Copy static resource files -->
- <copy todir="${tomcat-util.build}/classes">
- <fileset dir="java">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <!-- Copy static resource files -->
- <copy todir="${tomcat-util.build}/classes">
- <fileset dir="java">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <jar jarfile="${tomcat-util.jar}"
- index="true"
- basedir="${tomcat-util.build}/classes"
- manifest="java/tomcat-util.manifest" >
- <include name="org/apache/tomcat/util/**"/>
- </jar>
-
- </target>
-
- <target name="tomcat-loader.jar" depends="build-prepare">
- <mkdir dir="${tomcat-util.build}/loader"/>
- <javac srcdir="loader"
- destdir="${tomcat-util.build}/loader"
- deprecation="${compile.deprecation}"
- debug="${compile.debug}"
- optimize="off"
- verbose="off"
- excludes="**/CVS/**">
- <classpath refid="compile.classpath"/>
- </javac>
- <jar jarfile="${tomcat-loader.jar}"
- index="true"
- basedir="${tomcat-util.build}/loader"
- manifest="loader/tomcat-loader.manifest" >
- <include name="org/apache/tomcat/util/loader/**"/>
- </jar>
- </target>
-
- <!-- ================ BUILD: Create Tomcat-Util Javadocs =================== -->
- <target name="javadoc" unless="docs-uptodate">
- <delete dir="${tomcat-util.build}/javadoc"/>
- <mkdir dir="${tomcat-util.build}/javadoc"/>
- <javadoc packagenames="org.apache.tomcat.util.*"
- sourcepath="java"
- destdir="${tomcat-util.build}/javadoc"
- author="true"
- version="true"
- windowtitle="Tomcat Utilities Documentation"
- doctitle="Tomcat Utilities"
- bottom="Copyright © 2001 Apache Software Foundation. All Rights Reserved.">
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
-
- <target name="clean">
- <delete dir="${tomcat-util.build}"/>
- </target>
-</project>
Copied: tags/tomcat5.5/5.5.20-2/connectors/util/build.xml (from rev 2750, branches/tomcat5.5/feature/debian/connectors/util/build.xml)
Deleted: tags/tomcat5.5/5.5.20-2/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
===================================================================
--- branches/tomcat5.5/feature/debian/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,88 +0,0 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tomcat.util.net.jsse;
-
-import java.net.Socket;
-
-import org.apache.tomcat.util.compat.JdkCompat;
-import org.apache.tomcat.util.net.SSLImplementation;
-import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.ServerSocketFactory;
-
-/* JSSEImplementation:
-
- Concrete implementation class for JSSE
-
- @author EKR
-*/
-
-public class JSSEImplementation extends SSLImplementation
-{
- static final String JSSE15Factory =
- "org.apache.tomcat.util.net.jsse.JSSE15Factory";
- static final String JSSE14Factory =
- "org.apache.tomcat.util.net.jsse.JSSE14Factory";
- static final String JSSE13Factory =
- "org.apache.tomcat.util.net.jsse.JSSE13Factory";
- static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
-
- static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(JSSEImplementation.class);
-
- private JSSEFactory factory = null;
-
- public JSSEImplementation() throws ClassNotFoundException {
- // Check to see if JSSE is floating around somewhere
- Class.forName(SSLSocketClass);
- if( JdkCompat.isJava15() ) {
- try {
- Class factcl = Class.forName(JSSE15Factory);
- factory = (JSSEFactory)factcl.newInstance();
- } catch(Exception ex) {
- if(logger.isDebugEnabled())
- logger.debug("Error getting factory: " + JSSE15Factory, ex);
- }
- }
- if(factory == null && JdkCompat.isJava14() ) {
- try {
- Class factcl = Class.forName(JSSE14Factory);
- factory = (JSSEFactory)factcl.newInstance();
- } catch(Exception ex) {
- if(logger.isDebugEnabled()) {
- logger.debug("Error getting factory: " + JSSE14Factory, ex);
- }
- }
- } if(factory == null) {
- factory = new JSSE13Factory();
- }
- }
-
-
- public String getImplementationName(){
- return "JSSE";
- }
-
- public ServerSocketFactory getServerSocketFactory() {
- ServerSocketFactory ssf = factory.getSocketFactory();
- return ssf;
- }
-
- public SSLSupport getSSLSupport(Socket s) {
- SSLSupport ssls = factory.getSSLSupport(s);
- return ssls;
- }
-}
Copied: tags/tomcat5.5/5.5.20-2/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java (from rev 2750, branches/tomcat5.5/feature/debian/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java)
Deleted: tags/tomcat5.5/5.5.20-2/container/catalina/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/container/catalina/build.xml 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/container/catalina/build.xml 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,1213 +0,0 @@
-<project name="Catalina" default="deploy" basedir=".">
-
-
- <!-- ===================== Initialize Property Values =================== -->
-
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
- <!--property file="build.properties"/>
- <property file="../build.properties"/>
- <property file="${user.home}/build.properties"/-->
-
- <!-- Build Defaults -->
- <property name="catalina.home" location=".."/>
- <property name="catalina.build" value="${catalina.home}/catalina/build"/>
- <property name="classes.dir" value="${catalina.build}/server/classes" />
- <property name="catalina.deploy" value="${catalina.home}/build"/>
- <property name="catalina.dist" value="${catalina.home}/dist"/>
- <property name="test.failonerror" value="true"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
- <property name="test.webapp" value="../webapps/build/ROOT"/>
- <property name="test.webapp.war" value="${java.io.tmpdir}/webapp.war"/>
-
- <!-- Source dependencies -->
- <property name="tomcat-util.home" value="${jtc.home}/util"/>
- <property name="tomcat-coyote.home" value="${jtc.home}/coyote"/>
- <property name="tomcat-jk.home" value="${jtc.home}/jk"/>
- <property name="tomcat-http11.home" value="${jtc.home}/http11"/>
-
- <!-- Dependent JARs and files -->
- <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
- <property name="servlet-api.jar" value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
- <property name="tomcat-util.jar"
- value="${tomcat-util.home}/build/lib/tomcat-util.jar"/>
- <property name="tomcat-coyote.jar"
- value="${tomcat-coyote.home}/build/lib/tomcat-coyote.jar"/>
- <property name="tomcat-jk2.jar"
- value="${tomcat-jk.home}/build/lib/tomcat-jk2.jar"/>
- <property name="tomcat-jni.jar"
- value="${tomcat-jk.home}/build/lib/tomcat-jni.jar"/>
- <property name="jk2.properties"
- value="${tomcat-jk.home}/build/conf/jk2.properties"/>
- <property name="tomcat-http11.jar"
- value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
- <property name="tomcat-dbcp.jar"
- value="${base.path}/tomcat-deps/naming-factory-dbcp.jar"/>
- <!-- Construct Catalina classpath -->
- <path id="catalina.classpath">
- <pathelement location="${activation.jar}"/>
- <pathelement location="${ant.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${tomcat-dbcp.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${commons-fileupload.jar}"/>
- <pathelement location="${commons-launcher.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-modeler.jar}"/>
- <pathelement location="${tomcat-util.jar}"/>
- <pathelement location="${tomcat-coyote.jar}"/>
- <pathelement location="${jaas.jar}"/>
- <pathelement location="${javagroups.jar}"/>
- <pathelement location="${jcert.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${jmx-remote.jar}"/>
- <pathelement location="${jndi.jar}"/>
- <pathelement location="${jnet.jar}"/>
- <pathelement location="${jsse.jar}"/>
- <pathelement location="${java.home}/lib/jsse.jar"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${ldap.jar}"/>
- <pathelement location="${mail.jar}"/>
- <pathelement location="${regexp.jar}"/>
- <pathelement location="${servlet-api.jar}"/>
- <pathelement location="${xercesImpl.jar}"/>
- <pathelement location="${xml-apis.jar}"/>
- <pathelement location="${classes.dir}"/>
- </path>
-
- <!-- Construct unit tests classpath -->
- <path id="test.classpath">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${activation.jar}"/>
- <pathelement location="${ant.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${tomcat-dbcp.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
- <pathelement location="${commons-fileupload.jar}"/>
- <pathelement location="${commons-launcher.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-modeler.jar}"/>
- <pathelement location="${jaas.jar}"/>
- <pathelement location="${jcert.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${jndi.jar}"/>
- <pathelement location="${jnet.jar}"/>
- <pathelement location="${jsse.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${ldap.jar}"/>
- <pathelement location="${mail.jar}"/>
- <pathelement location="${regexp.jar}"/>
- <pathelement location="${servlet-api.jar}"/>
- <pathelement location="${xercesImpl.jar}"/>
- <pathelement location="${xml-apis.jar}"/>
- <pathelement location="${classes.dir}"/>
- <pathelement location="${catalina.build}/tests"/>
- </path>
-
- <!-- Source path -->
- <path id="javadoc.sourcepath">
- <pathelement location="src/share"/>
- <pathelement location="${tomcat-util.home}/java"/>
- <pathelement location="${tomcat-coyote.home}/src/java"/>
- <pathelement location="${tomcat-jk.home}/java"/>
- <pathelement location="${tomcat-http11.home}/src/java"/>
- <pathelement location="../modules/cluster/src/share"/>
- <pathelement location="../modules/storeconfig/src/share"/>
- </path>
-
-
- <!-- =================== BUILD: Set compile flags ======================= -->
- <target name="flags">
-
- <!-- JDK flags -->
- <available property="jdk.1.2.present" classname="java.util.HashMap" />
- <available property="jdk.1.3.present"
- classname="java.lang.reflect.Proxy" />
- <available property="jdk.1.4.present" classname="java.nio.Buffer" />
- <available property="jdk.1.5.present"
- classname="java.util.concurrent.Semaphore" />
-
- <!-- Ant flags -->
- <available property="style.available"
- classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
-
- <!-- Source path -->
- <available property="jtc.home.present" file="${jtc.home}" />
-
- <!-- Class availability flags -->
- <available property="beanutils.present"
- classname="org.apache.commons.beanutils.BeanUtils"
- classpath="${commons-beanutils.jar}"/>
- <available property="collections.present"
- classname="org.apache.commons.collections.FastHashMap"
- classpath="${commons-collections.jar}"/>
- <available property="dbcp.present"
- classname="org.apache.tomcat.dbcp.dbcp.ConnectionFactory"
- classpath="${tomcat-dbcp.jar}"/>
- <available property="digester.present"
- classname="org.apache.commons.digester.Digester"
- classpath="${commons-digester.jar}"/>
- <available property="fileupload.present"
- classname="org.apache.commons.fileupload.FileUpload"
- classpath="${commons-fileupload.jar}"/>
- <available property="launcher.present"
- classname="org.apache.commons.launcher.Launcher"
- classpath="${commons-launcher.jar}"/>
- <available property="launcher.bootstrap.present"
- file="${commons-launcher.bootstrap.class}"/>
- <available property="logging.present"
- classname="org.apache.commons.logging.Log"
- classpath="${commons-logging.jar}"/>
- <available property="modeler.present"
- classname="org.apache.commons.modeler.Registry"
- classpath="${commons-modeler.jar}:${jmx.jar}"/>
- <available property="jaas.present"
- classname="javax.security.auth.Subject"
- classpath="${jaas.jar}" />
- <condition property="jaxp.present">
- <and>
- <available classname="javax.xml.parsers.SAXParser"
- classpath="${xml-apis.jar}" />
- <available classname="org.xml.sax.ContentHandler"
- classpath="${xml-apis.jar}" />
- </and>
- </condition>
- <condition property="javamail.present">
- <and>
- <available classname="javax.activation.DataSource"
- classpath="${activation.jar}" />
- <available classname="javax.mail.Service"
- classpath="${mail.jar}" />
- </and>
- </condition>
- <available property="jmx.present"
- classname="javax.management.MBeanServer"
- classpath="${jmx.jar}" />
- <available property="jndi.present"
- classname="javax.naming.Context"
- classpath="${jndi.jar}" />
- <condition property="jsse.present">
- <and>
- <available classname="javax.security.cert.Certificate"
- classpath="${jcert.jar}" />
- <available classname="javax.net.SocketFactory"
- classpath="${jnet.jar}" />
- <available classname="javax.net.ssl.SSLSocket"
- classpath="${jsse.jar}" />
- </and>
- </condition>
- <available property="jta.present"
- classname="javax.transaction.UserTransaction"
- classpath="${jta.jar}" />
- <available property="junit.present"
- classname="junit.framework.TestCase"
- classpath="${junit.jar}" />
- <available property="ldap.present"
- classname="com.sun.jndi.ldap.LdapClient"
- classpath="${ldap.jar}" />
- <available property="pool.present"
- classname="org.apache.tomcat.dbcp.pool.ObjectPool"
- classpath="${tomcat-dbcp.jar}"/>
- <available property="regexp.present"
- classname="org.apache.regexp.RE"
- classpath="${regexp.jar}" />
- <available property="xerces.present"
- classname="org.apache.xerces.parsers.SAXParser"
- classpath="${xercesImpl.jar}" />
-
- <!-- JAR files availability flags -->
- <available property="dbcp.jar.present" file="${tomcat-dbcp.jar}" />
- <available property="fileupload.jar.present" file="${commons-fileupload.jar}" />
- <available property="jaas.jar.present" file="${jaas.jar}" />
- <condition property="javamail.jar.present">
- <and>
- <available file="${activation.jar}" />
- <available file="${mail.jar}" />
- </and>
- </condition>
- <available property="jmx.jar.present" file="${jmx.jar}" />
- <available property="jcert.jar.present" file="${jcert.jar}" />
- <available property="jndi.jar.present" file="${jndi.jar}" />
- <available property="jnet.jar.present" file="${jnet.jar}" />
- <available property="jsse.jar.present" file="${jsse.jar}" />
- <available property="jta.jar.present" file="${jta.jar}" />
- <available property="junit.jar.present" file="${junit.jar}" />
- <condition property="launcher.jars.present">
- <and>
- <equals arg1="${launcher.present}" arg2="true"/>
- <equals arg1="${launcher.bootstrap.present}" arg2="true"/>
- </and>
- </condition>
- <available property="ldap.jar.present" file="${ldap.jar}" />
- <available property="logging.jar.present" file="${commons-logging.jar}" />
- <available property="modeler.jar.present" file="${commons-modeler.jar}" />
- <available property="pool.jar.present" file="${tomcat-dbcp.jar}" />
- <available property="regexp.jar.present" file="${regexp.jar}" />
- <available property="servlet-api.jar.present" file="${servlet-api.jar}" />
- <available property="tomcat-util.jar.present" file="${tomcat-util.jar}" />
- <available property="xercesImpl.jar.present" file="${xercesImpl.jar}"/>
- <available property="xml-apis.jar.present" file="${xml-apis.jar}"/>
- <condition property="xerces2.jars.present">
- <and>
- <equals arg1="${xercesImpl.jar.present}" arg2="true"/>
- <equals arg1="${xml-apis.jar.present}" arg2="true"/>
- </and>
- </condition>
-
- <!-- Conditional compilation flags (determined from the flags above) -->
- <condition property="compile.dbcp">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${dbcp.present}" arg2="true" />
- <equals arg1="${pool.present}" arg2="true" />
- </and>
- </or>
- </condition>
- <condition property="compile.jaas">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jaas.present}" arg2="true" />
- </or>
- </condition>
- <condition property="compile.javamail">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${javamail.present}" arg2="true" />
- </or>
- </condition>
- <condition property="compile.jmx">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${jmx.present}" arg2="true" />
- <equals arg1="${modeler.present}" arg2="true" />
- </and>
- </or>
- </condition>
- <condition property="compile.jndi">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jndi.present}" arg2="true" />
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- </or>
- </condition>
- <condition property="compile.jsse">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jsse.present}" arg2="true" />
- <equals arg1="${jdk.1.4.present}" arg2="true" />
- </or>
- </condition>
- <condition property="compile.jta">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jta.present}" arg2="true" />
- </or>
- </condition>
- <condition property="compile.junit">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${junit.present}" arg2="true" />
- </or>
- </condition>
- <condition property="compile.launcher">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${launcher.present}" arg2="true" />
- <equals arg1="${launcher.bootstrap.present}" arg2="true" />
- </and>
- </or>
- </condition>
- <condition property="compile.ldap">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${ldap.present}" arg2="true" />
- <equals arg1="${jdk.1.3.present}" arg2="true" />
- </or>
- </condition>
- <property name="compile.ssi" value="true"/>
-
-
- <!-- Conditional copy flags (determined from the flags above) -->
- <condition property="copy.dbcp.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${dbcp.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.jmx.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${jmx.jar.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.lang.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${lang.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.launcher.jars">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${launcher.jars.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.modeler.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${modeler.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.logging.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${logging.present}" arg2="true" />
- </or>
- </condition>
- <condition property="copy.pool.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${pool.present}" arg2="true" />
- </or>
- </condition>
-
- </target>
-
-
- <!-- =================== BUILD: Set compile flags ======================= -->
- <target name="flags.display" depends="flags" unless="flags.hide">
-
- <echo message="--- Build environment for Catalina ---" />
-
- <echo message="If ${property_name} is displayed, then the property is not set)" />
-
- <echo message="--- Build options ---" />
- <echo message="full.dist=${full.dist}" />
- <echo message="build.sysclasspath=${build.sysclasspath}" />
- <echo message="compile.debug=${compile.debug}" />
- <echo message="compile.deprecation=${compile.deprecation}" />
- <echo message="compile.optimize=${compile.optimize}" />
-
- <echo message="--- Ant Flags ---" />
- <echo message="<style> task available (required)=${style.available}" />
-
- <echo message="--- JDK ---" />
- <echo message="jdk.1.2.present=${jdk.1.2.present}" />
- <echo message="jdk.1.3.present=${jdk.1.3.present}" />
- <echo message="jdk.1.4.present=${jdk.1.4.present}" />
-
- <echo message="--- Source Dependencies ---" />
- <echo message="jtc.home.present=${jtc.home.present}" />
-
- <echo message="--- Required Libraries ---" />
- <echo message="beanutils.present=${beanutils.present}" />
- <echo message="collections.present=${collections.present}" />
- <echo message="digester.present=${digester.present}" />
- <echo message="jaxp.present=${jaxp.present}" />
- <echo message="jndi.present=${jndi.present}" />
- <echo message="logging.present=${logging.present}" />
- <echo message="regexp.present=${regexp.present}" />
-
- <echo message="--- Optional Libraries ---" />
- <echo message="dbcp.present=${dbcp.present}" />
- <echo message="fileupload.present=${fileupload.present}" />
- <echo message="jaas.present=${jaas.present}" />
- <echo message="javamail.present=${javamail.present}" />
- <echo message="jmx.present=${jmx.present}" />
- <echo message="jsse.present=${jsse.present}" />
- <echo message="jta.present=${jta.present}" />
- <echo message="junit.present=${junit.present}" />
- <echo message="lang.present=${lang.present}" />
- <echo message="launcher.present=${launcher.present}" />
- <echo message="launcher.bootstrap.present=${launcher.bootstrap.present}" />
- <echo message="ldap.present=${ldap.present}" />
- <echo message="modeler.present=${modeler.present}" />
- <echo message="pool.present=${pool.present}" />
-
- <echo message="--- Required JARs ---" />
- <echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
- <echo message="regexp.jar.present=${regexp.jar.present}" />
- <echo message="servlet-api.jar.present=${servlet-api.jar.present}" />
- <echo message="xerces2.jars.present(except JDK 1.4+)=${xerces2.jars.present}" />
-
- <echo message="--- Optional JARs ---" />
- <echo message="dbcp.jar.present=${dbcp.jar.present}" />
- <echo message="fileupload.jar.present=${fileupload.jar.present}" />
- <echo message="jaas.jar.present=${jaas.jar.present}" />
- <echo message="javamail.jar.present=${javamail.jar.present}" />
- <echo message="jmx.jar.present=${jmx.jar.present}" />
- <echo message="jta.jar.present=${jta.jar.present}" />
- <echo message="junit.jar.present=${junit.jar.present}" />
- <echo message="modeler.jar.present=${modeler.jar.present}" />
- <echo message="pool.jar.present=${pool.jar.present}" />
-
- <echo message="--- Conditional compilation flags ---" />
- <echo message="compile.dbcp=${compile.dbcp}" />
- <echo message="compile.jaas=${compile.jaas}" />
- <echo message="compile.javamail=${compile.javamail}" />
- <echo message="compile.jmx=${compile.jmx}" />
- <echo message="compile.jndi=${compile.jndi}" />
- <echo message="compile.jsse=${compile.jsse}" />
- <echo message="compile.jta=${compile.jta}" />
- <echo message="compile.junit=${compile.junit}" />
- <echo message="compile.ldap=${compile.ldap}" />
- <echo message="compile.ssi=${compile.ssi}" />
-
- <echo message="--- Distribution flags ---" />
- <echo message="copy.dbcp.jar=${copy.dbcp.jar}" />
- <echo message="copy.jmx.jar=${copy.jmx.jar}" />
- <echo message="copy.launcher.jars=${copy.launcher.jars}" />
- <echo message="copy.logging.jar=${copy.logging.jar}" />
- <echo message="copy.modeler.jar=${copy.modeler.jar}" />
- <echo message="copy.pool.jar=${copy.pool.jar}" />
-
- </target>
-
- <!-- =================== BUILD: Create Directories ====================== -->
- <target name="build-prepare">
-
- <mkdir dir="${catalina.build}"/>
- <mkdir dir="${catalina.build}/bin"/>
- <mkdir dir="${catalina.build}/common/classes"/>
- <mkdir dir="${catalina.build}/common/lib"/>
- <mkdir dir="${catalina.build}/common/endorsed"/>
- <mkdir dir="${catalina.build}/conf"/>
- <mkdir dir="${catalina.build}/logs"/>
- <mkdir dir="${classes.dir}"/>
- <mkdir dir="${catalina.build}/server/lib"/>
- <mkdir dir="${catalina.build}/shared/classes"/>
- <mkdir dir="${catalina.build}/shared/lib"/>
- <mkdir dir="${catalina.build}/work"/>
- <mkdir dir="${catalina.build}/temp"/>
-
- </target>
-
-
- <!-- ======================== BUILD: Copy JARs ========================== -->
- <target name="copy-dbcp.jar" if="copy.dbcp.jar">
- <copy todir="${catalina.build}/common/lib" file="${commons-dbcp.jar}"/>
- </target>
- <target name="copy-fileupload.jar" if="fileupload.jar.present">
- </target>
- <target name="copy-jmx.jar" if="copy.jmx.jar">
- <copy tofile="${catalina.build}/bin/jmx.jar" file="${jmx.jar}"/>
- </target>
- <target name="copy-launcher.jars" if="copy.launcher.jars">
- <!-- <copy todir="${catalina.build}/common/lib" file="${ant.jar}"/> -->
- <copy todir="${catalina.build}/bin" file="${commons-launcher.jar}"/>
- <copy todir="${catalina.build}/bin" file="${commons-launcher.bootstrap.class}"/>
- <copy todir="${catalina.build}/bin">
- <fileset dir="src/bin" includes="*-using-launcher.*,launcher.properties,catalina.xml" />
- </copy>
- </target>
- <target name="copy-modeler.jar" if="copy.modeler.jar">
- <copy todir="${catalina.build}/server/lib" file="${commons-modeler.jar}"/>
- </target>
- <target name="copy-pool.jar" if="copy.pool.jar">
- <copy todir="${catalina.build}/common/lib" file="${commons-pool.jar}"/>
- </target>
- <target name="copy-tomcat-util.jar">
- <!--
- <copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
- -->
- <jar jarfile="${tomcat-util.jar}"
- index="true">
- <fileset dir="${catalina.build}/classes">
- <include name="org/apache/tomcat/util/**"/>
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
- </target>
- <target name="copy-xerces2.jars">
- <copy todir="${catalina.build}/common/endorsed" file="${xercesImpl.jar}"/>
- <copy todir="${catalina.build}/common/endorsed" file="${xml-apis.jar}"/>
- </target>
-
-
- <!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static" depends="flags,flags.display,build-prepare,copy-fileupload.jar,copy-launcher.jars,copy-modeler.jar">
-
- <!-- Executable Commands -->
- <copy todir="${catalina.build}/bin">
- <fileset dir="src/bin" excludes="*-using-launcher.*,launcher.properties,catalina.xml,*-tasks.xml" />
- </copy>
- <fixcrlf srcdir="${catalina.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${catalina.build}/bin" includes="*.bat" eol="crlf"/>
- <chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
-
- <!-- Common Extensions -->
- <copy todir="${catalina.build}/bin"
- file="${commons-logging-api.jar}"/>
-<!--
- <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
--->
- <copy todir="${catalina.build}/common/lib"
- file="${tomcat-dbcp.jar}" />
-
- <!-- Configuration Files -->
- <copy todir="${catalina.build}/conf">
- <fileset dir="src/conf">
- <exclude name="catalina.conf.xml" />
- </fileset>
- </copy>
-
- <!-- JVM Temporary Directory README -->
- <copy todir="${catalina.build}/temp"
- file="src/temp/README.txt"/>
-
- <!-- Catalina Server Libraries -->
- <!--
- <copy todir="${catalina.build}/server/lib" file="${regexp.jar}"/>
- -->
-
- </target>
-
-
- <!-- =================== BUILD: Build tomcat-util ======================= -->
- <target name="build-tomcat-util">
-
- <ant dir="${tomcat-util.home}" target="build-main">
- <property name="jmx.jar" value="${jmx.jar}" />
- <property name="puretls.jar" value="${puretls.jar}" />
- <property name="jsse.lib" value="${jsse.lib}" />
- </ant>
-
- <copy todir="${catalina.build}/server/lib"
- file="${tomcat-util.jar}"/>
-
- </target>
-
-
- <!-- ================ BUILD: Compile Catalina Components ================ -->
- <target name="build-catalina" depends="build-catalina-core,build-catalina-optional"/>
-
- <target name="build-catalina-core">
- <!-- Compile internal server components -->
- <javac srcdir="src/share" destdir="${classes.dir}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- optimize="${compile.optimize}"
- excludes="**/CVS/**">
- <classpath refid="catalina.classpath" />
-
- <exclude name="org/apache/catalina/util/ProcessHelper.java"
- unless="jdk.1.3.present"/>
- <exclude name="org/apache/catalina/valves/CertificatesValve.java"
- unless="compile.jsse"/>
-
- <exclude name="org/apache/catalina/servlets/CGIServlet.java" />
- <exclude name="org/apache/catalina/servlets/HTMLManagerServlet.java" />
- <exclude name="org/apache/naming/factory/DbcpDataSourceFactory.java" />
- <exclude name="org/apache/catalina/ssi/**"/>
- <exclude name="org/apache/catalina/cluster/**"/>
- <exclude name="org/apache/naming/factory/MailSessionFactory.java"/>
- <exclude name="org/apache/naming/factory/SendMailFactory.java"/>
- <exclude name="org/apache/catalina/launcher/**"/>
- <exclude name="org/apache/catalina/valves/SemaphoreValve.java"/>
- </javac>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
- <!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
- <copy todir="${classes.dir}" filtering="true" encoding="ISO-8859-1">
- <fileset dir="src/share">
- <exclude name="**/*.java"/>
- <exclude name="**/*.ser"/>
- </fileset>
- </copy>
- <copy todir="${classes.dir}">
- <fileset dir="src/share">
- <include name="**/*.ser"/>
- </fileset>
- </copy>
-
- </target>
-
-
-
-
- <target name="build-catalina-optional" unless="build.tomcat.base">
- <!-- Compile internal server components -->
- <javac srcdir="src/share" destdir="${classes.dir}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- source="${compile.source}"
- excludes="**/CVS/**">
- <classpath refid="catalina.classpath" />
- <exclude name="org/apache/naming/factory/MailSessionFactory.java"
- unless="compile.javamail"/>
- <exclude name="org/apache/naming/factory/SendMailFactory.java"
- unless="compile.javamail"/>
- <exclude name="org/apache/catalina/valves/CertificatesValve.java"
- unless="compile.jsse"/>
- <exclude name="org/apache/catalina/valves/SemaphoreValve.java"
- unless="jdk.1.5.present"/>
- </javac>
-
- <!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <copy todir="${classes.dir}" filtering="true">
- <fileset dir="src/share">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================== BUILD: Build tomcat-coyote ====================== -->
- <target name="build-tomcat-coyote">
-
- <ant dir="${tomcat-coyote.home}" target="compile">
- <property name="catalina.home" value="${catalina.deploy}"/>
- <property name="servlet.jar" value="${servlet-api.jar}"/>
- <property name="commons-logging.jar" value="${commons-logging.jar}"/>
- <property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
- <property name="jmx.jar" value="${jmx.jar}"/>
- </ant>
-
- <!--
- <copy todir="${catalina.deploy}/server/lib"
- file="${tomcat-coyote.jar}"/>
- -->
-
- </target>
-
-
- <!-- ==================== BUILD: Build tomcat-jk ======================== -->
- <target name="build-tomcat-jk">
-
- <ant dir="${tomcat-jk.home}" target="build-main">
- <property name="tomcat5.home" value="${catalina.deploy}"/>
- <property name="commons-logging.jar" value="${commons-logging.jar}"/>
- <property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
- <property name="jmx.jar" value="${jmx.jar}"/>
- </ant>
-
- <!--
- <copy tofile="${catalina.deploy}/server/lib/tomcat-ajp.jar"
- file="${tomcat-jk2.jar}"/>
- -->
- <!--
- <copy todir="${catalina.deploy}/conf"
- file="${jk2.properties}"/>
- -->
-
- </target>
-
-
- <!-- ============== BUILD: Build tomcat-coyote-http11 =================== -->
- <target name="build-tomcat-http11">
-
- <ant dir="${tomcat-http11.home}" target="compile">
- <property name="commons-logging.jar" value="${commons-logging.jar}"/>
- <property name="commons-modeler.jar" value="${commons-modeler.jar}"/>
- <property name="jmx.jar" value="${jmx.jar}"/>
- </ant>
- <!--
- <copy todir="${catalina.deploy}/server/lib"
- file="${tomcat-http11.jar}"/>
- -->
-
- </target>
-
-
- <!-- ================= BUILD: Compile All Server Components ============= -->
- <target name="build-main" depends="build-static,build-tomcat-util,build-catalina">
- </target>
-
-
- <!-- ================ BUILD: Create Catalina Javadocs =================== -->
- <target name="javadoc" unless="docs.uptodate" >
- <delete dir="${catalina.build}/javadoc"/>
- <mkdir dir="${catalina.build}/javadoc"/>
-
- <!-- To fix Bugzilla 35880, we need to ensure files that use J2SE 5.0
- syntax are not JavaDoc'ed. Even though no other target uses
- javadoc.sourcepath and I could rewrite the javadoc target below,
- that might impact users who use javadoc.sourcepath in their own
- build scripts. Accordingly, let's try this ugly temporary
- fix. When we start building Tomcat with J2SE 5.0, we can remove
- this ugliness.
- -->
- <move file="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java"
- tofile="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp" />
-
- <javadoc packagenames="org.apache.*"
- classpathref="catalina.classpath"
- sourcepathref="javadoc.sourcepath"
- destdir="${catalina.build}/javadoc"
- author="true"
- version="true"
- windowtitle="Tomcat API Documentation"
- doctitle="Tomcat API"
- bottom="Copyright © 2000-2005 Apache Software Foundation. All Rights Reserved."
- additionalparam="-breakiterator">
- <excludepackage name="org.apache.ajp.*" />
- <excludepackage name="org.apache.coyote.tomcat3" />
- <excludepackage name="org.apache.coyote.tomcat4" />
- <excludepackage name="org.apache.jk.apr" />
-
- </javadoc>
-
- <move file="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp"
- tofile="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java" />
- </target>
-
-
- <!-- ======================= BUILD: Clean Directory ===================== -->
- <target name="build-clean">
-
- <delete dir="${catalina.build}"/>
-
- <ant dir="${tomcat-util.home}" target="clean"/>
- <ant dir="${tomcat-coyote.home}" target="clean"/>
- <ant dir="${tomcat-jk.home}" target="clean"/>
- <ant dir="${tomcat-http11.home}" target="clean"/>
-
- </target>
-
-
- <!-- ==================== BUILD: Rebuild Everything ===================== -->
- <target name="all" depends="build-clean,build-main"
- description="Clean, build, and deploy Catalina component"/>
-
-
- <!-- ================ TEST: Compile Unit Tests ========================== -->
- <target name="build-tests" depends="build-main" if="junit.present">
- <mkdir dir="${catalina.build}/tests"/>
- <!-- Compile unit test classes -->
- <javac srcdir="src/test" destdir="${catalina.build}/tests"
- deprecation="${compile.deprecation}"
- debug="${compile.debug}"
- optimize="off"
- source="${compile.source}"
- excludes="**/CVS/**">
- <classpath refid="test.classpath"/>
- </javac>
- </target>
-
-
- <!-- ==================== TEST: Execute Unit Tests ====================== -->
- <target name="test" if="junit.present"
- description="Run all unit test cases"
- depends="build-tests,test-dir-context,test-util">
- </target>
-
- <target name="test-dir-context" if="junit.present">
-
- <echo message="Running FileDirContext tests"/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="doc.base" value="${test.webapp}"/>
- <arg value="org.apache.naming.resources.FileDirContextTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
-
- <echo message="Running WARDirContext tests"/>
- <jar jarfile="${test.webapp.war}">
- <fileset dir="${test.webapp}"/>
- </jar>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="doc.base" value="${test.webapp.war}"/>
- <arg value="org.apache.naming.resources.WARDirContextTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- <delete file="${test.webapp.war}"/>
-
- </target>
-
- <target name="test-util" if="junit.present">
-
- <echo message="Running CookieTools tests"/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <arg value="org.apache.catalina.util.CookieToolsTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
-
- <echo message="Running URL tests"/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <arg value="org.apache.catalina.util.URLTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
-
- </target>
-
-
- <!-- ====================== DEPLOY: Create Directories ================== -->
- <target name="deploy-prepare">
- <mkdir dir="${catalina.deploy}"/>
- <mkdir dir="${catalina.deploy}/bin"/>
- <mkdir dir="${catalina.deploy}/conf"/>
- <mkdir dir="${catalina.deploy}/logs"/>
- <mkdir dir="${catalina.deploy}/common/classes"/>
- <mkdir dir="${catalina.deploy}/common/endorsed"/>
- <mkdir dir="${catalina.deploy}/common/i18n"/>
- <mkdir dir="${catalina.deploy}/common/lib"/>
- <mkdir dir="${catalina.deploy}/server/classes"/>
- <mkdir dir="${catalina.deploy}/server/lib"/>
- <mkdir dir="${catalina.deploy}/work"/>
- <mkdir dir="${catalina.deploy}/temp"/>
- </target>
-
-
- <!-- ====================== DEPLOY: Copy Static Files =================== -->
- <target name="deploy-static" depends="build-main,deploy-prepare,deploy-static-only,deploy-libs"/>
-
- <target name="deploy-static-only" depends="deploy-prepare">
-
- <!-- Executable Commands -->
- <copy todir="${catalina.deploy}/bin">
- <fileset dir="src/bin" excludes="*-using-launcher.*,launcher.properties,catalina.xml" />
- </copy>
- <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.bat" eol="crlf"/>
- <chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
-
- <!-- Configuration Files -->
- <copy todir="${catalina.deploy}/conf">
- <fileset dir="${catalina.build}/conf" />
- </copy>
-
- </target>
-
- <target name="deploy-libs">
-
- <!-- Common Extensions -->
- <copy todir="${catalina.deploy}/common/endorsed">
- <fileset dir="${catalina.build}/common/endorsed" />
- </copy>
-
- <copy todir="${catalina.deploy}/common/lib">
- <fileset dir="${catalina.build}/common/lib" />
- </copy>
-
- <!-- Server Components -->
- <copy todir="${catalina.deploy}/server/lib">
- <fileset dir="${catalina.build}/server/lib" />
- </copy>
-
- <!-- Shared Extensions -->
-<!--
- <copy todir="${catalina.deploy}/shared/lib">
- <fileset dir="${catalina.build}/shared/lib" />
- </copy>
--->
- </target>
-
-
- <!-- ====================== DEPLOY: Create Catalina JARs ================ -->
- <target name="catalina-jars" depends="build-static,deploy-prepare,flags,flags.display,build-catalina"
- description="Build catalina jars">
-
- <!-- Catalina Bootstrap JAR File. It is a very wrong idea to split packages in multiple jars !!! -->
- <jar jarfile="${catalina.deploy}/bin/bootstrap.jar"
- manifest="etc/bootstrap.MF">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/startup/Bootstrap.class" />
- <include name="org/apache/catalina/startup/catalina.properties" />
- <include name="org/apache/catalina/startup/CatalinaProperties.class" />
- <include name="org/apache/catalina/startup/ClassLoaderFactory.class" />
- <include name="org/apache/catalina/startup/Tool.class" />
- <include name="org/apache/catalina/loader/StandardClassLoader*.class" />
- <include name="org/apache/catalina/loader/Extension.class" />
- <include name="org/apache/catalina/loader/Reloader.class" />
- <include name="org/apache/catalina/security/SecurityClassLoad.class" />
- <include name="org/apache/catalina/launcher/CatalinaLaunchFilter.class" />
- <include name="org/apache/naming/JndiPermission.class" />
- <include name="org/apache/tomcat/util/compat/*" />
-
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Catalina Main JAR File -->
- <!-- Excluding files from here is worse than duplicating them - a loader that uses the
- package name as index and includes both bootstrap and catalina will be confused -->
-
- <jar jarfile="${catalina.deploy}/server/lib/catalina.jar">
- <fileset dir="${classes.dir}">
-
- <include name="org/apache/catalina/**" />
-
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
-
- <!-- Modules -->
- <exclude name="org/apache/catalina/ant/**" />
- <exclude name="org/apache/catalina/cluster/**" />
- <exclude name="org/apache/catalina/launcher/**" />
- <exclude name="org/apache/catalina/servlets/**" />
- <exclude name="org/apache/catalina/startup/Bootstrap.class" />
- <exclude name="org/apache/catalina/storeconfig/**" />
- <exclude name="org/apache/catalina/ssi/**" />
- <exclude name="org/apache/naming/**" />
-
- <!-- Catalina-optional classes -->
- <exclude name="org/apache/catalina/realm/DataSourceRealm.class" />
- <exclude name="org/apache/catalina/realm/JAAS*" />
- <exclude name="org/apache/catalina/realm/JDBC*" />
- <exclude name="org/apache/catalina/realm/JNDI*" />
- <exclude name="org/apache/catalina/realm/Memory*" />
- <exclude name="org/apache/catalina/session/StoreBase.class" />
- <exclude name="org/apache/catalina/session/*Store.class" />
- <exclude name="org/apache/catalina/session/PersistentManager*" />
- <exclude name="org/apache/catalina/util/CGIProcessEnvironment.class" />
- <exclude name="org/apache/catalina/util/CookieTools.class" />
- <exclude name="org/apache/catalina/util/DateTool.class" />
- <exclude name="org/apache/catalina/util/DOMWriter.class" />
- <exclude name="org/apache/catalina/util/FastDateFormat.class" />
- <exclude name="org/apache/catalina/util/IOTools.class" />
- <exclude name="org/apache/catalina/util/MIME2Java.class" />
- <exclude name="org/apache/catalina/util/Process*" />
- <exclude name="org/apache/catalina/util/Queue.class" />
- <exclude name="org/apache/catalina/util/Strftime.class" />
- <exclude name="org/apache/catalina/util/XMLWriter.class" />
- <exclude name="org/apache/catalina/valves/ExtendedAccessLogValve.class" />
- <exclude name="org/apache/catalina/valves/FastCommonAccessLogValve.class" />
- <exclude name="org/apache/catalina/valves/FieldInfo.class" />
- <exclude name="org/apache/catalina/valves/JDBCAccessLogValve.class" />
- <exclude name="org/apache/catalina/valves/PersistentValve.class" />
- <exclude name="org/apache/catalina/valves/Remote*" />
- <exclude name="org/apache/catalina/valves/RequestDumperValve.class" />
- <exclude name="org/apache/catalina/valves/RequestFilterValve.class" />
- <exclude name="org/apache/catalina/valves/SemaphoreValve.class" />
-
- </fileset>
- </jar>
-
- <jar jarfile="${catalina.deploy}/server/lib/catalina-optional.jar">
- <fileset dir="${classes.dir}">
-
- <include name="org/apache/catalina/realm/DataSourceRealm.class" />
- <include name="org/apache/catalina/realm/JAAS*" />
- <include name="org/apache/catalina/realm/JDBC*" />
- <include name="org/apache/catalina/realm/JNDI*" />
- <include name="org/apache/catalina/realm/Memory*" />
- <include name="org/apache/catalina/session/StoreBase.class" />
- <include name="org/apache/catalina/session/*Store.class" />
- <include name="org/apache/catalina/session/PersistentManager*" />
- <include name="org/apache/catalina/util/CGIProcessEnvironment.class" />
- <include name="org/apache/catalina/util/CookieTools.class" />
- <include name="org/apache/catalina/util/DateTool.class" />
- <include name="org/apache/catalina/util/DOMWriter.class" />
- <include name="org/apache/catalina/util/FastDateFormat.class" />
- <include name="org/apache/catalina/util/IOTools.class" />
- <include name="org/apache/catalina/util/MIME2Java.class" />
- <include name="org/apache/catalina/util/Process*" />
- <include name="org/apache/catalina/util/Queue.class" />
- <include name="org/apache/catalina/util/Strftime.class" />
- <include name="org/apache/catalina/util/XMLWriter.class" />
- <include name="org/apache/catalina/valves/ExtendedAccessLogValve.class" />
- <include name="org/apache/catalina/valves/FastCommonAccessLogValve.class" />
- <include name="org/apache/catalina/valves/FieldInfo.class" />
- <include name="org/apache/catalina/valves/JDBCAccessLogValve.class" />
- <include name="org/apache/catalina/valves/PersistentValve.class" />
- <include name="org/apache/catalina/valves/Remote*" />
- <include name="org/apache/catalina/valves/RequestDumperValve.class" />
- <include name="org/apache/catalina/valves/RequestFilterValve.class" />
- <include name="org/apache/catalina/valves/SemaphoreValve.class" />
-
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
-
- </fileset>
- </jar>
-
- <!-- Catalina Ant Tasks JAR File -->
- <jar jarfile="${catalina.deploy}/server/lib/catalina-ant.jar">
- <fileset dir="${classes.dir}">
-
- <include name="org/apache/catalina/ant/*" />
- <include name="org/apache/catalina/util/Base64.class" />
-
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
-
- </fileset>
- </jar>
-
- <!-- Catalina JMX Accessor Ant Tasks JAR File -->
- <jar jarfile="${catalina.deploy}/server/lib/catalina-ant-jmx.jar">
- <fileset dir="${classes.dir}">
-
- <include name="org/apache/catalina/ant/jmx/*" />
-
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
-
- </fileset>
- </jar>
-
- <!-- Naming - Factory JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/naming/**" />
- <exclude name="org/apache/naming/resources/**" />
- <exclude name="org/apache/naming/JndiPermission.class" />
- <exclude name="org/apache/naming/NameParserImpl.class" />
- <exclude name="org/apache/naming/NamingContextBindingsEnumeration.class" />
- <exclude name="org/apache/naming/NamingContextEnumeration.class" />
- <exclude name="org/apache/naming/NamingEntry.class" />
- <exclude name="org/apache/naming/StringManager.class" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Naming - Resources JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/naming/JndiPermission.class" />
- <include name="org/apache/naming/NameParserImpl.class" />
- <include name="org/apache/naming/NamingContextBindingsEnumeration.class" />
- <include name="org/apache/naming/NamingContextEnumeration.class" />
- <include name="org/apache/naming/NamingEntry.class" />
- <include name="org/apache/naming/StringManager.class" />
- <include name="org/apache/naming/resources/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - CGI Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/servlets/CGI*" />
- </fileset>
- </jar>
-
- <!-- Servlets - Default File-Serving Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/servlets/Default*" />
- <include name="org/apache/catalina/servlets/Constants.class" />
- <include name="org/apache/catalina/servlets/LocalStrings.properties" />
- </fileset>
- </jar>
-
- <!-- Servlets - Invoker Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/servlets/Invoker*" />
- </fileset>
- </jar>
-
- <!-- Servlets - SSI Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/ssi/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
-
- <!-- Servlets - Webdav Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar" index="true">
- <fileset dir="${classes.dir}">
- <include name="org/apache/catalina/servlets/Webdav*" />
- </fileset>
- </jar>
-
- </target>
-
- <target name="deploy-catalina" depends="deploy-static,build-main,catalina-jars"
- description="Build and deploy Catalina component">
- </target>
-
-
- <!-- ====================== DEPLOY: Create Catalina JARs ================ -->
- <target name="deploy" depends="deploy-catalina,build-tomcat-coyote,build-tomcat-jk,build-tomcat-http11"
- description="Build and deploy Catalina">
- </target>
-
-
- <!-- ================ DIST: Create Distribution ========================= -->
- <target name="dist" depends="build-main"
- description="Create binary distribution">
-
- <!-- Executable Commands -->
- <mkdir dir="${catalina.dist}/bin"/>
- <copy todir="${catalina.dist}/bin">
- <fileset dir="src/bin" excludes="*-using-launcher.*,launcher.properties,catalina.xml" />
- </copy>
- <fixcrlf srcdir="${catalina.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${catalina.dist}/bin" includes="*.bat" eol="crlf"/>
- <chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
-
- <!-- Common Extensions -->
- <mkdir dir="${catalina.dist}/common/classes"/>
- <copy todir="${catalina.dist}/common/classes">
- <fileset dir="${catalina.build}/common/classes" />
- </copy>
- <mkdir dir="${catalina.dist}/common/lib"/>
- <copy todir="${catalina.dist}/common/lib">
- <fileset dir="${catalina.build}/common/lib" />
- </copy>
-
- <!-- Configuration Files -->
- <mkdir dir="${catalina.dist}/conf"/>
- <copy todir="${catalina.dist}/conf">
- <fileset dir="${catalina.build}/conf" />
- </copy>
-
- <!-- Server Components -->
- <mkdir dir="${catalina.dist}/server/classes"/>
- <!-- Do we want to copy the classes ?
- <copy todir="${catalina.dist}/server/classes">
- <fileset dir="${classes.dir}" />
- </copy>
- -->
- <mkdir dir="${catalina.dist}/server/lib"/>
- <copy todir="${catalina.dist}/server/lib">
- <fileset dir="${catalina.build}/server/lib" />
- </copy>
-
- <!-- Shared Extensions -->
- <mkdir dir="${catalina.dist}/shared/classes"/>
- <copy todir="${catalina.dist}/shared/classes">
- <fileset dir="${catalina.build}/shared/classes" />
- </copy>
- <mkdir dir="${catalina.dist}/shared/lib"/>
- <copy todir="${catalina.dist}/shared/lib">
- <fileset dir="${catalina.build}/shared/lib" />
- </copy>
-
- </target>
-
-
- <!-- ======================== DIST: Clean Directory ===================== -->
- <target name="dist-clean">
- <delete dir="${catalina.dist}"/>
- </target>
-
-
- <!-- ====================== Convenient Synonyms ========================= -->
- <target name="clean" depends="build-clean, dist-clean"
- description="Clean build and dist directories"/>
-
-
-</project>
Copied: tags/tomcat5.5/5.5.20-2/container/catalina/build.xml (from rev 2750, branches/tomcat5.5/feature/debian/container/catalina/build.xml)
Deleted: tags/tomcat5.5/5.5.20-2/container/catalina/src/bin/catalina.sh
===================================================================
--- branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/container/catalina/src/bin/catalina.sh 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,323 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------------------------
-# Start/Stop Script for the CATALINA Server
-#
-# Environment Variable Prequisites
-#
-# CATALINA_HOME May point at your Catalina "build" directory.
-#
-# CATALINA_BASE (Optional) Base directory for resolving dynamic portions
-# of a Catalina installation. If not present, resolves to
-# the same directory that CATALINA_HOME points to.
-#
-# CATALINA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
-#
-# CATALINA_TMPDIR (Optional) Directory path location of temporary directory
-# the JVM should use (java.io.tmpdir). Defaults to
-# $CATALINA_BASE/temp.
-#
-# JAVA_HOME Must point at your Java Development Kit installation.
-# Required to run the with the "debug" or "javac" argument.
-#
-# JRE_HOME Must point at your Java Development Kit installation.
-# Defaults to JAVA_HOME if empty.
-#
-# JAVA_OPTS (Optional) Java runtime options used when the "start",
-# "stop", or "run" command is executed.
-#
-# JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start"
-# command is executed. The default is "dt_socket".
-#
-# JPDA_ADDRESS (Optional) Java runtime options used when the "jpda start"
-# command is executed. The default is 8000.
-#
-# JSSE_HOME (Optional) May point at your Java Secure Sockets Extension
-# (JSSE) installation, whose JAR files will be added to the
-# system class path used to start Tomcat.
-#
-# CATALINA_PID (Optional) Path of the file which should contains the pid
-# of catalina startup java process, when start (fork) is used
-#
-# $Id: catalina.sh 394120 2006-04-14 15:25:07Z yoavs $
-# -----------------------------------------------------------------------------
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false
-os400=false
-darwin=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
-Darwin*) darwin=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-# Get standard environment variables
-PRGDIR=`dirname "$PRG"`
-
-# Only set CATALINA_HOME if not already set
-[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
-
-if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
- . "$CATALINA_HOME"/bin/setenv.sh
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
- [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
- [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
- [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
- [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --unix "$JSSE_HOME"`
-fi
-
-# For OS400
-if $os400; then
- # Set job priority to standard for interactive (interactive - 6) by using
- # the interactive priority - 6, the helper threads that respond to requests
- # will be running at the same priority as interactive jobs.
- COMMAND='chgjob job('$JOBNAME') runpty(6)'
- system $COMMAND
-
- # Enable multi threading
- export QIBM_MULTI_THREADED=Y
-fi
-
-# Get standard Java environment variables
-if $os400; then
- # -r will Only work on the os400 if the files are:
- # 1. owned by the user
- # 2. owned by the PRIMARY group of the user
- # this will not work if the user belongs in secondary groups
- BASEDIR="$CATALINA_HOME"
- . "$CATALINA_HOME"/bin/setclasspath.sh
-else
- if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
- BASEDIR="$CATALINA_HOME"
- . "$CATALINA_HOME"/bin/setclasspath.sh
- else
- echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
- echo "This file is needed to run this program"
- exit 1
- fi
-fi
-
-# Add on extra jar files to CLASSPATH
-if [ -n "$JSSE_HOME" ]; then
- CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
-fi
-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
-
-if [ -z "$CATALINA_BASE" ] ; then
- CATALINA_BASE="$CATALINA_HOME"
-fi
-
-if [ -z "$CATALINA_TMPDIR" ] ; then
- # Define the java.io.tmpdir to use for Catalina
- CATALINA_TMPDIR="$CATALINA_BASE"/temp
-fi
-
-# Bugzilla 37848: When no TTY is available, don't output to console
-have_tty=0
-if [ "`tty`" != "not a tty" ]; then
- have_tty=1
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
- JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
- CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"`
- CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"`
- CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"`
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --windows "$JSSE_HOME"`
- JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
-fi
-
-# Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
- JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
-fi
-
-# ----- Execute The Requested Command -----------------------------------------
-
-# Bugzilla 37848: only output this if we have a TTY
-if [ $have_tty -eq 1 ]; then
- echo "Using CATALINA_BASE: $CATALINA_BASE"
- echo "Using CATALINA_HOME: $CATALINA_HOME"
- echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
- if [ "$1" = "debug" -o "$1" = "javac" ] ; then
- echo "Using JAVA_HOME: $JAVA_HOME"
- else
- echo "Using JRE_HOME: $JRE_HOME"
- fi
-fi
-
-if [ "$1" = "jpda" ] ; then
- if [ -z "$JPDA_TRANSPORT" ]; then
- JPDA_TRANSPORT="dt_socket"
- fi
- if [ -z "$JPDA_ADDRESS" ]; then
- JPDA_ADDRESS="8000"
- fi
- if [ -z "$JPDA_OPTS" ]; then
- JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
- fi
- CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
- shift
-fi
-
-if [ "$1" = "debug" ] ; then
- if $os400; then
- echo "Debug command not available on OS400"
- exit 1
- else
- shift
- if [ "$1" = "-security" ] ; then
- echo "Using Security Manager"
- shift
- exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
- -Djava.security.manager \
- -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" start
- else
- exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" start
- fi
- fi
-
-elif [ "$1" = "run" ]; then
-
- shift
- if [ "$1" = "-security" ] ; then
- echo "Using Security Manager"
- shift
- exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -Djava.security.manager \
- -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" start
- else
- exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" start
- fi
-
-elif [ "$1" = "start" ] ; then
-
- shift
- touch "$CATALINA_BASE"/logs/catalina.out
- if [ "$1" = "-security" ] ; then
- echo "Using Security Manager"
- shift
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -Djava.security.manager \
- -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" start \
- >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-
- if [ ! -z "$CATALINA_PID" ]; then
- echo $! > $CATALINA_PID
- fi
- else
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" start \
- >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
-
- if [ ! -z "$CATALINA_PID" ]; then
- echo $! > $CATALINA_PID
- fi
- fi
-
-elif [ "$1" = "stop" ] ; then
-
- shift
- FORCE=0
- if [ "$1" = "-force" ]; then
- shift
- FORCE=1
- fi
-
- "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
- -Dcatalina.base="$CATALINA_BASE" \
- -Dcatalina.home="$CATALINA_HOME" \
- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
- org.apache.catalina.startup.Bootstrap "$@" stop
-
- if [ $FORCE -eq 1 ]; then
- if [ ! -z "$CATALINA_PID" ]; then
- echo "Killing: `cat $CATALINA_PID`"
- kill -9 `cat $CATALINA_PID`
- else
- echo "Kill failed: \$CATALINA_PID not set"
- fi
- fi
-
-elif [ "$1" = "version" ] ; then
-
- "$_RUNJAVA" \
- -classpath "$CATALINA_HOME/server/lib/catalina.jar" \
- org.apache.catalina.util.ServerInfo
-
-else
-
- echo "Usage: catalina.sh ( commands ... )"
- echo "commands:"
- if $os400; then
- echo " debug Start Catalina in a debugger (not available on OS400)"
- echo " debug -security Debug Catalina with a security manager (not available on OS400)"
- else
- echo " debug Start Catalina in a debugger"
- echo " debug -security Debug Catalina with a security manager"
- fi
- echo " jpda start Start Catalina under JPDA debugger"
- echo " run Start Catalina in the current window"
- echo " run -security Start in the current window with security manager"
- echo " start Start Catalina in a separate window"
- echo " start -security Start in a separate window with security manager"
- echo " stop Stop Catalina"
- echo " stop -force Stop Catalina (followed by kill -KILL)"
- echo " version What version of tomcat are you running?"
- exit 1
-
-fi
Copied: tags/tomcat5.5/5.5.20-2/container/catalina/src/bin/catalina.sh (from rev 2774, branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh)
Deleted: tags/tomcat5.5/5.5.20-2/container/catalina/src/share/org/apache/naming/factory/Constants.java
===================================================================
--- branches/tomcat5.5/feature/debian/container/catalina/src/share/org/apache/naming/factory/Constants.java 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/container/catalina/src/share/org/apache/naming/factory/Constants.java 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,54 +0,0 @@
-/*
- * Copyright 1999,2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.naming.factory;
-
-
-/**
- * Static constants for this package.
- */
-
-public final class Constants {
-
- public static final String Package = "org.apache.naming.factory";
-
- public static final String DEFAULT_RESOURCE_FACTORY =
- Package + ".ResourceFactory";
-
- public static final String DEFAULT_RESOURCE_LINK_FACTORY =
- Package + ".ResourceLinkFactory";
-
- public static final String DEFAULT_TRANSACTION_FACTORY =
- Package + ".TransactionFactory";
-
- public static final String DEFAULT_RESOURCE_ENV_FACTORY =
- Package + ".ResourceEnvFactory";
-
- public static final String DEFAULT_EJB_FACTORY =
- Package + ".EjbFactory";
-
- public static final String DBCP_DATASOURCE_FACTORY =
- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
-
- public static final String OPENEJB_EJB_FACTORY =
- Package + ".OpenEjbFactory";
-
- public static final String OBJECT_FACTORIES = "";
-
- public static final String FACTORY = "factory";
-
-}
Copied: tags/tomcat5.5/5.5.20-2/container/catalina/src/share/org/apache/naming/factory/Constants.java (from rev 2749, branches/tomcat5.5/feature/debian/container/catalina/src/share/org/apache/naming/factory/Constants.java)
Deleted: tags/tomcat5.5/5.5.20-2/container/webapps/admin/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/container/webapps/admin/build.xml 2006-11-14 15:36:21 UTC (rev 2742)
+++ tags/tomcat5.5/5.5.20-2/container/webapps/admin/build.xml 2006-11-23 08:53:17 UTC (rev 2789)
@@ -1,241 +0,0 @@
-<project name="admin" default="build-main" basedir=".">
-
-
- <!-- ===================== Initialize Property Values =================== -->
-
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- property values you must customize for successful building!!! -->
- <property file="build.properties"/>
- <property file="../build.properties"/>
- <property file="../../build.properties"/>
- <property file="${user.home}/build.properties"/>
-
- <!-- Build Defaults -->
- <property name="build.compiler" value="modern"/>
- <property name="webapps.build" value="${basedir}/../build"/>
- <property name="webapps.dist" value="${basedir}/../dist"/>
- <property name="webapp.name" value="admin"/>
-
- <!-- Dependent JARs and files -->
- <property name="servlet-api.jar" value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
- <property name="jsp-api.jar" value="${api.home}/jsr152/dist/lib/jsp-api.jar"/>
- <property name="struts-core.jar" value="${struts.jar}" />
- <property name="struts-taglib.jar" value="${struts.jar}" />
-
- <!-- Construct Admin classpath -->
- <path id="admin.classpath">
- <pathelement location="${commons-modeler.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${servlet-api.jar}"/>
- <pathelement location="${jsp-api.jar}"/>
- <pathelement location="${struts-core.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-digester.jar}"/>
- </path>
-
-
- <!-- =================== BUILD: Set compile flags ======================= -->
- <target name="flags">
-
- <!-- JDK flags -->
- <available property="jdk.1.2.present" classname="java.util.HashMap" />
- <available property="jdk.1.3.present"
- classname="java.lang.reflect.Proxy" />
- <available property="jdk.1.4.present" classname="java.nio.Buffer" />
-
- <!-- Ant flags -->
- <available property="style.available"
- classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
-
- <!-- Class availability flags -->
- <condition property="jaxp.present">
- <and>
- <available classname="javax.xml.parsers.SAXParser"
- classpath="${xerces.jar}" />
- <available classname="org.xml.sax.ContentHandler"
- classpath="${xerces.jar}" />
- </and>
- </condition>
- <available property="jmx.present"
- classname="javax.management.MBeanServer"
- classpath="${jmx.jar}" />
- <available property="modeler.present"
- classname="org.apache.commons.modeler.Registry"
- classpath="${commons-modeler.jar}:${jmx.jar}"/>
- <available property="servlet.present"
- classname="javax.servlet.Servlet"
- classpath="${servlet-api.jar}" />
- <available property="jsp.present"
- classname="javax.servlet.jsp.JspPage"
- classpath="${jsp-api.jar}" />
- <available property="struts.present"
- classname="org.apache.struts.action.ActionForm"
- classpath="${struts-core.jar}" />
- <available property="beanutils.present"
- classname="org.apache.commons.beanutils.PropertyUtils"
- classpath="${commons-beanutils.jar}" />
-
-
- <!-- JAR files availability flags -->
- <available property="jmx.jar.present" file="${jmx.jar}" />
- <available property="modeler.jar.present" file="${commons-modeler.jar}" />
- <available property="servlet-api.jar.present" file="${servlet-api.jar}" />
- <available property="jsp-api.jar.present" file="${jsp-api.jar}" />
- <available property="struts.jar.present" file="${struts-core.jar}" />
- <available property="beanutils.jar.present" file="${commons-beanutils.jar}" />
-
- <!-- Conditional compilation flags (determined from the flags above) -->
- <condition property="compile.admin">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <and>
- <equals arg1="${struts.present}" arg2="true" />
- <equals arg1="${jmx.present}" arg2="true" />
- <equals arg1="${modeler.present}" arg2="true" />
- </and>
- </or>
- </condition>
-
- <!-- Conditional copy flags (determined from the flags above) -->
- <condition property="copy.struts.jar">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${struts.jar.present}" arg2="true" />
- </or>
- </condition>
-
- </target>
-
-
- <!-- =================== BUILD: Set compile flags ======================= -->
- <target name="flags.display" depends="flags" unless="flags.hide">
-
- <echo message="--- Build environment for Tomcat Server Configuration Application ---" />
-
- <echo message="If ${property_name} is displayed, then the property is not set)" />
-
- <echo message="--- Build options ---" />
- <echo message="full.dist=${full.dist}" />
- <echo message="build.sysclasspath=${build.sysclasspath}" />
- <echo message="compile.debug=${compile.debug}" />
- <echo message="compile.deprecation=${compile.deprecation}" />
- <echo message="compile.optimize=${compile.optimize}" />
-
- <echo message="--- Ant Flags ---" />
- <echo message="<style> task available (required)=${style.available}" />
-
- <echo message="--- JDK ---" />
- <echo message="jdk.1.2.present=${jdk.1.2.present}" />
- <echo message="jdk.1.3.present=${jdk.1.3.present}" />
- <echo message="jdk.1.4.present=${jdk.1.4.present}" />
-
- <echo message="--- Required Libraries ---" />
- <echo message="jaxp.present=${jaxp.present}" />
- <echo message="jmx.present=${jmx.present}" />
- <echo message="modeler.present=${modeler.present}" />
- <echo message="servlet.present=${servlet.present}" />
- <echo message="jsp.present=${jsp.present}" />
-
- <echo message="--- Required JARs ---" />
- <echo message="jmx.jar.present=${jmx.jar.present}" />
- <echo message="modeler.jar.present=${modeler.jar.present}" />
- <echo message="servlet-api.jar.present=${servlet-api.jar.present}" />
- <echo message="jsp-api.jar.present=${jsp-api.jar.present}" />
- <echo message="struts.jar.present=${struts.jar.present}" />
- <echo message="beanutils.jar.present=${beanutils.jar.present}" />
-
- <echo message="--- Optional JARs ---" />
-
- <echo message="--- Conditional compilation flags ---" />
- <echo message="compile.admin=${compile.admin}" />
-
- <echo message="--- Distribution flags ---" />
- <echo message="copy.struts.jar=${copy.struts.jar}" />
-
- </target>
-
-
- <!-- ======================== BUILD: Copy JARs ========================== -->
- <target name="copy-struts.jar" if="struts.present">
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${struts-core.jar}"/>
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${struts-taglib.jar}" />
- </target>
-
-
- <!-- =================== BUILD: Create Directories ====================== -->
- <target name="build-prepare">
- <mkdir dir="${webapps.build}"/>
- <mkdir dir="${webapps.build}/${webapp.name}"/>
- <mkdir dir="${webapps.build}/${webapp.name}/WEB-INF"/>
- <mkdir dir="${webapps.build}/${webapp.name}/WEB-INF/classes"/>
- <mkdir dir="${webapps.build}/${webapp.name}/WEB-INF/lib"/>
- </target>
-
-
- <!-- ================ BUILD: Copy Static Files ========================== -->
- <target name="build-static" depends="flags,flags.display,build-prepare,copy-struts.jar">
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-beanutils.jar}"/>
- <copy tofile="${webapps.build}/${webapp.name}/WEB-INF/lib/commons-collections.jar"
- file="${commons-collections.jar}"/>
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-digester.jar}"/>
- <copy todir="${webapps.build}/${webapp.name}">
- <fileset dir=".">
- <exclude name="build.*"/>
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
-
- <!-- ================= BUILD: Compile Server Components ================= -->
- <target name="build-main" depends="build-static" if="compile.admin">
-
- <javac srcdir="WEB-INF/classes"
- destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
- debug="${compile.debug}" deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- excludes="**/CVS/**">
- <classpath refid="admin.classpath" />
- </javac>
-
- </target>
-
-
- <!-- ==================== BUILD: Rebuild Everything ===================== -->
- <target name="all" depends="build-clean,build-main"
- description="Clean and build admin webapp"/>
-
-
- <!-- ======================= BUILD: Clean Directory ===================== -->
- <target name="build-clean">
- <delete dir="${webapps.build}"/>
- </target>
-
-
- <!-- ======================= DIST: Create Directories =================== -->
- <target name="dist-prepare">
- <mkdir dir="${webapps.dist}"/>
- </target>
-
-
- <!-- ======================= DIST: Create Distribution Files ============ -->
- <target name="dist" depends="build-main,dist-prepare"
- description="Create admin webapp binary distribution">
- <jar jarfile="${webapps.dist}/${webapp.name}.war"
- basedir="${webapps.build}/${webapp.name}" includes="**"/>
- </target>
-
-
- <!-- ======================= DIST: Clean Directory ====================== -->
- <target name="dist-clean">
- <deltree dir="${dist.dir}"/>
- </target>
-
-
- <!-- ====================== Convenient Synonyms ========================= -->
- <target name="clean" depends="build-clean,dist-clean"
- description="Clean build and dist directories"/>
-
-
-</project>
Copied: tags/tomcat5.5/5.5.20-2/container/webapps/admin/build.xml (from rev 2748, branches/tomcat5.5/feature/debian/container/webapps/admin/build.xml)
Copied: tags/tomcat5.5/5.5.20-2/debian (from rev 2788, branches/tomcat5.5/feature/debian/debian)
More information about the pkg-java-commits
mailing list