[jboss-svn-commits] JBL Code SVN: r12347 - in labs/jbossesb/trunk/product: install and 31 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jun 5 18:02:55 EDT 2007


Author: kevin.conner at jboss.com
Date: 2007-06-05 18:02:55 -0400 (Tue, 05 Jun 2007)
New Revision: 12347

Added:
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml
   labs/jbossesb/trunk/product/samples/quickstarts/more_action/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl
   labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml
Removed:
   labs/jbossesb/trunk/product/install/DMQ/
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl
   labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-service.xml
Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/install/deployment.properties-example
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java
   labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/readme.txt
   labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml
   labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/deployment.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/build.xml
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbm-queue-service.xml
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/deployment.xml
   labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbm-queue-service.xml
   labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbmq-queue-service.xml
   labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml
Log:
Updated QuickStarts to build/execute in current hierarchies

Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/build-distr.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,10 @@
 <project name="JBESB Distribution Build" default="dist" basedir=".">
+    <!-- Set default properties filename -->
+    <property name="org.jboss.esb.properties" location="product.properties"/>
+
+    <!-- Load Build Properties File -->
+    <property file="${org.jboss.esb.properties}"/>
+
     <property name="build.dir" value="build"/>
     <property name="lib.ext.dir" value="lib/ext"/>
     <property name="services.dir" value="services"/>
@@ -144,9 +150,9 @@
         <mkdir dir="${build.dir}/services"/>
         <copy todir="${build.dir}/services">
             <fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
-            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml"/>
+            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml jbossesb.esb/jbm-queue-service-scoped.xml"/>
         	<fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
-        	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml"/>
+        	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml smooks.esb/jbm-queue-service-scoped.xml"/>
         </copy>
     </target>
 

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -4,6 +4,14 @@
 		JBoss ESB Project
 	</description>
 	
+	<!-- Set default properties filename -->
+	<property name="org.jboss.esb.properties" location="product.properties"/>
+	<property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
+
+	<!-- Load Build Properties File -->
+	<property file="${org.jboss.esb.properties}"/>
+	<property file="${org.jboss.esb.deployment.properties}"/>
+
 	<!-- class path behaviour -->
 	<property name="build.sysclasspath" value="ignore"/>
 
@@ -15,10 +23,6 @@
 	<!-- Product properties file -->
 	<property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
 	
-	<!-- Set default properties filename -->
-	<property name="org.jboss.esb.properties" location="product.properties"/>
-	<property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
-
 	<!-- Some default build locations -->
 	<property name="org.jboss.esb.internal.dest" location="build"/>
 	<property name="org.jboss.esb.internal.jar.dest" location="build/jbossesb/lib"/>
@@ -28,10 +32,6 @@
 	<property name="esb.server.name" value="jbossesb-server-${version}"/>
 	<property name="esbserver.dist.dir" value="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
 
-	<!-- Load Build Properties File -->
-	<property file="${org.jboss.esb.properties}"/>
-	<property file="${org.jboss.esb.deployment.properties}"/>
-
 	<!-- Set internal property defaults -->
 	<property name="org.jboss.esb.installationdirectory" location="build/jbossesb"/>
 	

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -9,19 +9,54 @@
 	
         <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
 
-	<target name="deploy"   depends="sar.deploy, internal.deploy"   description="Wrapper for jboss.sar.deploy"/>
+        <property name="product.dir" location=".."/>
+
+        <!-- Are we embedded in a source hierarchy? -->
+        <condition property="hierarchy.source">
+          <available file="${product.dir}/build-distr.xml"/>
+        </condition>
+        <!-- Are we embedded in a jbossesb distribution hierarchy? -->
+        <condition property="hierarchy.jbossesb">
+          <available file="${product.dir}/JBossORG-EULA.txt"/>
+        </condition>
+
+        <condition property="hierarchy.recognised">
+          <or>
+            <isset property="hierarchy.source"/>
+            <isset property="hierarchy.jbossesb"/>
+          </or>
+        </condition>
+
+        <fail unless="hierarchy.recognised" message="Cannot determine build hierarchy"/>
+
+        <target name="dependencies.jbossesb" if="hierarchy.jbossesb">
+            <property name="org.jboss.esb.dist.lib" location="${product.dir}/lib"/>
+        </target>
+
+        <target name="dependencies.source" if="hierarchy.source">
+            <available file="${product.dir}/build/jbossesb" property="dist.exists"/>
+            <fail unless="dist.exists"
+                  message="JBossESB must be built. Please run 'ant dist' in ${product.dir}"/>
+
+            <property name="org.jboss.esb.dist.lib" location="${product.dir}/build/jbossesb/lib"/>
+            
+        </target>
+
+        <target name="dependencies" depends="dependencies.source, dependencies.jbossesb"/>
+
+	<target name="deploy"   depends="internal.deploy"   description="Wrapper for internal.deploy"/>
+
 	<target name="tomcat"   depends="tomcat.compile, tomcat.war.all.deploy"  description="Wrapper for tomcat.war.all.deploy"/>
 	
-	<target name="sar.deploy" description="Deploys JBossESB to the server">
-      <copy  todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy">
-         <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb.sar/**"/></copy>
-	</target>
-	
         <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">
@@ -37,29 +72,48 @@
         </target>
 
         <target name="jbmq.config" if="jbmq.present">
-          <property name="messaging.config" location="DMQ/jbmq-queue-service.xml"/>
-          <property name="messaging.deployment" location="DMQ/jbmq-deployment.xml"/>
+          <property name="messaging.excludes" value="jbm-queue-service.xml"/>
         </target>
 
         <target name="jbm.config" if="jbm.present">
-          <property name="messaging.config" location="DMQ/jbm-queue-service.xml"/>
-          <property name="messaging.deployment" location="DMQ/jbm-deployment.xml"/>
+          <property name="messaging.excludes" value="jbmq-queue-service.xml"/>
         </target>
 
-        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config"/>
+        <target name="jbm.scoped.config" if="jbm.scoped.present">
+          <fail message="Scoped JBoss Messaging not yet supported"/>
+        </target>
 
-        <target name="internal.deploy" depends="jms.config" description="Deploys Internal Services to the server">
+        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config, jbm.scoped.config"/>
 
-          <property name="internal.services.deploy.dir" value="${deploy.dir}/jbossesb.esb"/>
-          <property name="internal.services.metainf.dir" value="${internal.services.deploy.dir}/META-INF"/>
-          <mkdir dir="${internal.services.metainf.dir}"/>
-          <copy todir="${internal.services.metainf.dir}"
-            file="${org.jboss.esb.dist.lib}/jbossesb.esb/META-INF/jboss-esb.xml"/>
-          <copy todir="${internal.services.deploy.dir}"
-            file="${messaging.config}"/>
-          <copy tofile="${internal.services.metainf.dir}/deployment.xml"
-            file="${messaging.deployment}"/>
+        <target name="internal.deploy" depends="dependencies, jms.config" description="Deploys Internal Services to the server">
+          <!-- jbossesb.sar -->
+          <copy todir="${deploy.dir}/jbossesb.sar">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar"/>
+          </copy>
 
+          <!-- jbossesb.esb -->
+          <copy todir="${deploy.dir}/jbossesb.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
+
+          <!-- jbpm.esb -->
+          <copy todir="${deploy.dir}/jbpm.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbpm.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
+
+          <!-- jbrules.esb -->
+          <copy todir="${deploy.dir}/jbrules.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/jbrules.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
+
+          <!-- smooks.esb -->
+          <copy todir="${deploy.dir}/smooks.esb">
+            <fileset dir="${org.jboss.esb.dist.lib}/smooks.esb"
+              excludes="${messaging.excludes}"/>
+          </copy>
         </target>
 
         <property name="org.jboss.esb.tomcat.55lib"
@@ -120,24 +174,4 @@
 				excludes="jbossesb-dependencies.jar" />
 		</copy>
 	</target>
-	
-	<target name="check.is.bundle">
-		<condition property="is.not.bundle" >
-			<not>
-	    		<available file="${org.jboss.esb.dist.lib}/../jboss-4.0.5.GA.zip" />
-			</not>
-		</condition>
-	</target>
-	
-	<target name="install" depends="install.jboss" description="Installs JBossAS-4.0.GA with ejb3 and deploys JBossESB to it">
-		<antcall target="deploy" />
-	</target>
-
-	<target name="install.jboss" unless="is.not.bundle" depends="check.is.bundle">
-		<echo>This task creates a ready-to-go JBossESB install deployed in /JBoss-4.0.5.GA (on the root
-		of your file system) if you have downloaded the bundle.</echo>
-		<unzip src="${org.jboss.esb.dist.lib}/../jboss-4.0.5.GA.zip" dest="${org.jboss.esb.server.home}/../" />
-	</target>
-	
-	
 </project>

Modified: labs/jbossesb/trunk/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/install/deployment.properties-example	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/install/deployment.properties-example	2007-06-05 22:02:55 UTC (rev 12347)
@@ -4,13 +4,6 @@
 # Copy the example file and replace with your values
 #
 ######################################################################
-#
-# Note: You should not need to change this entry unless you altered
-#       the jbossesb distribution directory structure, however if you check out from SVN you will 
-#       have to run the 'ant dist' target, and it that
-#       case use: org.jboss.esb.dist.lib=../build
-#
-org.jboss.esb.dist.lib=../lib
 
 ######################################################################
 # You can use three deployment options: deploy to JBossAS, Tomcat or

Added: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+  <mbean code="org.jboss.jms.server.destination.QueueService"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed"
+    xmbean-dd="xmdesc/Queue-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+  </mbean>
+</server>
+


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>
+


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/aggregator/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,86 +1,73 @@
-<project name="Quickstart_bpm_orchestration1" default="esb" basedir=".">
-
-	<description>
-		${ant.project.name}
-		${line.separator}
-	</description>
-
-  <!-- Import the base Ant build script... -->
-  <import file="../conf/base-build.xml"/>
-
-  <!--property name="jbpm.services.build.dir" value="${product.dir}/build/services/jbpm.esb" /-->
-  <property name="jbpm.services.build.dir" value="${product.dir}/build/jbossesb/lib/jbpm.esb" />
-  <property name="jbossesb.inputdir" location="/tmp"/>
-  <property name="project.process.dir" value="processDefinition1"/>
-	
-  <!-- note: this overrides the one from base-build.xml -->
-  <!-- we need to reset the base-build.xml so that it allows for the BPM feature -->
-
-  <path id="quickstart-dependencies-classpath">
-      <fileset dir="${basedir}" includes="build/**/*.jar"/>
-      <fileset dir="${basedir}" includes="build/**/*.xml"/>
-      <fileset dir="${jbpm.services.build.dir}" includes="*jar"/>
-    </path>
-
-	<target name="prepare" depends="clean">
-    	<copy todir="build/${ant.project.name}.esb">
-			<fileset dir="${jbpm.services.build.dir}" />
-		</copy>
-		<mkdir dir="build/classes" />
-	</target>
-	
-  <target name="esb" depends="prepare,compile">
-    <copy overwrite="true" file="jboss-esb.xml" todir="build/${ant.project.name}.esb/META-INF" />
-    <copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="build/${ant.project.name}.esb" />
-    <copy todir="build/${ant.project.name}.esb">
-      <fileset dir="build/classes" includes="**/*" />
-    </copy>
-    <mkdir dir="build/${ant.project.name}.esb/scripts"/>
-    <copy todir="build/${ant.project.name}.esb/scripts">
-      <fileset dir="scripts" includes="**/*" />
-    </copy>
-  </target>
-	
-	<!-- override as we deploy in exploded view -->
-	<target name="package-deployment"/>	
-	
-	<target name="run">
-		<echo message="This target is not implemented for this quickstart. Please run 'ant deploy' and the 'ant runtest'"/>
-	</target>
-
-    <target name="deploy" depends="esb">
-		<delete quiet="true" dir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<delete quiet="true" file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<copy todir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" >
-			<fileset dir="build/${ant.project.name}.esb" includes="**/*" />
-		</copy>
-    </target>
+<project name="Quickstart_bpm_orchestration1" default="esb" basedir=".">
 
