[jboss-svn-commits] JBL Code SVN: r12497 - in labs/jbossesb/trunk/product: samples/quickstarts/conf and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-06-12 11:51:39 -0400 (Tue, 12 Jun 2007)
New Revision: 12497

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

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-06-12 15:25:16 UTC (rev 12496)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-06-12 15:51:39 UTC (rev 12497)
@@ -51,12 +51,8 @@
         <target name="jms.config.check">
           <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging"/>
-          <available property="jbm.scoped.present"
-            file="${deploy.dir}/jboss-messaging/META-INF/jboss-service.xml"/>
           <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging.sar"/>
-          <available property="jbm.scoped.present"
-            file="${deploy.dir}/jboss-messaging.sar/META-INF/jboss-service.xml"/>
           <available property="jbmq.present"
             file="${deploy.dir}/jms/jbossmq-service.xml"/>
           <fail message="Could not determine JMS provider">
@@ -79,12 +75,8 @@
           <property name="messaging.excludes" value="jbmq-queue-service.xml"/>
         </target>
 
-        <target name="jbm.scoped.config" if="jbm.scoped.present">
-          <fail message="Scoped JBoss Messaging not yet supported"/>
-        </target>
+        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config"/>
 
-        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config, jbm.scoped.config"/>
-
         <target name="internal.deploy" depends="dependencies, jms.config" description="Deploys Internal Services to the server">
           <!-- jbossesb.sar -->
           <copy todir="${deploy.dir}/jbossesb.sar">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-12 15:25:16 UTC (rev 12496)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-12 15:51:39 UTC (rev 12497)
@@ -129,8 +129,7 @@
 
 		<condition 
 			property="org.jboss.esb.server.config" 
-			value="${quickstart.org.jboss.esb.server.config}"
-			else="default"> 
+			value="${quickstart.org.jboss.esb.server.config}">
 			<isset property="quickstart.org.jboss.esb.server.config"/>
 		</condition>
 
@@ -144,6 +143,14 @@
 			<isset property="quickstart.org.jboss.esb.server.home"/>
 		</condition>
 
+		<condition 
+			property="org.jboss.esb.server.config" 
+			value="${install.org.jboss.esb.server.config}">
+			<isset property="install.org.jboss.esb.server.config"/>
+		</condition>
+
+		<property name="org.jboss.esb.server.config" value="default"/>
+
 		<path id="deployment-classpath">
 			<fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
 			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>