[jboss-svn-commits] JBL Code SVN: r16540 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts: conf and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 12 13:54:36 EST 2007
Author: tcunning
Date: 2007-11-12 13:54:36 -0500 (Mon, 12 Nov 2007)
New Revision: 16540
Modified:
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/scheduled_services/build.xml
labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml
Log:
bug:JBESB-1004
Remove duplicate deploy-jms-dests targets.
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/build.xml 2007-11-12 17:19:26 UTC (rev 16539)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/bpm_orchestration1/build.xml 2007-11-12 18:54:36 UTC (rev 16540)
@@ -14,10 +14,6 @@
<property name="project.process.dir" value="processDefinition"/>
- <target name="deploy-jms-dests">
- <echo>This Quickstart does not deploy JMS destinations.</echo>
- </target>
-
<target name="config">
<delete dir="${jbossesb.inputdir}" quiet="true"/>
<mkdir dir="${jbossesb.inputdir}"/>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml 2007-11-12 17:19:26 UTC (rev 16539)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/conf/base-build.xml 2007-11-12 18:54:36 UTC (rev 16540)
@@ -341,12 +341,30 @@
</target>
- <target name="deploy-jms-dests" depends="dependencies, deploy-messaging">
+ <target name="check-jms-dests">
+ <condition property="jbossmq-present">
+ <available file="${basedir}/jbmq-queue-service.xml"/>
+ </condition>
+ <condition property="messaging.present">
+ <available file="${basedir}/jbm-queue-service.xml"/>
+ </condition>
+
+ <condition property="jms.dests.notrequired">
+ <not>
+ <or>
+ <istrue value="${messaging.present}"/>
+ <istrue value="${jbossmq-present}"/>
+ </or>
+ </not>
+ </condition>
+ </target>
+
+ <target name="deploy-jms-dests" depends="check-jms-dests, dependencies, deploy-messaging">
<description>deploy-jms-dests will deploy the jms destinations for application server
</description>
</target>
- <target name="undeploy-jms-dests" depends="dependencies, undeploy-messaging">
+ <target name="undeploy-jms-dests" depends="check-jms-dests, dependencies, undeploy-messaging">
<description>undeploy-jms-dests will undeploy the jms destination for application server
</description>
</target>
@@ -408,7 +426,7 @@
<!-- This section defines standalone message deployment -->
<!-- ==================================================================== -->
- <target name="deploy-messaging">
+ <target name="deploy-messaging" depends="check-jms-dests" unless="jms.dests.notrequired">
<copy file="${jms.service.file}" overwrite="true" tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" failonerror="false"/>
</target>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/build.xml 2007-11-12 17:19:26 UTC (rev 16539)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_hibernate_action/build.xml 2007-11-12 18:54:36 UTC (rev 16540)
@@ -16,10 +16,6 @@
<fileset dir="${basedir}/lib" includes="*.jar"/>
</path>
- <target name="deploy-jms-dests">
- <echo>This Quickstart does not deploy JMS destinations.</echo>
- </target>
-
<target name="package-deployment">
</target>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml 2007-11-12 17:19:26 UTC (rev 16539)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/helloworld_sql_action/build.xml 2007-11-12 18:54:36 UTC (rev 16540)
@@ -13,10 +13,6 @@
<target name="quickstart-specific-assemblies" description="Quickstart specific assemblies">
</target>
- <target name="deploy-jms-dests">
- <echo>This Quickstart does not deploy JMS destinations.</echo>
- </target>
-
<target name="quickstart-specific-deploys" description="Quickstart specific deploys">
<copy file="quickstart-ds.xml"
todir="${org.jboss.esb.server.deploy.dir}"
@@ -60,10 +56,6 @@
</sql>
</target>
- <target name="deploy-jms-dests">
- <echo message="This quickstart doesn't use any JMS Destinations. No JMS deployments required." />
- </target>
-
<target name="undeploy-jms-dests">
<echo message="This quickstart doesn't use any JMS Destinations. No JMS undeployments required." />
</target>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/scheduled_services/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/scheduled_services/build.xml 2007-11-12 17:19:26 UTC (rev 16539)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/scheduled_services/build.xml 2007-11-12 18:54:36 UTC (rev 16540)
@@ -8,10 +8,6 @@
<!-- Import the base Ant build script... -->
<import file="../conf/base-build.xml" />
- <target name="deploy-jms-dests">
- <echo>This Quickstart does not deploy JMS destinations.</echo>
- </target>
-
<target name="sendesb" depends="compile"
description="Will send an esb Message">
<echo>Native ESB Message Sender</echo>
Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml 2007-11-12 17:19:26 UTC (rev 16539)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/samples/quickstarts/static_router/build.xml 2007-11-12 18:54:36 UTC (rev 16540)
@@ -42,10 +42,6 @@
<copy file="log4j.xml" tofile="build/log4j.xml"/>
</target>
- <target name="deploy-jms-dests">
- <echo>This Quickstart does not deploy JMS destinations.</echo>
- </target>
-
<target name="runtest" depends="compile" description="runs the Test FTP file creator">
<echo>Runs Test FTP File creator</echo>
<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.staticrouter.test.CreateTestFile" failonerror="true">
More information about the jboss-svn-commits
mailing list