-  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
-    <echo>Moves the changed process definition to the server without restarting all the services</echo>
-    <copy overwrite="true" 
-        file="${project.process.dir}/processdefinition.xml"
-	    tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb/processdefinition.xml"/>
-  </target>
-	
-  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
-    <echo>Sends a message to deploy the process definition</echo>
-	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
-		<arg value="${jbossesb.inputdir}"/>
-		<arg value=".deployProcessGW"/> <!-- file ext -->
-		<arg value="Go Deploy It"/> <!-- the file contents -->
-		<classpath refid="exec-classpath"/>
-	</java>
-  </target>
-      
-  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
-	<echo>Sends a message to start the process instance</echo>
-	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
-	  <arg value="${jbossesb.inputdir}"/>
-	  <arg value=".startProcessGW"/> <!-- file ext -->
-	  <arg value="Start It Up"/> <!-- the file contents -->
-	  <classpath refid="exec-classpath"/>
-	</java>
-  </target>	
-
-</project>
+	<description>
+		${ant.project.name}
+		${line.separator}
+	</description>
+
+  <!-- Import the base Ant build script... -->
+  <import file="../conf/base-build.xml"/>
+
+  <property name="jbossesb.inputdir" location="${build.dir}/inputdir"/>
+
+  <property name="project.process.dir" value="processDefinition1"/>
+
+  <target name="config">
+    <delete dir="${jbossesb.inputdir}" quiet="true"/>
+    <mkdir dir="${jbossesb.inputdir}"/>
+    <copy file="${basedir}/jboss-esb-unfiltered.xml" tofile="${basedir}/jboss-esb.xml" overwrite="true" filtering="true">
+      <filterset>
+        <filter token="INPUT_DIR" value="${jbossesb.inputdir}"/>
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="quickstart-specific-assemblies">
+    <copy overwrite="true" file="${project.process.dir}/processdefinition.xml" todir="${classes}" />
+    <copy todir="${classes}">
+      <fileset dir="${basedir}" includes="scripts/**/*"/>
+    </copy>
+  </target>
+	
+  <target name="run">
+		<echo message="This target is not implemented for this quickstart. Please run 'ant deploy' and the 'ant runtest'"/>
+	</target>
+
+  <target name="deploy-esb-archive-before"/>
+  <target name="deploy-esb-archive-after"/>
+
+  <target name="quickstart-specific-deploys">
+    <property name="dest" location="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+    <delete quiet="true" dir="${dest}"/>
+    <mkdir dir="${dest}"/>
+    <unjar src="${build.dir}/${ant.project.name}.esb" dest="${dest}"/>
+  </target>
+
+  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
+    <echo>Moves the changed process definition to the server without restarting all the services</echo>
+    <copy overwrite="true" 
+        file="${project.process.dir}/processdefinition.xml"
+	    tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb/processdefinition.xml"/>
+  </target>
+	
+  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
+    <echo>Sends a message to deploy the process definition</echo>
+	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
+		<arg value="${jbossesb.inputdir}"/>
+		<arg value=".deployProcessGW"/> <!-- file ext -->
+		<arg value="Go Deploy It"/> <!-- the file contents -->
+		<classpath refid="exec-classpath"/>
+	</java>
+  </target>
+      
+  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
+	<echo>Sends a message to start the process instance</echo>
+	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
+	  <arg value="${jbossesb.inputdir}"/>
+	  <arg value=".startProcessGW"/> <!-- file ext -->
+	  <arg value="Start It Up"/> <!-- the file contents -->
+	  <classpath refid="exec-classpath"/>
+	</java>
+  </target>	
+
+</project>

Copied: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,196 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
+    parameterReloadSecs="5">
+
+    <providers>        
+         <fs-provider name="FSprovider1">
+         
+          	<fs-bus busid="deployGwChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".deployProcessGW"          			
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>    
+          	<fs-bus busid="deployEsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".deployProcessESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus> 
+          	
+          	<fs-bus busid="startGwChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".startProcessGW"
+          			work-suffix=".startProcessGWWorking"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>   
+          	<fs-bus busid="startEsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".startProcessESB"          			
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>    
+          	<fs-bus busid="service1EsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".service1ESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>   
+          	<fs-bus busid="service2EsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".service2ESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus> 
+          	<fs-bus busid="service3EsbChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".service3ESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>    
+          	<fs-bus busid="resultsService" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".resultsServiceESB"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>       	          	        	   	
+         </fs-provider>
+      </providers>
+
+      <services>
+        <service category="BPM_Orchestration_Deploy_Service" name="Deploy_Service"
+                 description="BPM Orchestration Sample 1: Use this service to deploy a process instance">
+            <listeners>
+                <fs-listener name="Gateway" busidref="deployGwChannel"
+                    maxThreads="1"
+                    is-gateway="true" />
+                <fs-listener name="ESB-Listener" busidref="deployEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+              <actions>
+                <action name="DeployFromFile" 
+                  class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                  <property name="command" value="DeployProcessDefinition" />
+                  <property name="process-definition-file" value="/processdefinition.xml" />
+                </action>
+              </actions>
+        </service>
+        
+        <service category="BPM_Orchestration_Starter_Service" name="Starter_Service"
+                 description="BPM Orchestration Sample 1: Use this service to start a process instance">
+            <listeners>
+                <fs-listener name="Gateway" busidref="startGwChannel"
+                    maxThreads="4"
+                    is-gateway="true" />
+                <fs-listener name="ESB-Listener" busidref="startEsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                    
+                <!-- move the body.getContents() into jBPM -->    
+                <action name="create_new_process_instance" 
+                    class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="NewProcessInstanceCommand" />
+                    <property name="process-definition-name" value="processDefinition1"/>   
+                    <property name="actor" value="FrankSinatra"/>                                                 
+                    <property name="esb-to-jbpm">
+                      <!-- esb-name maps to getBody().get("eVar1") -->
+                      <variables>
+                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+                      </variables>
+                    </property>                    
+                 </action>  
+
+                <action name="displayProcessInfo" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.ProcessInfo"/>
+
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                 
+                 <action  name="signal_the_new_process_instance" 
+                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
+                    <property name="command" value="SignalCommand" />
+                    <property name="esb-to-jbpm">
+                      <!-- esb-name maps to getBody().get("eVar1") -->
+                      <variables>
+                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
+                      </variables>
+                    </property>                    
+                 </action>
+
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
+                            
+            </actions>
+        </service>
+        
+        <service category="BPM_Orchestration_Service1" name="Service1"
+                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="service1EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service1.groovy" />
+                </action>                                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration_Service2" name="Service2"
+                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="service2EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service2.groovy" />
+                </action>                
+            </actions>
+        </service>
+        <service category="BPM_Orchestration_Service3" name="Service3"
+                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="service3EsbChannel"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
+                  <property name="script" value="/scripts/service3.groovy" />
+                </action>
+            </actions>
+        </service>
+        <service category="BPM_Orchestration_ResultsService" name="ResultsService"
+                 description="BPM Orchestration Sample 1: Sends outbound results of the process flow">
+            <listeners>
+                <fs-listener name="ESB-Listener" busidref="resultsService"
+                maxThreads="1"/>
+            </listeners>
+            <actions>
+                <action name="spy" 
+                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>                 
+            </actions>
+        </service>
+      </services>
+</jbossesb>

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,196 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd"
-    parameterReloadSecs="5">
-
-    <providers>        
-         <fs-provider name="FSprovider1">
-         
-          	<fs-bus busid="deployGwChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".deployProcessGW"          			
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>    
-          	<fs-bus busid="deployEsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".deployProcessESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus> 
-          	
-          	<fs-bus busid="startGwChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".startProcessGW"
-          			work-suffix=".startProcessGWWorking"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>   
-          	<fs-bus busid="startEsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".startProcessESB"          			
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>    
-          	<fs-bus busid="service1EsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".service1ESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>   
-          	<fs-bus busid="service2EsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".service2ESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus> 
-          	<fs-bus busid="service3EsbChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".service3ESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>    
-          	<fs-bus busid="resultsService" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".resultsServiceESB"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>       	          	        	   	
-         </fs-provider>
-      </providers>
-
-      <services>
-        <service category="BPM_Orchestration_Deploy_Service" name="Deploy_Service"
-                 description="BPM Orchestration Sample 1: Use this service to deploy a process instance">
-            <listeners>
-                <fs-listener name="Gateway" busidref="deployGwChannel"
-                    maxThreads="1"
-                    is-gateway="true" />
-                <fs-listener name="ESB-Listener" busidref="deployEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-              <actions>
-                <action name="DeployFromFile" 
-                  class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                  <property name="command" value="DeployProcessDefinition" />
-                  <property name="process-definition-file" value="/processdefinition.xml" />
-                </action>
-              </actions>
-        </service>
-        
-        <service category="BPM_Orchestration_Starter_Service" name="Starter_Service"
-                 description="BPM Orchestration Sample 1: Use this service to start a process instance">
-            <listeners>
-                <fs-listener name="Gateway" busidref="startGwChannel"
-                    maxThreads="4"
-                    is-gateway="true" />
-                <fs-listener name="ESB-Listener" busidref="startEsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                    
-                <!-- move the body.getContents() into jBPM -->    
-                <action name="create_new_process_instance" 
-                    class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="NewProcessInstanceCommand" />
-                    <property name="process-definition-name" value="processDefinition1"/>   
-                    <property name="actor" value="FrankSinatra"/>                                                 
-                    <property name="esb-to-jbpm">
-                      <!-- esb-name maps to getBody().get("eVar1") -->
-                      <variables>
-                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-                      </variables>
-                    </property>                    
-                 </action>  
-
-                <action name="displayProcessInfo" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.ProcessInfo"/>
-
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                 
-                 <action  name="signal_the_new_process_instance" 
-                   class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor">
-                    <property name="command" value="SignalCommand" />
-                    <property name="esb-to-jbpm">
-                      <!-- esb-name maps to getBody().get("eVar1") -->
-                      <variables>
-                        <variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-                        <variable esb-name="BODY_CONTENT" jbpm-name="theBody" />
-                      </variables>
-                    </property>                    
-                 </action>
-
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>
-                            
-            </actions>
-        </service>
-        
-        <service category="BPM_Orchestration_Service1" name="Service1"
-                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="service1EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service1.groovy" />
-                </action>                                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration_Service2" name="Service2"
-                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="service2EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service2.groovy" />
-                </action>                
-            </actions>
-        </service>
-        <service category="BPM_Orchestration_Service3" name="Service3"
-                 description="BPM Orchestration Sample 1: this is a service invoked within the process">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="service3EsbChannel"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="groovy" class="org.jboss.soa.esb.actions.scripting.GroovyActionProcessor">
-                  <property name="script" value="/scripts/service3.groovy" />
-                </action>
-            </actions>
-        </service>
-        <service category="BPM_Orchestration_ResultsService" name="ResultsService"
-                 description="BPM Orchestration Sample 1: Sends outbound results of the process flow">
-            <listeners>
-                <fs-listener name="ESB-Listener" busidref="resultsService"
-                maxThreads="1"/>
-            </listeners>
-            <actions>
-                <action name="spy" 
-                    class="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.esb_actions.MessageSpy"/>                 
-            </actions>
-        </service>
-      </services>
-</jbossesb>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -10,12 +10,13 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-	<property name="ejb.jar.name" value="${basedir}/build/helloworld-ejb.jar"/>
+	<property name="ejb.jar.name" value="${basedir}/build/business_service-ejb.jar"/>
 	<property name="additional.deploys" value="${ejb.jar.name}"/>
 
    <property name="classes" value="build/classes"/>
 	
