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

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

Author: kevin.conner at jboss.com
Date: 2007-09-13 08:04:29 -0400 (Thu, 13 Sep 2007)
New Revision: 15086

Modified:
   labs/jbossesb/trunk/product/esb-config.xml
   labs/jbossesb/trunk/product/install/build.xml
Log:
Added deployment into EAP: JBESB-1022

Modified: labs/jbossesb/trunk/product/esb-config.xml
===================================================================
--- labs/jbossesb/trunk/product/esb-config.xml	2007-09-13 11:31:12 UTC (rev 15085)
+++ labs/jbossesb/trunk/product/esb-config.xml	2007-09-13 12:04:29 UTC (rev 15086)
@@ -113,6 +113,8 @@
     	
         <property name="esb.server.deploy.dir" 
             value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+        <property name="esb.server.hadeploy.dir" 
+            value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy-hasingleton"/>
 
         <condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbm">
             <available file="${esb.server.deploy.dir}/jboss-messaging"/>
@@ -124,6 +126,9 @@
         <condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbmq">
             <available file="${esb.server.deploy.dir}/jms/jbossmq-service.xml"/>
         </condition>
+        <condition property="org.jboss.soa.esb.qa.jmsprovider" value="jbmq">
+            <available file="${esb.server.hadeploy.dir}/jms/jbossmq-service.xml"/>
+        </condition>
     	
         <fail unless="org.jboss.soa.esb.qa.jmsprovider" message="Could not determine server messaging subsystem"/>
     	<property name="org.jboss.esb.server.config.appserver" value="true"/>

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-09-13 11:31:12 UTC (rev 15085)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-09-13 12:04:29 UTC (rev 15086)
@@ -8,6 +8,7 @@
 	<property file="${org.jboss.esb.deployment.properties}"/>
 	
         <property name="deploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+        <property name="hadeploy.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy-hasingleton"/>
 
         <property name="product.dir" location=".."/>
 
@@ -61,6 +62,8 @@
             file="${deploy.dir}/jboss-messaging.sar"/>
           <available property="jbmq.present"
             file="${deploy.dir}/jms/jbossmq-service.xml"/>
+          <available property="jbmq.present"
+            file="${hadeploy.dir}/jms/jbossmq-service.xml"/>
           <fail message="Could not determine JMS provider">
             <condition>
               <not>