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

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

Author: kevin.conner at jboss.com
Date: 2007-05-07 16:30:10 -0400 (Mon, 07 May 2007)
New Revision: 11715

Added:
   labs/jbossesb/trunk/product/install/DMQ/jbm-deployment.xml
   labs/jbossesb/trunk/product/install/DMQ/jbmq-deployment.xml
   labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
Modified:
   labs/jbossesb/trunk/product/install/build.xml
Log:
Add dependency on message queues: JBESB-558

Added: labs/jbossesb/trunk/product/install/DMQ/jbm-deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/install/DMQ/jbm-deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/DMQ/jbm-deployment.xml	2007-05-07 20:30:10 UTC (rev 11715)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.messaging.destination:service=Queue,name=DeadMessageQueue</depends>
+</jbossesb-deployment>


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

Added: labs/jbossesb/trunk/product/install/DMQ/jbmq-deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/install/DMQ/jbmq-deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/DMQ/jbmq-deployment.xml	2007-05-07 20:30:10 UTC (rev 11715)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.mq.destination:service=Queue,name=DeadMessageQueue</depends>
+</jbossesb-deployment>


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

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-05-07 20:28:55 UTC (rev 11714)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-05-07 20:30:10 UTC (rev 11715)
@@ -7,6 +7,8 @@
 	<!-- Load Build Properties File -->
 	<property file="${org.jboss.esb.deployment.properties}"/>
 	
+        <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"/>
 	<target name="tomcat"   depends="tomcat.compile, tomcat.war.all.deploy"  description="Wrapper for tomcat.war.all.deploy"/>
 	
@@ -15,25 +17,48 @@
          <fileset dir="${org.jboss.esb.dist.lib}" includes="jbossesb.sar/**"/></copy>
 	</target>
 	
-        <target name="internal.deploy" description="Deploys Internal Services to the server">
-          <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
-          <available property="messaging.config"
-            value="DMQ/jbm-queue-service.xml"
+        <target name="jms.config.check">
+          <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging"/>
-          <available property="messaging.config"
-            value="DMQ/jbm-queue-service.xml"
+          <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging.sar"/>
-          <available property="messaging.config"
-            value="DMQ/jbmq-queue-service.xml"
+          <available property="jbmq.present"
             file="${deploy.dir}/jms/jbossmq-service.xml"/>
-          <fail unless="messaging.config" message="Could not determine JMS provider"/>
+          <fail message="Could not determine JMS provider">
+            <condition>
+              <not>
+                <or>
+                  <isset property="jbm.present"/>
+                  <isset property="jbmq.present"/>
+                </or>
+              </not>
+            </condition>
+          </fail>
+        </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"/>
+        </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"/>
+        </target>
+
+        <target name="jms.config" depends="jms.config.check, jbmq.config, jbm.config"/>
+
+        <target name="internal.deploy" depends="jms.config" description="Deploys Internal Services to the server">
+
           <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 todir="${internal.services.deploy.dir}"
+            file="${messaging.config}"/>
+          <copy tofile="${internal.services.metainf.dir}/deployment.xml"
+            file="${messaging.deployment}"/>
 
         </target>
 

Added: 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	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml	2007-05-07 20:30:10 UTC (rev 11715)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbossesb-deployment>
+  <depends>jboss.messaging.destination:service=Queue,name=DeadMessageQueue</depends>
+</jbossesb-deployment>


Property changes on: labs/jbossesb/trunk/product/services/jbossesb/src/main/resources/META-INF/deployment.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native