donaldp 01/04/11 06:21:28
Modified: . build.xml
Log:
Make sure J2eeDatasource is built if j2ee.jar in classpath.
Revision Changes Path
1.27 +10 -9 jakarta-avalon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 2001/04/05 19:38:41 1.26
+++ build.xml 2001/04/11 13:21:28 1.27
@@ -173,9 +173,16 @@
Checks the environment for existing resources
===================================================================
-->
- <target name="check-environment" depends="check-datasource" if="jndi.present"/>
+ <target name="check-environment">
+ <available property="jndi.present" classname="javax.naming.Context">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="datasource.present" classname="javax.sql.DataSource">
+ <classpath refid="project.class.path"/>
+ </available>
+ </target>
- <target name="check-datasource" if="datasource.present">
+ <target name="check-datasource" depends="check-environment"
if="datasource.present">
<property name="j2ee.present" value="true"/>
</target>
@@ -184,13 +191,7 @@
Prepares the build directory
===================================================================
-->
- <target name="prepare" depends="check-environment,setup-properties">
- <available property="jndi.present" classname="javax.naming.Context">
- <classpath refid="project.class.path"/>
- </available>
- <available property="datasource.present" classname="javax.sql.DataSource">
- <classpath refid="project.class.path"/>
- </available>
+ <target name="prepare" depends="check-datasource,setup-properties">
<tstamp/>
<mkdir dir="${build.dir}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