-	<path id="quickstart.classpath">
+	<target name="config">
+		<path id="quickstart-dependencies-classpath">
 			<fileset dir="${org.jboss.esb.server.home}/client" >
 				<include name="jbossmq-client.jar"/>
 				<include name="jboss-ejb3-client.jar"/>
@@ -26,24 +27,16 @@
 				<include name="jbossmq-client.jar"/>
 				<include name="jboss-messaging-client.jar"/>
 			</fileset>
-			<fileset dir="${product.dir}/lib/ext">
-				<include name="*.jar"/>		
-				<exclude name="jboss.jar"/>
-				<exclude name="jbossall.jar"/>
-				<exclude name="jboss-messaging-client.jar"/>
-			</fileset>
-			<pathelement location="."/>
-			<pathelement location="build/classes"/>
-			<pathelement location="src"/>
-			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="jboss-remoting.jar"/>
-			<fileset dir="${esb.product.lib.dir}" includes="*.jar" excludes="jboss-remoting.jar"/>
 		</path>
+	</target>
 	
+	<target name="quickstart-specific-dependencies" depends="assert-ejb3-available"/>
+
 	<target name="run" depends="compile,config">
 			<echo>Launching Quickstart in standalone mode...</echo>
 			<java fork="yes" classname="org.jboss.soa.esb.listeners.StandAloneBootStrapper" failonerror="true">
 				<arg value="${basedir}/jboss-esb.xml" />
-				<classpath refid="quickstart.classpath" />
+				<classpath refid="exec-classpath" />
 			</java>
 	</target>
 
@@ -57,7 +50,7 @@
 	description="tests a pojo">
       <java classname="org.jboss.tutorial.stateless.client.Client" fork="yes" dir=".">
          <arg value="-pojo"/>
-			<classpath refid="quickstart.classpath" />
+			<classpath refid="exec-classpath" />
       </java>
    </target>
 
@@ -65,7 +58,7 @@
 	description="tests an EJB">
       <java classname="org.jboss.tutorial.stateless.client.Client" fork="yes" dir=".">
          <arg value="-ejb"/>
-			<classpath refid="quickstart.classpath" />
+			<classpath refid="exec-classpath" />
       </java>
    </target>
 
@@ -74,7 +67,7 @@
       <echo>Runs Test JMS Sender</echo>
       <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.businessservice.test.SendJMSMessage" failonerror="true">
          <arg value="Your Name"/>
-			<classpath refid="quickstart.classpath" />
+			<classpath refid="exec-classpath" />
       </java>
    </target>
 	

Added: labs/jbossesb/trunk/product/samples/quickstarts/business_service/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/business_service/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,8 +5,8 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
-</server>
\ No newline at end of file
+</server>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>
-</server>
\ No newline at end of file
+</server>

Copied: labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbmq-queue-service.xml (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+     name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_business_service_Request">
+     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+</server>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -10,7 +10,7 @@
               <jms-bus busid="quickstartGwChannel">
                   <jms-message-filter
                       dest-type="QUEUE"
-                      dest-name="queue/quickstart_helloworld_Request"
+                      dest-name="queue/quickstart_business_service_Request"
                   />
               </jms-bus>
               <jms-bus busid="quickstartEsbChannel">

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/jboss-mq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-     name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_Request">
-     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/business_service/src/org/jboss/soa/esb/samples/quickstart/businessservice/test/SendJMSMessage.java	2007-06-05 22:02:55 UTC (rev 12347)
@@ -42,7 +42,7 @@
     	Object tmp = iniCtx.lookup("ConnectionFactory");
     	QueueConnectionFactory qcf = (QueueConnectionFactory) tmp;
     	conn = qcf.createQueueConnection();
-    	que = (Queue) iniCtx.lookup("queue/quickstart_helloworld_Request");
+    	que = (Queue) iniCtx.lookup("queue/quickstart_business_service_Request");
     	session = conn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
     	conn.start();
     	System.out.println("Connection Started");
@@ -73,4 +73,4 @@
     	
     }
     
-}
\ No newline at end of file
+}

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,87 +1,115 @@
 <project name="base-build" basedir=".">
-	
 	<!-- get the name of the directory where this file exists -->
 	<dirname property="pwd" file="${ant.file.base-build}"/>
 	
 	<dirname property="quickstarts.dir" file="${pwd}/"/>
 	<dirname property="product.dir" file="${quickstarts.dir}/.."/>
-	<property name="install.dir" value="${product.dir}/install"/>
 
-	<!-- load properties file: quickstarts.properties, with prefix quickstart. -->
 	<property file="${pwd}/quickstarts.properties" prefix="quickstart" />
-	
-	<!-- load properties file: install/deployment.properties, with prefix install.  -->
-	<property file="${install.dir}/deployment.properties" prefix="install" />
-	
+
     <property name="build.dir" value="${basedir}/build" />
     <property name="classes" value="${build.dir}/classes" />
-
-	<!-- 
-		check if org.jboss.esb.jboss.server.home has been specified in quickstarts.properites 
-	-->
-	<condition
-		property="org.jboss.esb.server.home"  
-		value="${quickstart.org.jboss.esb.server.home}" 
-		else="${install.org.jboss.esb.server.home}"> 
-		<isset property="quickstart.org.jboss.esb.server.home"/>
-	</condition>
 	
-	<!-- 
-		check if org.jboss.esb.jboss.server.config has been specified in quickstarts.properites 
-		default = "default"
-	-->
-	<condition 
-		property="org.jboss.esb.server.config" 
-		value="${quickstart.org.jboss.esb.server.config}"
-		else="default"> 
-		<isset property="quickstart.org.jboss.esb.server.config"/>
+	<!-- Are we embedded in a source hierarchy? -->
+	<condition property="hierarchy.source">
+		<available file="${product.dir}/build-distr.xml"/>
 	</condition>
-	
-	<!-- JBoss Application server deploy directory -->
-	<property name="org.jboss.esb.server.deploy.dir" 
-		value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
-	
-
-	<!-- lib directory for jbossesb jar files.  
-		 src distribution 		= ${product.dir}/build/jbossesb/lib
-		 bundled distribution	= ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib
-		 ga 					= ${product.dir}/lib ? Need to verify all possible distributions. Daniel 20070525
-	-->
-	<condition property="esb.product.lib.dir.src.or.ga" 
-		value="${product.dir}/build/jbossesb/lib" else="${product.dir}/lib/ext">
-		<available file="${product.dir}/build/jbossesb/lib/jbossesb-rosetta.jar"/>
+	<!-- Are we embedded in a jbossesb distribution hierarchy? -->
+	<condition property="hierarchy.jbossesb">
+		<and>
+			<available file="${product.dir}/JBossORG-EULA.txt"/>
+			<not>
+				<available file="${product.dir}/server/default"/>
+			</not>
+		</and>
 	</condition>
+	<!-- Are we embedded in a jbossesb-server distribution hierarchy? -->
+	<condition property="hierarchy.jbossesb-server">
+		<and>
+			<available file="${product.dir}/JBossORG-EULA.txt"/>
+			<available file="${product.dir}/server/default"/>
+		</and>
+	</condition>
+	<!-- Do we build against a jbossesb distribution? -->
+	<condition property="build.jbossesb">
+		<or>
+			<isset property="hierarchy.source"/>
+			<isset property="hierarchy.jbossesb"/>
+		</or>
+	</condition>
 
-	<condition property="esb.product.lib.dir" 
-		value="${esb.product.lib.dir.src.or.ga}" else="${product.dir}/server/default/deploy/jbossesb.sar/lib">
-		<available file="${esb.product.lib.dir.src.or.ga}/jbossesb-rosetta.jar"/>
+	<condition property="build.recognised">
+		<or>
+			<isset property="build.jbossesb"/>
+			<isset property="hierarchy.jbossesb-server"/>
+		</or>
 	</condition>
 
