costin 2003/01/20 15:57:58
Modified: jk build.xml
Log:
Move the paths higher, so jar target can be called directly.
Exclude ajp connector for tomcat5.
Revision Changes Path
1.63 +42 -33 jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 16 Jan 2003 22:41:37 -0000 1.62
+++ build.xml 20 Jan 2003 23:57:58 -0000 1.63
@@ -33,12 +33,46 @@
location="../../jakarta-tomcat-catalina/build" />
<property name="coyote.home"
location="../coyote/build" />
+ <property name="tomcat-coyote.jar"
location="${coyote.home}/lib/tomcat-coyote.jar" />
<property name="commons-logging.jar" location="../lib/commons-logging.jar" />
<property name="tomcat-util.jar" location="../util/build/lib/tomcat-util.jar" />
- <property name="jmx.jar" location="../lib/mx4j.jar" />
+ <property name="commons-modeler.jar"
location="../../jakarta-commons/modeler/dist/commons-modeler.jar" />
- <!-- ==================== Detection and reports ==================== -->
+ <property name="jmx.jar" location="../lib/mx4j.jar" />
+
+ <!-- Fix build via ECLIPSE which didn't export ant's jars -->
+ <path id="xml-apis.classpath">
+ <pathelement path="${jaxp.home}/jaxp.jar"/>
+ <pathelement path="${jaxp.home}/crimson.jar"/>
+ <pathelement path="${xerces2.home}/xmlParserAPIs.jar"/>
+ <pathelement path="${xml-parser-apis.jar}"/>
+ </path>
+
+ <path id="build-main.classpath">
+ <fileset dir="../lib" includes="*.jar" />
+ <pathelement location="../util/build/classes"/>
+ <pathelement location="${tomcat5.home}/server/lib/catalina.jar"/>
+ <pathelement location="${tomcat5.home}/common/lib/servlet-api.jar"/>
+ <pathelement location="${tomcat41.home}/server/lib/catalina.jar"/>
+ <pathelement location="${tomcat40.home}/server/lib/catalina.jar"/>
+ <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
+ <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
+ <pathelement location="${tomcat-util.jar}" />
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-modeler.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+ <pathelement location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
+ <!-- this is needed - otherwise tomcat33 connector will not compile.
+ Just change tomcat33.home in build.properties to point
+ to nowhere, and tomcat_util will no longer be visible, nor
+ 3.3 classes. -->
+ <pathelement
+ location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
+ <pathelement location="${tomcat-coyote.jar}"/>
+ </path>
+
+ <!-- ==================== Detection and reports ==================== -->
<target name="report" >
<echo message="Tomcat33: ${tomcat33.detect} ${tomcat33.home}" />
@@ -49,6 +83,7 @@
<echo message="Apache2: ${apache2.detect} ${apache2.home}" />
<echo message="iPlanet: ${iplanet.detect} ${iplanet.home}" />
<echo message="IIS: ${iis.detect} ${iis.home}" />
+ <echo message="jmx: ${jmx.jar} ${jmx.detect} ${commons-modeler.jar}
${modeler.detect}" />
</target>
<target name="detect" >
@@ -79,6 +114,8 @@
file="${jmx.jar}" />
<available property="jdk14.detect"
classname="java.nio.MappedByteBuffer" />
+ <available property="modeler.detect"
+ file="${commons-modeler.jar}" />
<!-- Check if we can find the XSLTProcessor class in the classpath -->
<available
property="avail.xalan"
@@ -102,9 +139,9 @@
<!-- util and coyote must be build first -->
<copy tofile="${jk.build}/lib/tomcat-coyote.jar"
- file="../coyote/build/lib/tomcat-coyote.jar" />
+ file="${tomcat-coyote.jar}" />
- <!-- Fix build via ECLIPSE which didn't export ant's jars -->
+ <!-- Fix build via ECLIPSE which didn't export ant's jars -->
<path id="xml-apis.classpath">
<pathelement path="${jaxp.home}/jaxp.jar"/>
<pathelement path="${jaxp.home}/crimson.jar"/>
@@ -112,34 +149,6 @@
<pathelement path="${xml-parser-apis.jar}"/>
</path>
- <path id="build-main.classpath">
- <fileset dir="../lib" includes="*.jar" />
- <pathelement location="../util/build/classes"/>
- <pathelement location="${tomcat5.home}/server/lib/catalina.jar"/>
- <pathelement location="${tomcat5.home}/common/lib/servlet-api.jar"/>
- <pathelement location="${tomcat41.home}/server/lib/catalina.jar"/>
- <pathelement location="${tomcat41.home}/common/lib/servlet.jar"/>
- <pathelement location="${tomcat40.home}/server/lib/catalina.jar"/>
- <pathelement location="${tomcat40.home}/common/lib/servlet.jar"/>
- <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
- <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
- <pathelement location="${tomcat-util.jar}" />
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${commons-modeler.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement
- location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
- <!-- this is needed - otherwise tomcat33 connector will not compile.
- Just change tomcat33.home in build.properties to point
- to nowhere, and tomcat_util will no longer be visible, nor
- 3.3 classes. -->
- <pathelement
- location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
- <pathelement
- location="${tomcat33.home}/lib/common/servlet.jar"/>
- <pathelement location="${coyote.home}/lib/tomcat-coyote.jar"/>
- </path>
-
</target>
<target name="build-main"
@@ -163,7 +172,7 @@
debug="${debug}"
optimize="${optimize}"
verbose="off" >
- <exclude name="org/apache/ajp/tomcat5/**" unless="tomcat5.detect"/>
+ <exclude name="org/apache/ajp/**" if="tomcat5.detect"/>
<exclude name="org/apache/ajp/tomcat4/**" unless="tomcat40.detect"/>
<exclude name="org/apache/ajp/tomcat33/**"
unless="tomcat33.detect"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
