User: gropi
Date: 01/10/02 01:54:27
Modified: src/examples/build build.xml
Log:
Use a more flexible schema to determine the location of servlet.jar
Revision Changes Path
1.15 +34 -24 manual/src/examples/build/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/manual/src/examples/build/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 2001/09/05 21:58:01 1.14
+++ build.xml 2001/10/02 08:54:27 1.15
@@ -16,42 +16,52 @@
<property environment="env" />
<!-- Override with your JBoss server dist location if the JBOSS_DIST env var is
not set -->
<property name="jboss.dist" value="${env.JBOSS_DIST}"/>
- <!-- Override with your web server servlet jar location. The default assumes
that
- JBOSS_DIST points to a JBoss/Tomcat bundle distribution
- -->
- <property name="servlet.jar"
value="${env.JBOSS_DIST}}/../tomcat/lib/servlet.jar"/>
+
<property name="src.dir" value="${basedir}"/>
<property name="src.resources" value="${basedir}/resources"/>
<property name="build.dir" value="${basedir}/build-examples"/>
<property name="dist.dir" value="${basedir}/../../dist-examples"/>
+
+ <target name="validate-servlet">
+ <!-- Override with your web server servlet jar location.
+ The default assumes that JBOSS_DIST points to a
+ JBoss/Tomcat bundle distribution
+ -->
+ <available property="servlet.jar"
value="${env.JBOSS_DIST}/../tomcat/lib/servlet.jar"
file="${env.JBOSS_DIST}/../tomcat/lib/servlet.jar"/>
+ <available property="servlet.jar"
value="${env.JBOSS_DIST}/../jetty/lib/javax.servlet.jar"
file="${env.JBOSS_DIST}/../jetty/lib/javax.servlet.jar"/>
+ <available property="servlet.jar"
value="${env.JBOSS_DIST}/../catalina/common/lib/servlet.jar"
file="${env.JBOSS_DIST}/../catalina/common/lib/servlet.jar"/>
+ <available property="servlet.jar"
value="${env.JBOSS_DIST}/../catalina/common/lib/servlet.jar"
file="${env.TOMCAT_HOME}/lib/servlet.jar"/>
+ <property name="servlet.jar" value="COULD_NOT_FIND_SERVLET_JAR"/>
- <path id="base.path_22">
- <pathelement location="${jboss.dist}/client/ejb.jar"/>
- <pathelement location="${jboss.dist}/client/jaas.jar"/>
- <pathelement location="${jboss.dist}/client/jbosssx-client.jar"/>
- <pathelement location="${jboss.dist}/client/jboss-client.jar"/>
- <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
- <pathelement location="${servlet.jar}"/>
- </path>
- <path id="base.path_23">
- <pathelement location="${jboss.dist}/client/jboss-j2ee.jar"/>
- <pathelement location="${jboss.dist}/client/jaas.jar"/>
- <pathelement location="${jboss.dist}/client/jbosssx-client.jar"/>
- <pathelement location="${jboss.dist}/client/jboss-client.jar"/>
- <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
- <pathelement location="${servlet.jar}"/>
- </path>
+ <path id="base.path_22">
+ <pathelement location="${jboss.dist}/client/ejb.jar"/>
+ <pathelement location="${jboss.dist}/client/jaas.jar"/>
+ <pathelement location="${jboss.dist}/client/jbosssx-client.jar"/>
+ <pathelement location="${jboss.dist}/client/jboss-client.jar"/>
+ <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
+ <pathelement location="${servlet.jar}"/>
+ </path>
+ <path id="base.path_24">
+ <pathelement location="${jboss.dist}/client/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.dist}/client/jaas.jar"/>
+ <pathelement location="${jboss.dist}/client/jbosssx-client.jar"/>
+ <pathelement location="${jboss.dist}/client/jboss-client.jar"/>
+ <pathelement location="${jboss.dist}/client/jnp-client.jar"/>
+ <pathelement location="${servlet.jar}"/>
+ </path>
+ </target>
- <target name="validate">
+ <target name="validate-jboss" depends="validate-servlet">
<available property="classpath_id" value="base.path_22"
file="${jboss.dist}/client/ejb.jar" />
- <available property="classpath_id" value="base.path_23"
file="${jboss.dist}/client/jboss-j2ee.jar" />
+ <available property="classpath_id" value="base.path_24"
file="${jboss.dist}/client/jboss-j2ee.jar" />
+
</target>
<target name="fail_if_not_valid" unless="classpath_id">
- <fail message="jboss.dist=${jboss.dist} is not a valid JBoss dist
directory"/>
+ <fail message="jboss.dist=${jboss.dist} is not a valid JBOSS_DIST
directory. If using a bundled JBoss version set JBOSS_DIST to the jboss/ subdir."/>
</target>
- <target name="init" depends="validate,fail_if_not_valid">
+ <target name="init" depends="validate-jboss,fail_if_not_valid">
<property name="classpath" refid="${classpath_id}" />
<echo message="Using JBoss directory=${jboss.dist}" />
<echo message="Using base classpath=${classpath}" />
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