-	<!-- fail if this is not a GA release distribution and the project has not yet been built -->	
-	<available file="${esb.product.lib.dir}/jbossesb-rosetta.jar" property="lib.exists" />
+	<fail unless="build.recognised" message="Cannot determine build hierarchy"/>
 
-	<!-- ext lib directory 
-		 src distribution 		= product/lib/ext
-		 bundled distribution	= ${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib
-		 ga 					= ${product.dir}/lib ? Need to verify all possible distributions. Daniel 20070525
-	-->
-    <condition property="esb.ext.lib.dir.src.or.bundled"
-        value="${product.dir}/lib/ext" else="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar/lib">
-        <available file="${product.dir}/lib/ext" type="dir"/>
-    </condition>
-    <condition property="esb.ext.lib.dir"
-        value="${esb.ext.lib.dir.src.or.bundled}" else="${product.dir}/lib">
-		<isset property="esb.ext.lib.dir.src.or.bundled"/>
-    </condition>
+	<target name="check-jbossesb-dist" if="hierarchy.source">
+		<available file="${product.dir}/build/jbossesb" property="dist.exists"/>
+		<fail unless="dist.exists"
+			message="JBossESB must be built. Please run 'ant dist' in ${product.dir}"/>
+	</target>
 
-	<fail unless="lib.exists" message="JBossESB must be built. Please run 'ant' in ${product.dir}"/>
+	<target name="jbossesb-dependencies" if="build.jbossesb">
+		<condition property="base.jbossesb"
+			value="${product.dir}/build/jbossesb"
+			else="${product.dir}">
+			<isset property="hierarchy.source"/>
+		</condition>
+
+		<condition 
+			property="org.jboss.esb.server.config" 
+			value="${quickstart.org.jboss.esb.server.config}"
+			else="default"> 
+			<isset property="quickstart.org.jboss.esb.server.config"/>
+		</condition>
+
+		<property name="install.dir" value="${product.dir}/install"/>
+		<property file="${install.dir}/deployment.properties" prefix="install" />
+		<condition
+			property="org.jboss.esb.server.home"  
+			value="${quickstart.org.jboss.esb.server.home}" 
+			else="${install.org.jboss.esb.server.home}"> 
+			<isset property="quickstart.org.jboss.esb.server.home"/>
+		</condition>
+
+		<path id="deployment-classpath">
+			<fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
+			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>
+			<!-- jbpm config -->
+			<fileset dir="${base.jbossesb}/lib/jbpm.esb" includes="*.jar"/>
+			<pathelement location="${base.jbossesb}/lib/jbpm.esb"/>
+			<!-- smooks config -->
+			<fileset dir="${base.jbossesb}/lib/smooks.esb" includes="*.jar"/>
+			<pathelement location="${base.jbossesb}/lib/smooks.esb"/>
+			<!-- jbrules config -->
+			<fileset dir="${base.jbossesb}/lib/jbrules.esb" includes="*.jar"/>
+			<pathelement location="${base.jbossesb}/lib/jbrules.esb"/>
+		</path>
+	</target>
+
+	<target name="jbossesb-server-dependencies" if="hierarchy.jbossesb-server">
+		<property name="org.jboss.esb.server.home" value="${product.dir}"/> 
+		<property name="org.jboss.esb.server.config" value="default"/>
+
+		<path id="deployment-classpath">
+			<fileset dir="${product.dir}/server/default/deploy/jbossesb.sar/lib" includes="*.jar"/>
+			<!-- jbpm config -->
+			<fileset dir="${product.dir}/server/default/deploy/jbpm.esb" includes="*.jar"/>
+			<pathelement location="${product.dir}/server/default/deploy/jbpm.esb"/>
+			<pathelement location="${product.dir}/server/default/lib/cglib.jar"/>
+			<!-- smooks config -->
+			<fileset dir="${product.dir}/server/default/deploy/smooks.esb" includes="*.jar"/>
+			<pathelement location="${product.dir}/server/default/deploy/smooks.esb"/>
+			<!-- jbrules config -->
+			<fileset dir="${product.dir}/server/default/deploy/jbrules.esb" includes="*.jar"/>
+			<pathelement location="${product.dir}/server/default/deploy/jbrules.esb"/>
+		</path>
+	</target>
 	
-	<!-- check if the application server support JBoss Messaging or JBossMQ -->
-	<condition property="jms.destinations.file" 
-			value="esb-quickstart-jbm-service.xml" else="esb-quickstart-jbmq-service.xml">
-			<available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
-	</condition>
-	
 	<property name="additional.deploys" value="none" />
 
     <available property="quickstart.lib.exists" file="${basedir}/lib"/>
@@ -100,30 +128,69 @@
         <path id="quickstart-lib-classpath"/>
     </target>
 
-    <target name="dependencies" depends="qslib-dependencies, non-qslib-dependencies">
-	<path id="compile-classpath">
+    <target name="messaging-config">
+        <property name="org.jboss.esb.server.deploy.dir" 
+            value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
 
-        <path refid="quickstart-dependencies-classpath" />
-        <path refid="quickstart-lib-classpath" />
-        <fileset dir="${esb.ext.lib.dir}" includes="*.jar" /> <!-- Product Dependencies. -->
-        <fileset dir="${product.dir}/lib" includes="*.jar" /> <!-- Product Dependencies. -->
-		<fileset dir="${esb.product.lib.dir}" includes="**/*.jar" /> <!-- Product Jars. -->
-		<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
-	</path>
+        <condition property="messaging.present">
+            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+        </condition>
+        <condition property="messaging.present">
+            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
+        </condition>
 
-	<path id="exec-classpath">
-		<pathelement location="." />
-        <pathelement location="${basedir}/src" />
-		<pathelement location="${classes}" />
-		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-remoting.jar" /> <!-- Required for JMS Client Code. -->
-		<fileset dir="${org.jboss.esb.server.home}/server/default/lib" includes="jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
-		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
-		<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
-		<!--fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
-		<path refid="compile-classpath" />
-	</path>
+        <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"/>
+            </not>
+        </condition>
     </target>
 
+    <target name="messaging-dependencies" if="messaging.present">
+        <property name="jms.service.file" value="jbm-queue-service.xml"/>
+        <property name="jms.description" value="JBoss Messaging"/>
+    </target>
+
+    <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>
+
+    <target name="jbossmq-dependencies" if="jbossmq.present">
+        <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+        <property name="jms.description" value="JBoss MQ"/>
+    </target>
+
+	<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">
+    	
+		<path id="compile-classpath">
+			<path refid="quickstart-dependencies-classpath" />
+			<path refid="quickstart-lib-classpath" />
+			<fileset dir="${org.jboss.esb.server.home}/client" includes="hibernate-client.jar" /> <!-- Required for jbpm Client Code. -->
+			<path refid="deployment-classpath" />
+			<fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+		</path>
+
+		<path id="exec-classpath">
+			<pathelement location="." />
+			<pathelement location="${classes}" />
+			<pathelement location="${basedir}/src" />
+			<fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
+			<fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+			<!--fileset dir="${org.jboss.esb.server.home}/client" includes="*.jar" /--> <!-- Required for JMS Client Code. -->
+			<path refid="compile-classpath" />
+		</path>
+	</target>
+
     <target name="compile" depends="dependencies">
 		<mkdir dir="${classes}" />
 		<javac srcdir="${basedir}/src" destdir="${classes}" debug="true">
@@ -151,7 +218,15 @@
         <fail />
     </target>
 
-    <target name="deploy" depends="config">
+	<target name="deploy-messaging" unless="messaging.scoped.present">
+        <copy file="${jms.service.file}" overwrite="true" tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" failonerror="false"/>
+	</target>
+
+	<target name="undeploy-messaging">
+        <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" quiet="true"/>
+	</target>
+
+    <target name="deploy" depends="compile, config">
 		<description>deploy				will deploy the Quickstart .esb archive to JBoss ESB Server
     	</description>
 		<echo>Deploying Quickstart to JBoss ESB/App Server...</echo>
@@ -190,7 +265,7 @@
         </jar>
     </target>
 
-    <target name="package-deployment" depends="compile">
+    <target name="package-deployment">
 	<mkdir dir="lib"/>
         <jar destfile="${build.dir}/${ant.project.name}.esb">
                    <fileset dir="${build.dir}/classes" />
@@ -198,24 +273,27 @@
                    <fileset dir="${build.dir}" includes="deployment.xml"/>
                    <fileset dir="${build.dir}" includes="META-INF/**" />
                    <fileset dir="${basedir}/src" excludes="**/*.java" /> <!-- Please leave the src dir in here! -->
-                   <fileset dir="${basedir}" includes="jbmq-queue-service.xml"/>
-                   <fileset dir="${basedir}" includes="${additional.deploys}" excludes="build/**" />
+                   <fileset dir="${basedir}" includes="${jms.service.file} ${additional.deploys}" excludes="build/**" />
                    <fileset dir="${basedir}/lib" includes="*.jar"/>
         </jar>
     </target>
 	
-    <target name="undeploy">
+    <target name="undeploy" depends="dependencies, undeploy-messaging">
 		<description>	undeploy			will undeploy the Quickstart .esb archive from JBoss ESB Server
 		</description>
         <!--delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"  quiet="false"/-->        
     	
-    	<delete verbose="true" includeemptydirs="true">
-    		<fileset dir="${org.jboss.esb.server.deploy.dir}">
-    			<include name="${ant.project.name}.esb"/>        
-    		</fileset>
-    	</delete>
+    	<delete verbose="true" includeemptydirs="true" quiet="true"
+    	  dir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+    	<delete verbose="true" includeemptydirs="true" quiet="true"
+    	  file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+
+        <antcall target="quickstart-specific-undeploys" />
 	</target>
 
+    <!-- Override this target in the Quickstart in order to make Quickstart specific dependencies. -->
+    <target name="quickstart-specific-dependencies"/>
+
     <target name="quickstart-specific-assemblies">
         <!-- Override this target in the Quickstart in order to make Quickstart specific assemblies. -->
         <echo message="No Quickstart specific assembly tasks." />
@@ -226,12 +304,23 @@
         <echo message="No Quickstart specific deployments being made." />
     </target>
 
+    <target name="quickstart-specific-undeploys">
+        <!-- Override this target in the Quickstart in order to make Quickstart specific undeployments. -->
+        <echo message="No Quickstart specific undeployments being made." />
+    </target>
+
     <target name="assert-ws-available">
         <available property="ws-available" file="${org.jboss.esb.server.deploy.dir}/jbossws.sar" type="dir" />
-        <fail unless="ws-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss Webservice container.  '${org.jboss.server.dir}' does not have a Webservice container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
+        <fail unless="ws-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss Webservice container.  '${org.jboss.esb.server.home}' does not have a Webservice container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
         <echo message="JBoss Webservice container found on target '${org.jboss.esb.server.deploy.dir}'." />
     </target>
 
+    <target name="assert-ejb3-available">
+        <available property="ejb3-available" file="${org.jboss.esb.server.deploy.dir}/ejb3.deployer" type="dir" />
+        <fail unless="ejb3-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires a JBoss EJB3 container.  '${org.jboss.esb.server.home}' does not have an EJB3 container.  Check the 'org.jboss.esb.server.home' property in ../quickstarts.properties"</fail>
+        <echo message="JBoss EJB3 container found on target '${org.jboss.esb.server.deploy.dir}'." />
+    </target>
+
     <target name="deploy-esb-archive-before" unless="deploy-after">
         <!--copy file="${build.dir}/${ant.project.name}.esb" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" /-->
     	<copy todir="${org.jboss.esb.server.deploy.dir}">
@@ -249,19 +338,15 @@
     		</fileset>
 		</copy>
     </target>
-	
-	<target name="deploy-jms-dests">
+
+	<target name="deploy-jms-dests" depends="dependencies, deploy-messaging">
 		<description>deploy-jms-dests		will deploy the jms destinations for application server
 		</description>
-		
-        <copy file="${pwd}/jms/${jms.destinations.file}" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" />
 	</target>
 
-	<target name="undeploy-jms-dests">
+	<target name="undeploy-jms-dests" depends="dependencies, undeploy-messaging">
 		<description>undeploy-jms-dests		will undeploy the jms destination for application server
 		</description>
-		
-        <delete file="${org.jboss.esb.server.deploy.dir}/${jms.destinations.file}"/>
 	</target>
 	
     <target name="echoCP" depends="dependencies">
@@ -269,18 +354,16 @@
 		<echo message="Classpath is ${cp}" />
 	</target>
 	
-	<target name="echoPaths">
+	<target name="echoPaths" depends="dependencies">
 		<echo>
 			pwd : ${pwd}
 			quickstarts.dir : ${quickstarts.dir}
 			product.dir : ${product.dir}
-			install.dir : ${install.dir}
-			esb.product.lib.dir : ${esb.product.lib.dir}
-			esb.ext.lib.dir : ${esb.ext.lib.dir}
 			org.jboss.esb.server.home : ${org.jboss.esb.server.home}
 			org.jboss.esb.server.config : ${org.jboss.esb.server.config}
 			org.jboss.esb.jboss.server.deploy.dir : ${org.jboss.esb.server.deploy.dir}
-			jms.destinations.file : ${jms.destinations.file}
+			jms.service.file : ${jms.service.file}
+			jms.description : ${jms.description}
 		</echo>
 	</target>
 

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbm-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,320 +6,320 @@
 	</loader-repository>
   
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 	
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_db_registration"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_file_esb"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
 		xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
 	</mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-	   name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_gw"
+	   name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw"
 	   xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-	   name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_esb"
+	   name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb"
 	   xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-	   name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
+	   name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
 	   xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_war1_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_webservice_war1_reply"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_reply"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_cbr_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <!-- Fun CBR Demo -->
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <!-- Aggregator Demo -->
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Request_GW"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Request_ESB"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_ToBlue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_ToRed"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Red_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_ToGreen"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Aggregator_Green_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
@@ -327,13 +327,13 @@
 
 	<!--	transform_CSV2XML quickstart queues		-->
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/jms/esb-quickstart-jbmq-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -2,35 +2,35 @@
 <server>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_Request">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_Request_gw">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_Request_esb">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
                       
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_action_Request">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_action_Response">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
@@ -51,111 +51,111 @@
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_helloworld_ftp_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_scripting_groovy_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_scripting_groovy_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_transform_pojo_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_transform_pojo_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_date_manipulation_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_date_manipulation_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_transform_simple_gw">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		name="jboss.mq.destination:service=Queue,name=quickstart_transform_simple_esb">
+		name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb">
 		<depends optional-attribute-name="DestinationManager">
 			jboss.mq:service=DestinationManager
 		</depends>
 	</mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>
     </mbean>
 
     <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>
     </mbean>
 
     <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>
     </mbean>
 
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_war1_esb">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>
     </mbean>
     <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>
@@ -163,135 +163,135 @@
 
 
 <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_simple_transformation_Request">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Request">
   <depends optional-attribute-name="DestinationManager">
   	jboss.mq:service=DestinationManager
   </depends>
 </mbean>
 <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_simple_transformation_Response">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response">
   <depends optional-attribute-name="DestinationManager">
   	jboss.mq:service=DestinationManager
   </depends>
 </mbean>
 <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_simple_cbr_Request">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request">
   <depends optional-attribute-name="DestinationManager">
   	jboss.mq:service=DestinationManager
   </depends>
 </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=CBRExpressFreeShipping">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=CBRNormalShipping">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
 
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=CBRExpressFreeShippingAlert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=CBRNormalShippingAlert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>  
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_more_action_Request">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request">
   <depends optional-attribute-name="DestinationManager">
   	jboss.mq:service=DestinationManager
   </depends>
   </mbean> 
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_more_action_Response">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response">
   <depends optional-attribute-name="DestinationManager">
   	jboss.mq:service=DestinationManager
   </depends>
    </mbean>
   <!-- Fun CBR Demo -->
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToRed">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   
     <!-- Aggregator Demo -->
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Request_GW">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_GW">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Request_ESB">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Request_ESB">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_ToBlue">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToBlue">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Blue_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_ToRed">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToRed">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Red_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Red_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_ToGreen">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_ToGreen">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
   <mbean code="org.jboss.mq.server.jmx.Queue"
-	 name="jboss.mq.destination:service=Queue,name=quickstart_Aggregator_Green_Alert">
+	 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Aggregator_Green_Alert">
     <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
   </mbean>
 
 	<!--	transform_CSV2XML quickstart queues		-->
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_transform_CSV2XML_gw">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>
 	</mbean>
 	<mbean code="org.jboss.mq.server.jmx.Queue"
-		 name="jboss.mq.destination:service=Queue,name=quickstart_transform_CSV2XML_esb">
+		 name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb">
 	  <depends optional-attribute-name="DestinationManager">
 		jboss.mq:service=DestinationManager
 	  </depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -8,7 +8,7 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 	
-	<property name="myrules.drl" value="MyESBRules-XPath.drl"/>
+	<property name="myrules.drl" value="FunCBRRules-XPath.drl"/>
 	<property name="myrules.xpath.drl" value="XPathLanguage.dsl"/>
 	<property name="rules.jar.name" value="${build.dir}/${ant.project.name}_rules.jar"/>
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
   <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -3,55 +3,55 @@
   
   <!-- Fun CBR Demo -->
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  
+  <!-- Fun CBR Demo -->
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_GW">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Request_ESB">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToBlue">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Blue_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToRed">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Red_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreenTransformer">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_ToGreen">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_Fun_CBR_Green_Alert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -46,7 +46,7 @@
              </listeners>
         	<actions>
         		<action class="org.jboss.soa.esb.actions.ContentBasedRouter" name="ContentBasedRouter">
-        			<property name="ruleSet" value="MyESBRules-XPath.drl"/>
+        			<property name="ruleSet" value="FunCBRRules-XPath.drl"/>
         			<property name="ruleLanguage" value="XPathLanguage.dsl"/>
         			<property name="ruleReload" value="true"/> 
         			<property name="destinations">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/readme.txt	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/readme.txt	2007-06-05 22:02:55 UTC (rev 12347)
@@ -31,7 +31,7 @@
 		rules logic that sets the status code of the message prior to sending it on to the CBR.
 	5.	In the fifth command window execute "ant runtest".  This will take a copy of SampleOrder.xml and shoot it into the primary JMS 
 		queue for this sample - quickstart_Fun_CBR_Request_GW. 
-		Open the MyESBRules-XPath.drl file and review the actual routing rules:
+		Open the FunCBRRules-XPath.drl file and review the actual routing rules:
 		rule "Red Routing Rule using XPATH"	
 		when
 			xpathEquals "/Order/@statusCode", "1"
@@ -41,7 +41,7 @@
 		end
 	6.	Open the SampleOrder.xml file and modify the statusCode to equal 0 or 2 and re-execute "ant runtest" to see that it properly 
 		routes to the correct endpoint.
-	7.	Open MyESBRules-XPath.drl and change the routes to the following:
+	7.	Open FunCBRRules-XPath.drl and change the routes to the following:
 		Blue for statusCode="1"
 		Red for statusCode="2"
 		Green for statusCode="0"

Copied: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/FunCBRRules-XPath.drl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,34 @@
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Blue Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "0"
+	then 
+	    Log : "Blue Team";
+		Destination : "blue";		
+end
+
+rule "Red Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "1"
+	then 
+	    Log : "Red Team";
+		Destination : "red";		
+end
+
+rule "Green Routing Rule using XPATH"	
+	when
+		xpathEquals "/Order/@statusCode", "2"
+	then 
+	    Log : "Green Team";
+		Destination : "green";		
+end
\ No newline at end of file

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,34 +0,0 @@
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-
-expander XPathLanguage.dsl
-
-#declare any global variables here
-global java.util.List destinations;
-
-rule "Blue Routing Rule using XPATH"	
-	when
-		xpathEquals "/Order/@statusCode", "0"
-	then 
-	    Log : "Blue Team";
-		Destination : "blue";		
-end
-
-rule "Red Routing Rule using XPATH"	
-	when
-		xpathEquals "/Order/@statusCode", "1"
-	then 
-	    Log : "Red Team";
-		Destination : "red";		
-end
-
-rule "Green Routing Rule using XPATH"	
-	when
-		xpathEquals "/Order/@statusCode", "2"
-	then 
-	    Log : "Green Team";
-		Destination : "green";		
-end
\ No newline at end of file

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/fun_cbr/src/services/rules/XPathLanguage.dsl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +0,0 @@
-#JBossESB Content Based Routing using XPath DSL
-[when]xpathMatch "{xpath}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentMatches(msg, "{xpath}") )
-[when]xpathEquals "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentEquals(msg, "{xpath}", "{value}") )
-[when]xpathGreaterThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentGreaterThan(msg, "{xpath}", "{value}") )
-[when]xpathLessThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentLessThan(msg, "{xpath}", "{value}") )
-[then]Log : "{message}"=System.out.println("{message}");
-[then]Destination : "{message}"=destinations.add("{message}");

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,4 @@
 <jbossesb-deployment>
