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

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

Author: kevin.conner at jboss.com
Date: 2007-11-16 17:30:09 -0500 (Fri, 16 Nov 2007)
New Revision: 16655

Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
Log:
Moved management.esb into install/build.xml: JBESB-1341

Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2007-11-16 22:29:25 UTC (rev 16654)
+++ labs/jbossesb/trunk/product/build-distr.xml	2007-11-16 22:30:09 UTC (rev 16655)
@@ -49,10 +49,6 @@
                 <include name="*.txt"/>
             </fileset>
         </copy>
-	<ant antfile="./tools/console/build.xml"
-		target="deploy-mgmt-console">
-		<property name="console.dir" location="./tools/console"/>
-	</ant>
     </target>
 
     <target name="ftp-server" unless="skip.ftp.server">
@@ -65,12 +61,6 @@
                 <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
                 <property name="org.jboss.esb.server.config" value="default"/>
         </ant>
-
-        <!-- initialise the WS modifications -->
-        <ant dir="install" target="patch-jbossws" inheritAll="false">
-            <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>
-            <property name="org.jboss.esb.server.config" value="default"/>
-        </ant>
     </target>
 
     <target name="unpack.server.zip" unless="skip.server.esb">
@@ -129,6 +119,9 @@
             <!-- Quartz -->
             <fileset dir="${lib.ext.dir}" includes="quartz*.jar"/>
         </copy>
+    	<copy todir="${build.dir}/jbossesb.sar">
+    		<fileset dir="${installation.files.dir}/jUDDI-registry" includes="juddi.war"/>
+    	</copy>
         <copy todir="${build.lib.dir}">
             <fileset dir="build" includes="jbossesb.sar/**"/>
         </copy>

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-11-16 22:29:25 UTC (rev 16654)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-11-16 22:30:09 UTC (rev 16655)
@@ -156,6 +156,10 @@
 		<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
 		<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
           </ant> 
+	  <ant dir="${product.dir}/tools/console/management-esb" target="deploy">
+		<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
+		<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+          </ant> 
 
     </target>
 
@@ -237,7 +241,9 @@
 	</target>
 	
 	<target name="patch-jbossws" depends="check.deploy.props, dependencies" description="Deploys JAXB Intros to the application server">
-		<property name="jbossws.location" location="${deploy.dir}/jbossws.sar"/>
+        <echo message="***** DEPRECATED: Patch no longer required!" />
+        <!--
+        <property name="jbossws.location" location="${deploy.dir}/jbossws.sar"/>
 		<property name="jbossws.beans.location" location="${jbossws.location}/jbossws.beans/META-INF/jboss-beans.xml"/>
 		<property name="jbossws.beans.tmp.location" location="${jbossws.location}/jbossws.beans/META-INF/jboss-beans.new.xml"/>
 
@@ -254,6 +260,7 @@
 		</copy>
 		
 		<antcall target="apply-jbossws-xslt" />
+		-->
 	</target>
 
 	<target name="apply-jbossws-xslt" unless="jaxb.intros.exist">

Modified: labs/jbossesb/trunk/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/console/management-esb/build.xml	2007-11-16 22:29:25 UTC (rev 16654)
+++ labs/jbossesb/trunk/product/tools/console/management-esb/build.xml	2007-11-16 22:30:09 UTC (rev 16655)
@@ -107,10 +107,10 @@
 	</target>
 
 	<target name="copy-datasource" if="management.ds.available">
-		<copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/default/deploy" overwrite="true"/>
+		<copy file="${mgmt.esb.dir}/src/main/resources/${db}/management-ds.xml" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" overwrite="true"/>
 	</target>
 	
 	<target name="deploy" depends="esb,copy-datasource" description="Deploy the WAR">
-		<copy file="${mgmt.esb.dir}/build/management.esb" todir="${org.jboss.esb.server.home}/server/default/deploy" overwrite="true"/>
+		<copy file="${mgmt.esb.dir}/build/management.esb" todir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy" overwrite="true"/>
 	</target> 
 </project>