[jboss-svn-commits] JBL Code SVN: r18320 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts: webservice_bpel and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 5 13:53:52 EST 2008
Author: kevin.conner at jboss.com
Date: 2008-02-05 13:53:52 -0500 (Tue, 05 Feb 2008)
New Revision: 18320
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_bpel/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer1/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer2/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_producer/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml
Log:
Fixed target dependencies: JBESB-1533
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/conf/base-build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -175,6 +175,18 @@
<target name="jbossesb-source-dependencies"
depends="jbossesb-quickstart-override" if="build.jbossesb">
+ <condition
+ property="org.jboss.esb.server.config"
+ value="${quickstart.org.jboss.esb.server.config}">
+ <isset property="quickstart.org.jboss.esb.server.config"/>
+ </condition>
+
+ <condition
+ property="org.jboss.esb.server.home"
+ value="${quickstart.org.jboss.esb.server.home}">
+ <isset property="quickstart.org.jboss.esb.server.home"/>
+ </condition>
+
<!-- check for installation deployment.properties -->
<property name="install.dir" value="${product.dir}/install"/>
<property file="${install.dir}/deployment.properties" prefix="install" />
@@ -237,7 +249,9 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+ <target name="dependencies" depends="classpath-dependencies, quickstart-specific-checks"/>
+
+ <target name="classpath-dependencies" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
<path refid="quickstart-dependencies-classpath" />
@@ -247,6 +261,7 @@
<path refid="deployment-classpath" />
<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
</path>
+ <property name="compile-classpath" refid="compile-classpath"/>
<path id="exec-classpath">
<pathelement location="." />
@@ -260,6 +275,7 @@
<path refid="compile-classpath" />
<pathelement location="${pwd}/anttasks/classes" />
</path>
+ <property name="exec-classpath" refid="exec-classpath"/>
</target>
<!-- ==================================================================== -->
@@ -277,8 +293,8 @@
<mkdir dir="${pwd}/anttasks/classes" />
<javac srcdir="${pwd}/anttasks/src" destdir="${pwd}/anttasks/classes" debug="true">
- <classpath refid="compile-classpath" />
- </javac>
+ <classpath refid="compile-classpath" />
+ </javac>
</target>
<target name="run" depends="compile,config">
@@ -447,7 +463,7 @@
<!-- supports JBossWS or EJB. -->
<!-- ==================================================================== -->
- <target name="assert-ws-available">
+ <target name="assert-ws-available" depends="jbossesb-dependencies">
<available property="ws-spi" file="${org.jboss.esb.server.server}/lib/jbossws-spi.jar"/>
<available property="ws-intros" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar/jboss-jaxb-intros.jar"/>
@@ -481,7 +497,7 @@
<fail unless="quickstart.ftp.config" message="Please configure ftp properties in quickstart.properties"/>
</target>
- <target name="assert-jbossremoting-version">
+ <target name="assert-jbossremoting-version" depends="classpath-dependencies">
<java fork="yes" classname="org.jboss.remoting.Version" failonerror="true" outputproperty="jbr-version-string">
<classpath refid="exec-classpath"/>
</java>
@@ -510,6 +526,8 @@
<path id="quickstart-dependencies-classpath"/>
</target>
+ <target name="quickstart-specific-checks"/>
+
<target name="quickstart-specific-assemblies">
<echo message="No Quickstart specific assembly tasks." />
</target>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_bpel/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_bpel/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -28,7 +28,9 @@
</javac>
</target>
- <target name="quickstart-specific-assemblies" depends="assert-ws-available">
+ <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+
+ <target name="quickstart-specific-assemblies">
<!-- Overriden from the target of the same name in base-build.xml. -->
<!-- Called by the "deploy" target. Don't call directly!! -->
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer1/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer1/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer1/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -10,7 +10,9 @@
<property name="war.build.dir" location="${build.dir}/war/classes"/>
- <target name="quickstart-specific-assemblies" depends="assert-ws-available, makewar"/>
+ <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+
+ <target name="quickstart-specific-assemblies" depends="makewar"/>
<target name="makewar" description="make war">
<!-- Compile... -->
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer2/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer2/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_consumer2/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -10,8 +10,10 @@
<property name="war.build.dir" location="${build.dir}/war/classes"/>
- <target name="quickstart-specific-assemblies" depends="assert-ws-available, makewar"/>
+ <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+ <target name="quickstart-specific-assemblies" depends="makewar"/>
+
<target name="makewar" description="make war">
<!-- Compile... -->
<mkdir dir="${war.build.dir}" />
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_mtom/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -8,7 +8,9 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
+ <target name="quickstart-specific-checks" depends="assert-ws-available,assert-jbossremoting-version"/>
+
+ <target name="quickstart-specific-dependencies">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_producer/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_producer/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_producer/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -8,7 +8,9 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available">
+ <target name="quickstart-specific-checks" depends="assert-ws-available"/>
+
+ <target name="quickstart-specific-dependencies">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wsaddressing/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -8,7 +8,9 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
+ <target name="quickstart-specific-checks" depends="assert-ws-available,assert-jbossremoting-version"/>
+
+ <target name="quickstart-specific-dependencies">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
</path>
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml 2008-02-05 18:38:51 UTC (rev 18319)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/samples/quickstarts/webservice_wssecurity/build.xml 2008-02-05 18:53:52 UTC (rev 18320)
@@ -8,7 +8,9 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml"/>
- <target name="quickstart-specific-dependencies" depends="assert-ws-available,assert-jbossremoting-version">
+ <target name="quickstart-specific-checks" depends="assert-ws-available,assert-jbossremoting-version"/>
+
+ <target name="quickstart-specific-dependencies">
<path id="quickstart-dependencies-classpath">
<fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar"/>
</path>
More information about the jboss-svn-commits
mailing list