Author: nash
Date: Sun May 16 23:12:07 2010
New Revision: 944937
URL: http://svn.apache.org/viewvc?rev=944937&view=rev
Log:
Pass OpenEJB jars to build.xml as <path> instead of <files>
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml?rev=944937&r1=944936&r2=944937&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml Sun May
16 23:12:07 2010
@@ -653,41 +653,46 @@
<!-- If running from a downloaded distribution, the OpenEJB jars are in
lib/openejb -->
<target name="#lib-openejb">
- <condition property="#openejb-reldir" value="../../../lib/openejb">
+ <condition property="#openejb-dir" value="../../../lib/openejb">
<available file="../../../lib/openejb" type="dir"/>
</condition>
</target>
<!-- If running from a maven build, the OpenEJB jars are in
binaries/target/openejb -->
- <target name="#binaries-openejb" unless="#openejb-reldir">
+ <target name="#binaries-openejb" unless="#openejb-dir">
<condition property="#openejb-reldir"
value="../../binaries/target/openejb">
<available file="../../binaries/target/openejb" type="dir"/>
</condition>
</target>
- <!-- Add the Tuscany runtime to the OpenEJB directory -->
- <target name="#tuscany-openejb" if="#openejb-reldir">
- <property name="#openejb-tuscany" value=""/>
- <dirname property="#ejbdir" file="${#openejb-reldir}"/>
- <property name="#openejb-dir" value="${#ejbdir}/openejb"/>
+ <!-- Set the path as the OpenEJB directory and the Tuscany runtime -->
+ <target name="#tuscany-openejb" if="#openejb-dir">
+ <path id="openejb-path">
+ <fileset dir="${#openejb-dir}"/>
+ <fileset dir="${env.TUSCANY_HOME}/lib"/>
+ </path>
</target>
<!-- Could be running from an ant build of a svn checkout, so try the
OPENEJB_HOME environment variable -->
<target name="#env-openejb" unless="#openejb-dir">
- <condition property="#openejb-dir" value="${env.OPENEJB_HOME}/lib">
+ <condition property="#openejb-home" value="${env.OPENEJB_HOME}/lib">
<available file="${env.OPENEJB_HOME}/lib" type="dir"/>
</condition>
</target>
+ <!-- Set the path as the OPENEJB_HOME directory -->
+ <target name="#home-openejb" if="#openejb-home">
+ <path id="openejb-path">
+ <fileset dir="${#openejb-home}"/>
+ </path>
+ <property name="#openejb-dir" value="${#openejb-home}"/>
+ </target>
+
<!-- For use as a dependency of "run" targets that need OpenEJB -->
- <target name="locate-openejb" depends="#lib-openejb, #binaries-openejb,
#tuscany-openejb, #env-openejb">
+ <target name="locate-openejb" depends="#lib-openejb, #binaries-openejb,
#tuscany-openejb, #env-openejb, #home-openejb">
<fail unless="#openejb-dir">
Error: Couldn't find OpenEJB dependencies.
</fail>
- <files id="openejb-files">
- <include if="#openejb-dir" name="${#openejb-dir}/*"/>
- <include if="#openejb-tuscany" name="${env.TUSCANY_HOME}/lib/*"/>
- </files>
</target>
<!-- check to see if we are running on JDK 6 -->
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml?rev=944937&r1=944936&r2=944937&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
Sun May 16 23:12:07 2010
@@ -38,7 +38,7 @@
<pathelement location="target/${ant.project.name}.jar"/>
<path refid="compile-path"/>
<pathelement
location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
- <fileset dir="${openejb-dir}"/>
+ <path refid="openejb-path"/>
</classpath>
</java>
</target>
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml?rev=944937&r1=944936&r2=944937&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/services/smsgateway-ejb/build.xml
Sun May 16 23:12:07 2010
@@ -28,7 +28,7 @@
fork="true" failonerror="true">
<classpath>
<pathelement location="target/${ant.project.name}.jar"/>
- <files refid="openejb-files"/>
+ <path refid="openejb-path"/>
</classpath>
</java>
</target>
