Author: markt
Date: Fri Dec 23 09:10:42 2005
New Revision: 358834
URL: http://svn.apache.org/viewcvs?rev=358834&view=rev
Log:
Fix build. Remove references to WARP connector which has been removed.
Modified:
tomcat/container/branches/tc4.1.x/catalina/build.xml
Modified: tomcat/container/branches/tc4.1.x/catalina/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/build.xml?rev=358834&r1=358833&r2=358834&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/build.xml Fri Dec 23 09:10:42
2005
@@ -24,7 +24,6 @@
<property name="tomcat-coyote.home" value="${jtc.home}/coyote"/>
<property name="tomcat-jk.home" value="${jtc.home}/jk"/>
<property name="tomcat-jni.home" value="${jtc.home}/jni"/>
- <property name="tomcat-webapp.home" value="${jtc.home}/webapp"/>
<property name="tomcat-http11.home" value="${jtc.home}/http11"/>
<!-- Dependent JARs and files -->
@@ -45,8 +44,6 @@
value="${tomcat-jk.home}/build/conf/jk2.properties"/>
<property name="tomcat-apr.jar"
value="${tomcat-jni.home}/dist/tomcat-native-1.0.0.jar"/>
- <property name="tomcat-warp.jar"
- value="${tomcat-webapp.home}/build/tomcat-warp.jar"/>
<property name="tomcat-http11.jar"
value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
@@ -123,7 +120,6 @@
<pathelement location="${tomcat-util.home}/java"/>
<pathelement location="${tomcat-coyote.home}/src/java"/>
<pathelement location="${tomcat-jk.home}/java"/>
- <pathelement location="${tomcat-webapp.home}/java"/>
<pathelement location="${tomcat-http11.home}/src/java"/>
</path>
@@ -917,20 +913,6 @@
</target>
- <!-- ================== BUILD: Build tomcat-webapp ====================== -->
- <target name="build-tomcat-webapp">
-
- <ant dir="${tomcat-webapp.home}" target="compile">
- <property name="catalina.home" value="${catalina.deploy}"/>
- <property name="targdir" value="${tomcat-webapp.home}"/>
- </ant>
-
- <copy todir="${catalina.deploy}/server/lib"
- file="${tomcat-warp.jar}"/>
-
- </target>
-
-
<!-- ============== BUILD: Build tomcat-coyote-http11 =================== -->
<target name="build-tomcat-http11">
@@ -992,7 +974,6 @@
<ant dir="${tomcat-coyote.home}" target="clean"/>
<ant dir="${tomcat-jk.home}" target="clean"/>
<ant dir="${tomcat-jni.home}" target="clean"/>
- <ant dir="${tomcat-webapp.home}" target="clean"/>
<ant dir="${tomcat-http11.home}" target="clean"/>
</target>
@@ -1266,7 +1247,7 @@
<!-- ====================== DEPLOY: Create Catalina JARs ================ -->
- <target name="deploy"
depends="deploy-catalina,build-tomcat-coyote,build-tomcat-jk,build-tomcat-webapp,build-tomcat-http11"
+ <target name="deploy"
depends="deploy-catalina,build-tomcat-coyote,build-tomcat-jk,build-tomcat-http11"
description="Build and deploy Catalina">
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
