remm 2002/08/13 09:26:11
Modified: catalina build.xml
Log:
- Use the new APIs home.
Revision Changes Path
1.15 +7 -6 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 13 Aug 2002 12:21:24 -0000 1.14
+++ build.xml 13 Aug 2002 16:26:11 -0000 1.15
@@ -27,7 +27,7 @@
<!-- Dependent JARs and files -->
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
- <property name="servlet.jar" value="${api.home}/dist/lib/servlet.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"
@@ -70,7 +70,7 @@
<pathelement location="${ldap.jar}"/>
<pathelement location="${mail.jar}"/>
<pathelement location="${regexp.jar}"/>
- <pathelement location="${servlet.jar}"/>
+ <pathelement location="${servlet-api.jar}"/>
<pathelement location="${tyrex.jar}"/>
<pathelement location="${xercesImpl.jar}"/>
<pathelement location="${xmlParserAPIs.jar}"/>
@@ -102,7 +102,7 @@
<pathelement location="${ldap.jar}"/>
<pathelement location="${mail.jar}"/>
<pathelement location="${regexp.jar}"/>
- <pathelement location="${servlet.jar}"/>
+ <pathelement location="${servlet-api.jar}"/>
<pathelement location="${tyrex.jar}"/>
<pathelement location="${xercesImpl.jar}"/>
<pathelement location="${xmlParserAPIs.jar}"/>
@@ -255,7 +255,7 @@
<available property="modeler.jar.present" file="${commons-modeler.jar}" />
<available property="pool.jar.present" file="${commons-pool.jar}" />
<available property="regexp.jar.present" file="${regexp.jar}" />
- <available property="servlet.jar.present" file="${servlet.jar}" />
+ <available property="servlet-api.jar.present" file="${servlet-api.jar}" />
<available property="tomcat-util.jar.present" file="${tomcat-util.jar}" />
<available property="tyrex.jar.present" file="${tyrex.jar}" />
<available property="xercesImpl.jar.present" file="${xercesImpl.jar}"/>
@@ -598,7 +598,7 @@
<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.jar.present=${servlet.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 ---" />
@@ -747,7 +747,7 @@
<chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
<!-- Common Extensions -->
- <copy todir="${catalina.build}/common/lib" file="${servlet.jar}"/>
+ <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
<copy todir="${catalina.build}/common/lib"
file="${commons-collections.jar}"/>
@@ -848,6 +848,7 @@
<ant dir="${tomcat-coyote.home}" target="compile">
<property name="catalina.home" value="${catalina.deploy}"/>
+ <property name="servlet.jar" value="${servlet-api.jar}"/>
</ant>
<copy todir="${catalina.deploy}/server/lib"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
