[jboss-svn-commits] JBL Code SVN: r37894 - labs/jbossesb/trunk/product/install.

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

Author: tcunning
Date: 2012-02-22 15:55:55 -0500 (Wed, 22 Feb 2012)
New Revision: 37894

Modified:
   labs/jbossesb/trunk/product/install/build.xml
Log:
JBESB-3751
Skip patching the console if ${no.ivy} set (if we're doing a platform build).


Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2012-02-22 11:48:27 UTC (rev 37893)
+++ labs/jbossesb/trunk/product/install/build.xml	2012-02-22 20:55:55 UTC (rev 37894)
@@ -108,14 +108,33 @@
             <condition property="jopr.console.war" value="${jopr.as5.console}" else="${jopr.as4.console}">
                 <isset property="jbossas5"/>
             </condition>
+
+	    <condition property="install-as5-console"> 
+                <and>
+                     <equals arg1="${jbossas5}" arg2="true"/>
+                     <not>
+                         <isset property="jbossas6"/>
+                     </not>
+		</and> 
+            </condition>	
+
         </target>
 
-        <target name="install.base.console" depends="dependencies" unless="jopr.console.exists">
+        <target name="install.base.console" depends="dependencies" if="install-as5-console">
             <mkdir dir="${jopr.console.dir}"/>
             <unzip dest="${jopr.console.dir}" src="${jopr.console.war}"/>
+
+	    <condition property="jbossas5.patch">
+ 		<and>
+		    <not>	
+ 		       <isset property="no.ivy"/>
+		    </not>
+                    <equals arg1="${jbossas5}" arg2="true"/>
+                </and>
+            </condition>
         </target>
 
-        <target name="patch.as5.console" if="jbossas5" unless="jbossas6">
+        <target name="patch.as5.console" if="jbossas5.patch" unless="jbossas6">
 		<delete dir="${jopr.console.dir}"/>
                 <unzip dest="${jopr.console.dir}" src="${jopr.as5.console}"/>