[overlord-commits] Overlord SVN: r547 - in cdl/trunk/distribution/validator/jbossesb: pi4soa.sar and 2 other directories.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2009-03-24 08:37:18 -0400 (Tue, 24 Mar 2009)
New Revision: 547

Added:
   cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/
   cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml
   cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml
Modified:
   cdl/trunk/distribution/validator/jbossesb/build.xml
   cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml
Log:
SOAG-99 First step implemented, to make the deployment of pi4soa.sar dependent upon the type of messaging system that is configured in the target environment.

Modified: cdl/trunk/distribution/validator/jbossesb/build.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/build.xml	2009-03-21 17:11:43 UTC (rev 546)
+++ cdl/trunk/distribution/validator/jbossesb/build.xml	2009-03-24 12:37:18 UTC (rev 547)
@@ -2,11 +2,53 @@
 	
     <property name="target-server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
 
-	<target name="deploy" depends="register-validator-filter">
+<!-- ==================================================================== -->
+<!-- This section handles the discovery of the messaging platform.        -->
+<!-- ==================================================================== -->
+
+    <target name="messaging-config" >
+        <property name="org.jboss.esb.server.deploy.dir" 
+            value="${org.jboss.esb.server.server}/deploy"/>
+
+        <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>
+
+        <condition property="jbossmq.present">
+            <not>
+                <isset property="messaging.present"/>
+            </not>
+        </condition>
+    </target>
+
+    <!-- dependencies specific to JBoss Messaging -->
+    <target name="messaging-dependencies" if="messaging.present" depends="messaging-config">
+        <property name="jms.service.file" value="jbm-queue-service.xml"/>
+        <property name="jms.description" value="JBoss Messaging"/>
+    </target>
+
+    <!-- dependencies specific to JBoss MQ -->
+    <target name="jbossmq-dependencies" if="jbossmq.present" depends="messaging-config">
+        <property name="jms.service.file" value="jbmq-queue-service.xml"/>
+        <property name="jms.description" value="JBoss MQ"/>
+    </target>
+
+<!-- ==================================================================== -->
+<!-- This section handles the deploy and undeploy targets.                -->
+<!-- ==================================================================== -->
+
+	<target name="deploy" depends="register-validator-filter,messaging-dependencies,jbossmq-dependencies">
 		   <echo message="Deploy pi4soa.sar, overlord-cdl-validator-jbossesb.esb files to the target server '${target-server}'." />
 		   <copy todir="${target-server}/deploy/pi4soa.sar">
-			   <fileset dir="${basedir}/pi4soa.sar"/>
+			   <fileset dir="${basedir}/pi4soa.sar">
+				<exclude name="jms/**" />
+			   </fileset>
 		   </copy>
+		   <copy todir="${target-server}/deploy/pi4soa.sar"
+				file="${basedir}/pi4soa.sar/jms/${jms.service.file}" />
 		   <copy todir="${target-server}/deploy/overlord-cdl-validator.esb">
 			   <fileset dir="${basedir}/overlord-cdl-validator.esb" />
 		   </copy>

Modified: cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml	2009-03-21 17:11:43 UTC (rev 546)
+++ cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/META-INF/jboss-service.xml	2009-03-24 12:37:18 UTC (rev 547)
@@ -3,8 +3,4 @@
     <mbean code="org.pi4soa.jboss.service.Pi4SOAService"
            name="pi4soa:service=pi4soa">
     </mbean>
-    <mbean code="org.jboss.mq.server.jmx.Topic"
-        name="jboss.mq.destination:service=Topic,name=tracker">
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-    </mbean>
 </service>

Added: cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml	                        (rev 0)
+++ cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbm-queue-service.xml	2009-03-24 12:37:18 UTC (rev 547)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+    <mbean code="org.jboss.jms.server.destination.TopicService"
+           name="jboss.messaging.destination:service=Topic,name=tracker"
+           xmbean-dd="xmdesc/Topic-xmbean.xml">
+        <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+        <depends>jboss.messaging:service=PostOffice</depends>
+    </mbean>
+
+</server>

Added: cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml
===================================================================
--- cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml	                        (rev 0)
+++ cdl/trunk/distribution/validator/jbossesb/pi4soa.sar/jms/jbmq-queue-service.xml	2009-03-24 12:37:18 UTC (rev 547)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+    <mbean code="org.jboss.mq.server.jmx.Topic"
+        name="jboss.mq.destination:service=Topic,name=tracker">
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+    </mbean>
+</server>