You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/05/14 19:46:39 UTC
cvs commit: jakarta-tomcat-5 build.xml
remm 2003/05/14 10:46:39
Modified: . build.xml
Log:
- Remove extra commons-beanutils.
- Add new stuff for the validator task.
Revision Changes Path
1.127 +34 -6 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- build.xml 28 Apr 2003 21:07:36 -0000 1.126
+++ build.xml 14 May 2003 17:46:39 -0000 1.127
@@ -450,7 +450,6 @@
description="Builds all components">
<copy file="${commons-digester.jar}" todir="${tomcat.build}/server/lib"/>
<copy file="${commons-collections.jar}" todir="${tomcat.build}/common/lib"/>
- <copy file="${commons-beanutils.jar}" todir="${tomcat.build}/common/lib"/>
<antcall target="build-tomcatutil"/>
<antcall target="build-tomcatcoyote"/>
@@ -728,7 +727,6 @@
<target name="deployer" description="Create the Tomcat deployer binary" >
- <copy todir="${tomcat.deployer}/lib" file="${commons-logging.jar}"/>
<copy todir="${tomcat.deployer}/lib" file="${tomcat.build}/common/lib/ant.jar"/>
<!-- JSP and Servlet runtime -->
@@ -742,13 +740,43 @@
</fileset>
</copy>
+ <!-- Digester and dependencies -->
+ <copy todir="${tomcat.deployer}/lib">
+ <fileset dir="${tomcat.build}/server/lib">
+ <include name="commons-digester.jar"/>
+ <include name="commons-beanutils.jar"/>
+ <include name="commons-logging.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.deployer}/lib">
+ <fileset dir="${tomcat.build}/common/lib">
+ <include name="commons-collections.jar"/>
+ </fileset>
+ </copy>
+
<copy todir="${tomcat.deployer}/lib"
file="${tomcat.build}/server/lib/catalina-ant.jar"/>
-<!--
- <copy todir="${tomcat.deployer}/lib"
- file="${tomcat.build}/server/lib/catalina-deployer.jar"/>
--->
+ <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"
+ index="true">
+ <fileset dir="${tomcat.build}/classes">
+ <include name="org/apache/catalina/LifecycleListener.class" />
+ <include name="org/apache/catalina/Pipeline.class" />
+ <include name="org/apache/catalina/startup/Constants.class" />
+ <include name="org/apache/catalina/startup/ContextConfig.class" />
+ <include name="org/apache/catalina/startup/SetPublicIdRule.class" />
+ <include name="org/apache/catalina/startup/SetDistributableRule.class" />
+ <include name="org/apache/catalina/startup/SetJspConfig.class" />
+ <include name="org/apache/catalina/startup/SetLoginConfig.class" />
+ <include name="org/apache/catalina/startup/SetAuthConstraintRule.class" />
+ <include name="org/apache/catalina/startup/WrapperCreateRule.class" />
+ <include name="org/apache/catalina/startup/SetSessionConfig.class" />
+ <include name="org/apache/catalina/startup/WebRuleSet.class" />
+ <include name="org/apache/catalina/startup/*.properties" />
+ <include name="org/apache/catalina/util/SchemaResolver.class" />
+ <include name="org/apache/catalina/util/StringManager.class" />
+ </fileset>
+ </jar>
<copy todir="${tomcat.deployer}/lib" file="${xercesImpl.jar}"/>
<copy todir="${tomcat.deployer}/lib" file="${xmlParserAPIs.jar}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org