-  <depends>jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb</depends>
-  <depends>jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,13 +6,13 @@
   </loader-repository>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response</depends>
+</jbossesb-deployment>
+


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Request">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_action_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_action/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -8,7 +8,7 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 	
-  <target name="runtest" 
+  <target name="runtest" depends="compile"
 	  description="will send a JMS message to the ESB">
      <echo>Runs Test JMS Sender</echo>
      <java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.helloworlddbregistration.test.SendJMSMessage" failonerror="true">

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,7 +6,7 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_db_registration"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -2,7 +2,7 @@
 <server>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_db_registration"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
 	<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_db_registration">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_db_registration/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb</depends>
+</jbossesb-deployment>
+


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,7 +6,7 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_file_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_file_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
   </mbean>

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_file_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_file_action/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,3 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,7 +6,7 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_ftp_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,48 +5,33 @@
 		${line.separator}
 	</description>
 	
+  <property name="additional.deploys" value="simpleProcessDefinition.xml"/>
+
 	<!-- Import the base Ant build script... -->
-	<import file="../conf/base-build.xml"/>
-	
-	<property name="jbpm.services.build.dir" value="${product.dir}/build/services/jbpm.esb" />
-	
-	<available file="${jbpm.services.build.dir}" type="dir" property="jbpm.isBuilt"/>
-	<fail unless="jbpm.isBuilt"
-		message="services/jbpm has not been built. Please build and re-run this target"  />	
-  
-	<path id="quickstart-dependencies-classpath">
-      <fileset dir="${basedir}" includes="build/**/*.jar"/>
-      <fileset dir="${basedir}" includes="build/**/*.xml"/>
-      <fileset dir="${jbpm.services.build.dir}" includes="*jar"/>
-    </path>
+  <import file="../conf/base-build.xml"/>
 
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-	
-	<target name="prepare" depends="clean">
-    	<copy todir="build/${ant.project.name}.esb">
-			<fileset dir="${jbpm.services.build.dir}" />
-		</copy>
-		<mkdir dir="build/classes" />
-	</target>
-	
-    <target name="esb" depends="prepare,compile">
-	    <copy overwrite="true" file="jboss-esb.xml" todir="build/${ant.project.name}.esb/META-INF" />
-	    <copy file="simpleProcessDefinition.xml" todir="build/${ant.project.name}.esb" />
-		<copy todir="build/${ant.project.name}.esb">
-			<fileset dir="build/classes" includes="**/*" />
-		</copy>
-    </target>
+  <property name="jbossesb.inputdir" location="${build.dir}/inputdir"/>
 
