[jboss-svn-commits] JBL Code SVN: r26177 - labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf.

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

Author: beve
Date: 2009-04-21 08:07:15 -0400 (Tue, 21 Apr 2009)
New Revision: 26177

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
Log:
Added check for messaging for as5. The deploy directory is named simply messaging.


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml	2009-04-21 11:43:11 UTC (rev 26176)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/samples/quickstarts/conf/base-build.xml	2009-04-21 12:07:15 UTC (rev 26177)
@@ -79,7 +79,10 @@
 
     <target name="messaging-config" depends="jbossesb-dependencies-as4, jbossesb-dependencies-as5">
         <condition property="messaging.present">
-            <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+            <or>
+                <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+                <available file="${org.jboss.esb.server.deploy.dir}/messaging"/>
+            </or>
         </condition>
         <condition property="messaging.present">
             <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
@@ -488,6 +491,8 @@
         <copy todir="${build.dir}/META-INF">
             <fileset dir="${basedir}" includes="jboss-esb.xml" />
             <fileset dir="${basedir}" includes="deployment.xml" />
+            <!--fileset dir="${basedir}" includes="jboss-classloading.xml" />
+            <fileset dir="${basedir}" includes="jboss-structure.xml" /-->
         </copy>
     </target>