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

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

Author: tcunning
Date: 2012-02-22 18:56:13 -0500 (Wed, 22 Feb 2012)
New Revision: 37895

Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/install/build.xml
Log:
JBESB-3751
Make sure we pass the no.ivy property, make sure we skip deploy.console
if jbossas4 build.


Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2012-02-22 20:55:55 UTC (rev 37894)
+++ labs/jbossesb/trunk/product/build-distr.xml	2012-02-22 23:56:13 UTC (rev 37895)
@@ -55,6 +55,7 @@
     <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
         <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
                 inheritall="false">
+		<property name="no.ivy" value="${no.ivy}"/>
                 <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
                 <property name="org.jboss.esb.server.config" value="default"/>
         </ant>

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2012-02-22 20:55:55 UTC (rev 37894)
+++ labs/jbossesb/trunk/product/build.xml	2012-02-22 23:56:13 UTC (rev 37895)
@@ -450,7 +450,9 @@
 		<copy todir="${org.jboss.esb.internal.jar.dest}">
             <fileset dir="lib/ext" includes="jboss-jaxb-intros.jar"/>
 		</copy>
-		<ant antfile="build-distr.xml" target="dist" />
+		<ant antfile="build-distr.xml" target="dist">
+			<property name="no.ivy" value="${no.ivy}"/>
+	        </ant>
 	</target>
 	
 	<target name="org.jboss.esb.contract-web">

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2012-02-22 20:55:55 UTC (rev 37894)
+++ labs/jbossesb/trunk/product/install/build.xml	2012-02-22 23:56:13 UTC (rev 37895)
@@ -74,15 +74,13 @@
             
         </target>
 
-        <target name="dependencies" depends="dependencies.source, dependencies.jbossesb">
-	    <echo>as6.jopr.console.dir=${as6.jopr.console.dir}</echo>
+        <target name="dependencies" depends="dependencies.source, dependencies.jbossesb">	
             <condition property="jopr.console.exists">
                 <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"/>
@@ -159,7 +157,7 @@
                 </replace>
         </target>
 
-        <target name="deploy.console" depends="install.base.console, patch.as5.console">
+        <target name="deploy.console" depends="install.base.console, patch.as5.console" unless="jbossas4">
             <condition property="console.dir"
 	      value="${jopr.console.dir}">
                <available file="${jopr.console.dir}"/>
@@ -188,7 +186,6 @@
 	<target name="tomcat"   depends="check.tomcat.props, dependencies, tomcat.compile, tomcat.war.all.deploy"  description="Wrapper for tomcat.war.all.deploy"/>
 	
         <target name="jms.config.check">
-			<echo message="deploy.dir : ${deploy.dir}"/>
           <available property="jbm.present"
             file="${deploy.dir}/jboss-messaging"/>
           <available property="jbm.present"