-    <target name="deploy" depends="esb">
-		<delete quiet="true" dir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<delete quiet="true" file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" />
-		<copy todir="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb" >
-			<fileset dir="build/${ant.project.name}.esb" includes="**/*" />
-		</copy>
-    </target>
+  <target name="config">
+    <delete dir="${jbossesb.inputdir}" quiet="true"/>
+    <mkdir dir="${jbossesb.inputdir}"/>
+    <copy file="${basedir}/jboss-esb-unfiltered.xml" tofile="${basedir}/jboss-esb.xml" overwrite="true" filtering="true">
+      <filterset>
+        <filter token="INPUT_DIR" value="${jbossesb.inputdir}"/>
+      </filterset>
+    </copy>
+  </target>
 
+  <target name="deployesb-archive-after"/>
+  <target name="deployesb-archive-before"/>
+
+  <target name="quickstart-specific-deploys">
+    <property name="dest" location="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
+    <delete quiet="true" dir="${dest}"/>
+    <mkdir dir="${dest}"/>
+    <unjar src="${build.dir}/${ant.project.name}.esb" dest="${dest}"/>
+  </target>
+
 	<target name="runtest" depends="compile"
 		description="run full jBPM process lifecycle test">
 		<echo>Configure and invoke several jbpm processors</echo>
@@ -56,7 +41,7 @@
 				<pathelement location="." />
 			    <pathelement location="${basedir}/src" />
 				<pathelement location="${classes}" />
-				<path refid="compile-classpath" />
+				<path refid="exec-classpath" />
 			</classpath>
 			<sysproperty key="log4j.configuration" value="log4j.xml" />
 	     </java>

Copied: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb-unfiltered.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,150 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5" >
+
+    <providers>
+          <fs-provider name="FSprovider1">
+          	<fs-bus busid="jbpmProcessDeployerChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".deployProcess"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+
+          	<fs-bus busid="jbpmProcessInstantiatorChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".newProcessInstance"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+
+          	<fs-bus busid="jbpmSignalChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".signalProcess"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+
+          	<fs-bus busid="jbpmProcessGetterChannel" >
+          		<fs-message-filter
+          			directory="@INPUT_DIR@"
+          			input-suffix=".getProcessInstance"
+          			post-delete="true"
+          			error-delete="true"
+          		/>
+          	</fs-bus>
+          </fs-provider>
+      </providers>
+      
+      <services>         
+        <service 
+			category="jbpmQsCat1"
+			name="deployer"
+        	description="Deploys a process definition" >
+            <listeners>
+            	<fs-listener name="OrderProcessDeployer"
+            		busidref="jbpmProcessDeployerChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+            <actions>
+				<action	name="DeployFromFile" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="DeployProcessDefinition" />
+						<property name="process-definition-file" value="/simpleProcessDefinition.xml" />
+				</action>
+			
+            </actions>
+        </service>
+
+        <service 
+			category="jbpmQsCat2"
+			name="instantiator"
+        	description="New Instance of 'simple' process" >
+            <listeners>
+            	<fs-listener name="ProcessInstantiator"
+            		busidref="jbpmProcessInstantiatorChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+
+            <actions>
+				<action	name="aNewInstance" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="NewProcessInstanceCommand" />
+						<property name="process-definition-name" value="simple"/>
+						<property name="actor" value="FrankSinatra"/>
+						<property name="esb-to-jbpm">
+						  <variables>
+							<variable esb-name="eVar1" jbpm-name="counter"  value="45" />
+						  </variables>
+						</property>
+				</action>
+			
+            </actions>
+
+        </service>
+
+        <service 
+			category="jbpmQsCat3"
+			name="signalCommand"
+        	description="Signal a token or process" >
+            <listeners>
+            	<fs-listener name="Advancer"
+            		busidref="jbpmSignalChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+
+            <actions>
+				<action	name="aSignal" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="SignalCommand" />
+				</action>
+			
+            </actions>
+
+        </service>
+
+        <service 
+			category="jbpmQsCat4"
+			name="retriever"
+        	description="Retrieve process instance" >
+            <listeners>
+            	<fs-listener name="ProcessInterrogator"
+            		busidref="jbpmProcessGetterChannel"
+            		maxThreads="1"
+            		poll-frequency-seconds="3"
+            	/>
+            </listeners>
+
+            <actions>
+				<action	name="aInterrogate" 
+						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
+				>
+						<property name="command" value="GetProcessInstanceCommand" />
+						<property name="jbpm-to-esb">
+						  <variables>
+							<variable name="counter" />
+						  </variables>
+						</property>
+				</action>
+			
+            </actions>
+
+        </service>
+
+      </services>
+     
+</jbossesb>

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,150 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5" >
-
-    <providers>
-          <fs-provider name="FSprovider1">
-          	<fs-bus busid="jbpmProcessDeployerChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".deployProcess"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-
-          	<fs-bus busid="jbpmProcessInstantiatorChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".newProcessInstance"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-
-          	<fs-bus busid="jbpmSignalChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".signalProcess"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-
-          	<fs-bus busid="jbpmProcessGetterChannel" >
-          		<fs-message-filter
-          			directory="/tmp"
-          			input-suffix=".getProcessInstance"
-          			post-delete="true"
-          			error-delete="true"
-          		/>
-          	</fs-bus>
-          </fs-provider>
-      </providers>
-      
-      <services>         
-        <service 
-			category="jbpmQsCat1"
-			name="deployer"
-        	description="Deploys a process definition" >
-            <listeners>
-            	<fs-listener name="OrderProcessDeployer"
-            		busidref="jbpmProcessDeployerChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-            <actions>
-				<action	name="DeployFromFile" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="DeployProcessDefinition" />
-						<property name="process-definition-file" value="/simpleProcessDefinition.xml" />
-				</action>
-			
-            </actions>
-        </service>
-
-        <service 
-			category="jbpmQsCat2"
-			name="instantiator"
-        	description="New Instance of 'simple' process" >
-            <listeners>
-            	<fs-listener name="ProcessInstantiator"
-            		busidref="jbpmProcessInstantiatorChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-
-            <actions>
-				<action	name="aNewInstance" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="NewProcessInstanceCommand" />
-						<property name="process-definition-name" value="simple"/>
-						<property name="actor" value="FrankSinatra"/>
-						<property name="esb-to-jbpm">
-						  <variables>
-							<variable esb-name="eVar1" jbpm-name="counter"  value="45" />
-						  </variables>
-						</property>
-				</action>
-			
-            </actions>
-
-        </service>
-
-        <service 
-			category="jbpmQsCat3"
-			name="signalCommand"
-        	description="Signal a token or process" >
-            <listeners>
-            	<fs-listener name="Advancer"
-            		busidref="jbpmSignalChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-
-            <actions>
-				<action	name="aSignal" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="SignalCommand" />
-				</action>
-			
-            </actions>
-
-        </service>
-
-        <service 
-			category="jbpmQsCat4"
-			name="retriever"
-        	description="Retrieve process instance" >
-            <listeners>
-            	<fs-listener name="ProcessInterrogator"
-            		busidref="jbpmProcessGetterChannel"
-            		maxThreads="1"
-            		poll-frequency-seconds="3"
-            	/>
-            </listeners>
-
-            <actions>
-				<action	name="aInterrogate" 
-						class="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor"
-				>
-						<property name="command" value="GetProcessInstanceCommand" />
-						<property name="jbpm-to-esb">
-						  <variables>
-							<variable name="counter" />
-						  </variables>
-						</property>
-				</action>
-			
-            </actions>
-
-        </service>
-
-      </services>
-     
-</jbossesb>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/org/jboss/soa/esb/samples/quickstart/jbpmsimple1/test/TestBpmProcessor.java	2007-06-05 22:02:55 UTC (rev 12347)
@@ -22,8 +22,6 @@
 
 package org.jboss.soa.esb.samples.quickstart.jbpmsimple1.test;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
