[jboss-svn-commits] JBL Code SVN: r37840 - labs/jbossesb/branches/JBESB_4_10_CP/product/install.

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

Author: tcunning
Date: 2012-01-05 10:26:31 -0500 (Thu, 05 Jan 2012)
New Revision: 37840

Modified:
   labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml
Log:
JBESB-3669
Don't copy the console on top of an AS6 installation.


Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml	2012-01-05 10:18:07 UTC (rev 37839)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/install/build.xml	2012-01-05 15:26:31 UTC (rev 37840)
@@ -15,6 +15,7 @@
         <property name="server.lib.dir" value="${server.dir}/lib"/>
         <property name="hadeploy.dir" value="${server.dir}/deploy-hasingleton"/>
 
+        <property name="as6.jopr.console.dir" location="${org.jboss.esb.server.home}/common/deploy/admin-console.war"/>
         <property name="jopr.console.dir" location="${deploy.dir}/admin-console.war"/>
         <property name="jopr.plugin.base" value="rhq-jbossesb-plugin-"/>
         <property name="jopr.console.base" value="jopr-embedded-"/>
@@ -58,7 +59,6 @@
     </condition>
 
         <fail unless="hierarchy.recognised" message="Cannot determine build hierarchy"/>
-
         <target name="dependencies.jbossesb" if="hierarchy.jbossesb">
             <property name="org.jboss.esb.dist" location="${product.dir}"/>
             <property name="org.jboss.esb.dist.lib" location="${org.jboss.esb.dist}/lib"/>
@@ -75,9 +75,14 @@
         </target>
 
         <target name="dependencies" depends="dependencies.source, dependencies.jbossesb">
+	    <echo>as6.jopr.console.dir=${as6.jopr.console.dir}</echo>
             <condition property="jopr.console.exists">
-                <available file="${jopr.console.dir}"/>
+                <or>
+                  <available file="${jopr.console.dir}"/>
+                  <available file="${as6.jopr.console.dir}"/>
+                </or>
             </condition>
+		<echo>jopr.console.exists=${jopr.console.exists}</echo>
 
             <path id="jopr.as4.plugin">
                 <fileset dir="${org.jboss.esb.dist.lib}" includes="${jopr.plugin.base}*as4.jar"/>
@@ -111,8 +116,18 @@
         </target>
 
         <target name="deploy.console" depends="install.base.console">
-            <path id="plugin.location">
-                <fileset dir="${jopr.console.dir}" includes="**/jopr-jboss-as-*plugin*.jar"/>
+            <condition property="console.dir"
+	      value="${jopr.console.dir}">
+               <available file="${jopr.console.dir}"/>
+            </condition>           
+
+            <condition property="console.dir"
+              value="${as6.jopr.console.dir}">
+               <available file="${as6.jopr.console.dir}"/>
+            </condition> 
+ 
+	    <path id="plugin.location">
+                <fileset dir="${console.dir}" includes="**/jopr-jboss-as-*plugin*.jar"/>
             </path>
             <property name="plugin.location" refid="plugin.location"/>
             <dirname property="plugin.dir" file="${plugin.location}"/>
@@ -473,9 +488,6 @@
         <delete dir="${deploy.dir}/soapui-client.sar" quiet="true"/>
         <delete file="${deploy.dir}/contract.war" quiet="true"/>
         <delete file="${deploy.dir}/esb-console.war" quiet="true" />
-        <delete quiet="true">
-            <fileset dir="${deploy.dir}/admin-console.war" includes="**/rhq-jbossesb-plugin-*.jar"/>
-        </delete>
         <delete dir="${conf.dir}/action-templates.xml" quiet="true"/>
         <delete quiet="false">
 			<fileset dir="${server.lib.dir}" >
@@ -491,6 +503,10 @@
                 <include name="commons-httpclient-*.jar"/>
             </fileset>
         </delete>
+        <delete quiet="true">
+            <fileset dir="${deploy.dir}/admin-console.war" includes="**/rhq-jbossesb-plugin-*.jar"/>
+        </delete>
+
     </target>
 
     <target name="undeploy.jbossas6" if="jbossas6" >