[jboss-svn-commits] JBL Code SVN: r12490 - labs/jbossesb/trunk/product/samples/quickstarts/conf.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2007-06-12 10:13:56 -0400 (Tue, 12 Jun 2007)
New Revision: 12490

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Removed scoping restriction: JBESB-620

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-12 14:06:59 UTC (rev 12489)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-12 14:13:56 UTC (rev 12490)
@@ -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" />
@@ -392,7 +378,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>