@@ -55,7 +53,7 @@
     	String os = System.getProperty("os.name","").toLowerCase();
     	String dflt = (os.indexOf("win")>=0) ? "/temp": "/tmp";
     	WORKDIR	= new File(System.getProperty("java.io.tmpdir",dflt));
-    };
+    }
 
 	public void run() throws Exception 
 	{
@@ -97,7 +95,6 @@
 	     catch (Exception _ex)
 	     {
 	         _ex.printStackTrace();
-	         assertTrue(false);
 	     }
 	}
 	

Added: labs/jbossesb/trunk/product/samples/quickstarts/more_action/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/more_action/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,14 +6,14 @@
   </loader-repository>
 
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -2,14 +2,14 @@
 <server>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_more_action_Response"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Request">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_more_action_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/more_action/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,13 +5,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_scripting_groovy_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_gw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_scripting_groovy_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/scripting_groovy/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -9,8 +9,8 @@
 	<import file="../conf/base-build.xml"/>
 		
 	<property name="rules.jar.name" value="${ant.project.name}_rules.jar"/>
-	<property name="myrules.drl" value="MyESBRules.drl"/>
-	<property name="myrules.xpath.drl" value="MyESBRules-XPath.drl"/>
+	<property name="myrules.drl" value="SimpleCBRRules.drl"/>
+	<property name="myrules.xpath.drl" value="SimpleCBRRules-XPath.drl"/>
 	
     <property name="additional.deploys" value=" build/classes/${myrules.drl}, build/classes/${myrules.xpath.drl}" />
 	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
   <depends>jboss.esb:deployment=jbrules.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,32 +5,32 @@
   </loader-repository>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_cbr_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -2,32 +2,32 @@
 <server>
   
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=quickstart_simple_cbr_Request"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
 
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShipping"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRExpressFreeShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>
   </mbean>
   <mbean code="org.jboss.jms.server.destination.QueueService"
-    name="jboss.messaging.destination:service=Queue,name=CBRNormalShippingAlert"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert"
     xmbean-dd="xmdesc/Queue-xmbean.xml">
     <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 	<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_cbr_Request">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShipping">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShipping">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRExpressFreeShippingAlert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=CBRNormalShippingAlert">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -55,7 +55,7 @@
              </listeners>
             <actions>
                 <action class="org.jboss.soa.esb.actions.ContentBasedRouter" name="ContentBasedRouter">
-                    <property name="ruleSet" value="MyESBRules-XPath.drl"/>
+                    <property name="ruleSet" value="SimpleCBRRules-XPath.drl"/>
                     <property name="ruleLanguage" value="XPathLanguage.dsl"/>
                     <property name="ruleReload" value="true"/>
                     <property name="destinations">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/readme.txt
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/readme.txt	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/readme.txt	2007-06-05 22:02:55 UTC (rev 12347)
@@ -43,13 +43,13 @@
 		netAmount="59.97" totalAmount="64.92" tax="4.95">
 
 	What follows are the highlights that uncover some of the magic associated with CBR:
-	*	src\services\rules\MyESBRules-XPath.drl is a JBoss Rules ruleset that has simple logic that evaluates
+	*	src\services\rules\SimpleCBRRules-XPath.drl is a JBoss Rules ruleset that has simple logic that evaluates
 		the totalAmount attribute of the SampleOrder.xml.  Over $50 means Free Express shipping, Under $50 means
 		Normal shipping. 
 
 Project file descriptions:
 ==========================
-	src\services\rules\MyESBRules.drl:
+	src\services\rules\SimpleCBRRules.drl:
 	Can be used for selecting a path based upon a piece of meta-data as opposed to the message content.  
 	It is not used in the example but provided anyway.
 
@@ -69,11 +69,11 @@
 		
 	jbossesb.xml 
 	Establishes 3 services.  The first is the perform the CBR evaluation and has this action:
-	  ruleSet="MyESBRules-XPath.drl" 
+	  ruleSet="SimpleCBRRules-XPath.drl" 
 	  ruleLanguage="XPathLanguage.dsl"
 	 XPathLanguage.dsl lives in core\services\rules\XPathLanguage.dsl and ships as jbossesb-rules.jar
 
-	 MyESBRules-XPath.drl:
+	 SimpleCBRRules-XPath.drl:
 	 routes to the appropriate destination service via this command Destination : "express";
  
 	 In the jbossesb.xml the "express" destination is related to:

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,33 +0,0 @@
-#created on: Nov 8, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-
-expander XPathLanguage.dsl
-
-#declare any global variables here
-global java.util.List destinations;
-
-rule "Routing Rule using XPATH"
-	
-	when
-		xpathGreaterThan "/Order/@totalAmount", "50.0"
-	then 
-	    Log : "EXPRESS";
-		Log : "EXPRESS";
-		Log : "Really It's EXPRESS Shipping";
-		Destination : "express";
-		
-end
-
-rule "Routing Rule using XPATH less"
-    when
-        xpathLessThan "/Order/@totalAmount", "50.0"
-    then
-	    Log : "NORMAL";
-		Log : "NORMAL";
-		Log : "Really It's NORMAL Shipping";
-		Destination : "normal";
-end
\ No newline at end of file

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,29 +0,0 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Routing Rule - Serialized based message"
-	
-	when
-		Message( type == MessageType.JAVA_SERIALIZED)
-	then
-		System.out.println("Serialized");
-		destinations.add("serialized");
-		
-end
-
-rule "Routing Rule - XML based message"
-	
-	when
-		Message( type == MessageType.JBOSS_XML)
-	then 
-		System.out.println("JBoss_XML");
-		destinations.add("xml");
-end
\ No newline at end of file

Copied: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules-XPath.drl)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules-XPath.drl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,33 @@
+#created on: Nov 8, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Routing Rule using XPATH"
+	
+	when
+		xpathGreaterThan "/Order/@totalAmount", "50.0"
+	then 
+	    Log : "EXPRESS";
+		Log : "EXPRESS";
+		Log : "Really It's EXPRESS Shipping";
+		Destination : "express";
+		
+end
+
+rule "Routing Rule using XPATH less"
+    when
+        xpathLessThan "/Order/@totalAmount", "50.0"
+    then
+	    Log : "NORMAL";
+		Log : "NORMAL";
+		Log : "Really It's NORMAL Shipping";
+		Destination : "normal";
+end
\ No newline at end of file

Copied: labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/MyESBRules.drl)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/simple_cbr/src/services/rules/SimpleCBRRules.drl	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,29 @@
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Routing Rule - Serialized based message"
+	
+	when
+		Message( type == MessageType.JAVA_SERIALIZED)
+	then
+		System.out.println("Serialized");
+		destinations.add("serialized");
+		
+end
+
+rule "Routing Rule - XML based message"
+	
+	when
+		Message( type == MessageType.JBOSS_XML)
+	then 
+		System.out.println("JBoss_XML");
+		destinations.add("xml");
+end
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,7 +5,7 @@
 		${line.separator}
 	</description>
 	
-	<property name="additional.deploys" value="smooks-res-*.xml" />
+	<property name="additional.deploys" value="smooks-res-csv2xml.xml" />
 			
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
   <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,13 +6,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_CSV2XML/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jms.destination:service=Queue,name=quickstart_transform_CSV2XML_gw">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_gw">
         <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
+          jboss.mq:service=DestinationManager
         </depends>
     </mbean>
     <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jms.destination:service=Queue,name=quickstart_transform_CSV2XML_esb">
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_CSV2XML_esb">
         <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
+          jboss.mq:service=DestinationManager
         </depends>
     </mbean>
 </server>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -22,7 +22,7 @@
 	<!-- The ESB itself is started by the default "run" target - defined in base-build.xml  -->
 	
 	<!-- Target for injecting the sample order message for transformation... -->
-	<target name="runtest" description="runs Test JMS Sender">
+	<target name="runtest" description="runs Test JMS Sender" depends="compile">
 		<echo>Runs Test JMS Sender</echo>
 		<java fork="yes" classname="org.jboss.soa.esb.samples.quickstart.transformedi2xmlgroovyxslt.test.SendJMSMessage" failonerror="true">
 			<arg value="SampleOrder.edi" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,9 +1,5 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-  	<depends>jboss.esb:deployment=smooks.esb</depends>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,14 +5,14 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
 
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
 
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_gw">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_edi_groovy_xslt_esb">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>
+


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_EDI2XML_Groovy_XSLT/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -31,6 +31,7 @@
 					<property name="message" value="[transform_EDI2XML_Groovy_XSLT] Message before transformation" />
 				</action>
 				<action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
 					<property name="from" value="DVDStore:OrderDispatchService" />
 					<property name="from-type" value="text/xml:fullFillOrder" />
 					<property name="to" value="DVDWarehouse_1:OrderHandlingService" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,9 +1,6 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-    <depends>jboss.esb:deployment=smooks.esb</depends>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -6,19 +6,19 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-			name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Response"
+			name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response"
 			xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_pojo_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
 	<mbean code="org.jboss.jms.server.destination.QueueService"
-			name="jboss.messaging.destination:service=Queue,name=quickstart_simple_transformation_Response"
+			name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response"
 			xmbean-dd="xmdesc/Queue-xmbean.xml">
 		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
 		<depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_gw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_pojo_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_simple_transformation_Response">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>
+


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2POJO/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -44,6 +44,7 @@
                    	process="displayMessage" 
                 />   
                 <action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
               		<property name="from" value="DVDStore:OrderDispatchService" />
 					<property name="from-type" value="text/xml:fullFillOrder" />
 					<property name="to" value="DVDWarehouse_1:OrderHandlingService" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,9 +1,5 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-    <depends>jboss.esb:deployment=smooks.esb</depends>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,13 +5,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_date_manipulation_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_gw">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_date_manipulation_esb">
+        <depends optional-attribute-name="DestinationManager">
+          jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_date_manipulation/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -30,6 +30,7 @@
 					<property name="message" value="[transform_XML2XML_date_manipulation] Message before transformation" />
 				</action>
 				<action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
 					<property name="from" value="A" />
 					<property name="from-type" value="text/xml:messageAtA" />
 					<property name="to" value="B" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,9 +1,5 @@
 <jbossesb-deployment>
