hammant 2002/12/14 01:09:08
Modified: altrmi build.xml
Log:
Make Jetty dependancy optional.
Revision Changes Path
1.50 +11 -22 jakarta-avalon-excalibur/altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- build.xml 13 Dec 2002 15:11:26 -0000 1.49
+++ build.xml 14 Dec 2002 09:09:07 -0000 1.50
@@ -12,7 +12,6 @@
<property name ="jetty.rel" value="4.2.2"/>
- <property name="jetty.jars.dir" value="${lib.dir}/jetty-jars"/>
<!-- Classpath for product -->
<path id="project.class.path">
@@ -88,7 +87,7 @@
<!-- Compiles the source code -->
- <target name="compile" depends="dependencies,checkNecessaryJars"
description="Compiles the source code">
+ <target name="compile" depends="dependencies, warnJettyJars"
description="Compiles the source code">
<mkdir dir="${build.classes}"/>
@@ -101,6 +100,7 @@
target="1.2">
<classpath refid="project.class.path" />
<include name="**/*.java"/>
+ <exclude name="org/apache/excalibur/altrmi/server/impl/http/*.java"
unless="jetty.present"/>
</javac>
<rmic base="${build.classes}"
@@ -143,6 +143,7 @@
target="1.2">
<classpath refid="test.class.path" />
<include name="**/*.java"/>
+ <exclude name="org/apache/excalibur/altrmi/test/http/*.java"
unless="jetty.present"/>
</javac>
<taskdef name="attributes"
classname="org.apache.commons.attributes.task.AttributesCompiler">
@@ -511,18 +512,14 @@
</target>
- <target name="checkNecessaryJars" depends="checkJettyJars"
unless="jetty.present">
- <echo>****************************</echo>
- <echo>* Please execute target *</echo>
- <echo>* 'get-jetty' in *</echo>
- <echo>* jetty.xml build file *</echo>
- <echo>* to download six mega- *</echo>
- <echo>* bytes of Jetty from *</echo>
- <echo>* Sourceforge *</echo>
- <echo>****************************</echo>
-
- <fail message="Jetty needed. See above."/>
-
+ <target name="warnJettyJars" depends="checkJettyJars" unless="jetty.present">
+ <echo>*************************************</echo>
+ <echo>* Please execute target 'get-jetty' *</echo>
+ <echo>* in to download six megabytes of *</echo>
+ <echo>* Jetty from SourceForge. This will *</echo>
+ <echo>* enable the http transport types *</echo>
+ <echo>* for AltRMI *</echo>
+ <echo>*************************************</echo>
</target>
@@ -536,14 +533,6 @@
usetimestamp="true"/>
<unzip src="jetty-download/Jetty-${jetty.rel}.zip"
dest="jetty-download/Jetty-${jetty.rel}" />
-
- <delete file="${jetty.jars.dir}/*.jar"/>
-
- <copy todir="${jetty.jars.dir}" flatten="true">
- <fileset dir="jetty-download/Jetty-${jetty.rel}">
- <include name="**/lib/*.jar"/>
- </fileset>
- </copy>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
