[jboss-svn-commits] JBL Code SVN: r12492 - labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 12 10:26:42 EDT 2007
Author: beve
Date: 2007-06-12 10:26:42 -0400 (Tue, 12 Jun 2007)
New Revision: 12492
Modified:
labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
Log:
Merge from main: 12488:12490
Modified: labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml 2007-06-12 14:25:15 UTC (rev 12491)
+++ labs/jbossesb/workspace/dbevenius/product/samples/quickstarts/conf/base-build.xml 2007-06-12 14:26:42 UTC (rev 12492)
@@ -77,13 +77,6 @@
<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
</condition>
- <condition property="messaging.scoped.present">
- <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging/META-INF/jboss-service.xml"/>
- </condition>
- <condition property="messaging.scoped.present">
- <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar/META-INF/jboss-service.xml"/>
- </condition>
-
<condition property="jbossmq.present">
<not>
<isset property="messaging.present"/>
@@ -97,13 +90,6 @@
<property name="jms.description" value="JBoss Messaging"/>
</target>
- <!-- dependencies specific to JBoss Messaging in a scoped environment -->
- <target name="messaging-scoped-dependencies" if="messaging.scoped.present">
- <fail message="Scoped JBoss Messaging not yet supported"/>
- <property name="jms.service.file" value=""/>
- <property name="jms.description" value="JBoss Messaging (scoped)"/>
- </target>
-
<!-- dependencies specific to JBoss MQ -->
<target name="jbossmq-dependencies" if="jbossmq.present">
<property name="jms.service.file" value="jbmq-queue-service.xml"/>
@@ -211,7 +197,7 @@
<!-- compile-classpath, exec-classpath -->
<!-- ==================================================================== -->
- <target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, jbossesb-server-dependencies, messaging-config, messaging-dependencies, messaging-scoped-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+ <target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, jbossesb-server-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
<path id="compile-classpath">
<path refid="quickstart-dependencies-classpath" />
@@ -397,7 +383,7 @@
<!-- This section defines standalone message deployment -->
<!-- ==================================================================== -->
- <target name="deploy-messaging" unless="messaging.scoped.present">
+ <target name="deploy-messaging">
<copy file="${jms.service.file}" overwrite="true" tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" failonerror="false"/>
</target>
More information about the jboss-svn-commits
mailing list