-    <loader-repository>
-        org.jboss.soa.esb:loader=simple-scoped
-        <loader-repository-config>
-            java2ParentDelegaton=false
-        </loader-repository-config>
-    </loader-repository>
-    <depends>jboss.esb:deployment=smooks.esb</depends>
-</jbossesb-deployment>
\ No newline at end of file
+  <depends>jboss.esb:deployment=smooks.esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service-scoped.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -5,13 +5,13 @@
   </loader-repository>
 
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_gw"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>
     </mbean>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jboss.messaging.destination:service=Queue,name=quickstart_transform_simple_esb"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
         <depends>jboss.messaging:service=PostOffice</depends>

Added: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_gw">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+    name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_transform_simple_esb">
+    <depends optional-attribute-name="DestinationManager">
+      jboss.mq:service=DestinationManager
+    </depends>
+  </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jbmq-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/transform_XML2XML_simple/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -31,6 +31,7 @@
 					<property name="message" value="[transform_XML2XML_simple] Message before transformation" />
 				</action>
 				<action name="transform" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res.xml" />
 					<property name="from" value="A" />
 					<property name="from-type" value="text/xml:messageAtA" />
 					<property name="to" value="B" />

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,12 +1,11 @@
 <project name="Quickstart_webservice_bpel" default="deploy" basedir=".">
 
-    <property name="additional.deploys" value="jbmq-service.xml,jbossesb-properties.xml,smooks-*.*"/>
     <property environment="env" />
 
     <!-- Import the base Ant build script... -->
     <import file="../conf/base-build.xml"/>
 
-    <target name="compile">
+    <target name="compile" depends="dependencies">
         <!-- Build the EJB Services (the webservice-unaware target services) -->
         <antcall target="build-ejb-service">
             <param name="servicename" value="order-manager" />
@@ -42,16 +41,15 @@
         </war>
     </target>
 
-    <target name="quickstart-specific-deploys">
-        <!-- Deply the quickstart apps. -->
+    <target name="quickstart-specific-deploys"
+        depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
+        <!-- Deploy the quickstart apps. -->
         <copy overwrite="true" todir="${org.jboss.esb.server.deploy.dir}">
             <fileset dir="${build.dir}/order-manager" includes="order-manager-service.jar,order-manager.war" />
             <fileset dir="${build.dir}/shipping" includes="shipping-service.jar" />
         </copy>
 
         <!-- Deploy the ActiveBPEL components. -->
-        <antcall target="assert-CATALINA_HOME-set" />
-        <antcall target="assert-ACTIVEBPEL_ENGINE-installed" />
         <copy overwrite="true" todir="${env.CATALINA_HOME}/bpr">
             <fileset dir="bpel" includes="order_process.bpr" />
             <fileset dir="bpel/resources/supportServices/Customer" includes="customer.bpr" />
@@ -61,6 +59,15 @@
         </copy>
     </target>
 
+    <target name="quickstart-specific-undeploys"
+        depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
+        <!-- Undeploy the quickstart apps. -->
+        <delete verbose="true" includemptydirs="true"
+            dir="${org.jboss.esb.server.deploy.dir}"
+            includes="order-manager-service.jar,order-manager.war shipping-service.jar" />
+        <!-- Should undeploy ActiveBPEL -->
+    </target>
+
     <target name="display-instructions">
         <echo message='${line.separator}******************' />
         <echo>Quickstart deployed to target JBoss ESB/App Server at '${org.jboss.esb.server.deploy.dir}'.</echo>
@@ -108,4 +115,4 @@
         </jar>
     </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -7,4 +7,7 @@
          that clash with some AS dependencies. -->
     <depends>jboss.esb:service=SoapUIClientService</depends>
     <depends>jboss.esb:deployment=smooks.esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_gw</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb_reply</depends>
 </jbossesb-deployment>

Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_gw">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb_reply">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Copied: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-service.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_gw">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_bpel_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jbmq-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_bpel_gw">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_bpel_esb">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_bpel_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-
-    <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
-      <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
-    </loader-repository>
-
-</server>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -114,6 +114,7 @@
                 <!-- Transform the incoming CSV order approval record into a populated
                      com.activebpel.ordermanagement.SalesOrderNotification instance. -->
                 <action name="message-populator" class="org.jboss.soa.esb.actions.converters.SmooksTransformer">
+                        <property name="resource-config" value="/smooks-res-csv2xml.xml" />
                     <property name="from" value="OrderManager"/>
                     <property name="from-type" value="text/csv:orderApproval"/>
                     <property name="to" value="RetailerCallback"/>

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-cdr.lst	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,10 +0,0 @@
-####################################################
-# Uncomment out to load config from database
-####################################################
-#http://localhost:8080/jboss-esb-console/transform/smooks-config.jsp
-
-####################################################
-# Uncomment out to load config from local XML file
-####################################################
-/smooks-res.xml
-/org/milyn/templating/templating-cdu-creators-0.1.cdrl

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/smooks-res.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE smooks-resource-list PUBLIC "-//MILYN//DTD SMOOKS 1.0//EN" "http://www.milyn.org/dtd/smooksres-list-1.0.dtd" >
-        
-<smooks-resource-list default-useragent="from-type:text/csv:orderApproval and from:OrderManager and to-type:text/xml:SendSalesOrderNotification and to:RetailerCallback">
-
-    <!--
-    Set the parser for the message - CSV.
-    -->
-    <smooks-resource selector="org.xml.sax.driver" path="org.milyn.csv.CSVParser" >
-        <param name="fields" type="string-list">
-            orderNum,customerNumber,customerName,orderDate
-        </param>
-    </smooks-resource>
-
-    <!--
-    Suck the order number out of the CSV record and into the SalesOrderNotification bean.
-    -->
-	<smooks-resource selector="csv-record orderNum" path="org.milyn.javabean.ProcessingPhaseBeanPopulator">
-		<param name="beanId"><![CDATA[salesOrderNotification]]></param>
-        <param name="beanClass"><![CDATA[com.activebpel.ordermanagement.SalesOrderNotification]]></param>
-		<param name="setterName"><![CDATA[setOrderNumber]]></param>
-	</smooks-resource>
-
-</smooks-resource-list>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -8,13 +8,13 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-    <property name="additional.deploys" value="jbmq-service.xml"/>
-
-    <path id="quickstart-dependencies-classpath">
-        <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
-    </path>
+    <target name="quickstart-specific-dependencies" depends="assert-ws-available">
+        <path id="quickstart-dependencies-classpath">
+            <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossws-client.jar,jboss-remoting.jar" />
+        </path>
+    </target>
 	
-    <target name="quickstart-specific-assemblies" 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!! -->
 

Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Copied: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_jbossws_adapter_01/jbmq-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_gw">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_jbossws_adapter_01_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-</server>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/build.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/build.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -8,18 +8,14 @@
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-    <property name="additional.deploys" value="jbmq-service.xml"/>
+    <property name="war.build.dir" location="${build.dir}/war/classes"/>
 
     <target name="quickstart-specific-assemblies" depends="assert-ws-available, makewar"/>
 
-    <target name="quickstart-specific-clean">
-        <delete dir="war/classes"/>
-    </target>
-
     <target name="makewar" description="make war">
         <!-- Compile... -->
-        <mkdir dir="war/classes" />
-        <javac srcdir="war/src" destdir="war/classes" debug="true">
+        <mkdir dir="${war.build.dir}" />
+        <javac srcdir="war/src" destdir="${war.build.dir}" debug="true">
             <classpath>
                 <path refid="compile-classpath" />
                 <fileset dir="war/lib/ext" includes="*.jar" />
@@ -32,7 +28,7 @@
             <webinf dir="${basedir}/war/resources/WEB-INF">
                 <include name="jboss-web.xml"/>
             </webinf>
-            <classes dir="war/classes" includes="**/*.class"/>
+            <classes dir="${war.build.dir}" includes="**/*.class"/>
             <fileset dir="${basedir}/war/view">
                 <include name="**/*"/>
             </fileset>

Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,4 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb</depends>
+  <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+    <mbean code="org.jboss.jms.server.destination.QueueService"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
+        <depends optional-attribute-name="ServerPeer">jboss.mq:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+</server>


Property changes on: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbm-queue-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Copied: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml (from rev 12204, labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-service.xml)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+    <mbean code="org.jboss.mq.server.jmx.Queue"
+           name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
+        <depends optional-attribute-name="DestinationManager">
+            jboss.mq:service=DestinationManager
+        </depends>
+    </mbean>
+</server>

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-service.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_war1/jbmq-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_war1_esb">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jboss.mq.destination:service=Queue,name=quickstart_webservice_war1_esb_reply">
-        <depends optional-attribute-name="DestinationManager">
-            jboss.mq:service=DestinationManager
-        </depends>
-    </mbean>
-</server>
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
-  <depends>jms.destination:service=Queue,name=DeadMessageQueue</depends>
+  <depends>jboss.esb.destination:service=Queue,name=DeadMessageQueue</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.QueueService"
-           name="jms.destination:service=Queue,name=DeadMessageQueue"
+           name="jboss.esb.destination:service=Queue,name=DeadMessageQueue"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
     </mbean>

Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.mq.server.jmx.Queue"
-           name="jms.destination:service=Queue,name=DeadMessageQueue">
+           name="jboss.esb.destination:service=Queue,name=DeadMessageQueue">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>

Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/deployment.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/META-INF/deployment.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jbossesb-deployment>
-  <depends>jms.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
+  <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
 </jbossesb-deployment>

Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbm-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbm-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.jms.server.destination.TopicService"
-           name="jms.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update"
+           name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update"
            xmbean-dd="xmdesc/Queue-xmbean.xml">
         <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
     </mbean>

Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbmq-queue-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/jbmq-queue-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
     <mbean code="org.jboss.mq.server.jmx.Topic"
-           name="jms.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update">
+           name="jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update">
         <depends optional-attribute-name="DestinationManager">
             jboss.mq:service=DestinationManager
         </depends>

Modified: labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml	2007-06-05 21:54:16 UTC (rev 12346)
+++ labs/jbossesb/trunk/product/services/smooks/src/main/resources/smooks-service.xml	2007-06-05 22:02:55 UTC (rev 12347)
@@ -2,6 +2,6 @@
 <service>
     <mbean code="org.jboss.soa.esb.actions.converters.SmooksService"
            name="jboss.esb:service=SmooksService">
-        <depends>jms.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
+        <depends>jboss.esb.destination:service=Topic,name=org.jboss.soa.esb.transformation.Update</depends>
     </mbean>
 </service>




More information about the jboss-svn-commits mailing list