[jboss-svn-commits] JBL Code SVN: r16657 - in labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product: docs and 2 other directories.

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

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

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/ProgrammersGuide.odt
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml
   labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management-esb/build.xml
Log:
Merge of CP_IR2

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml	2007-11-16 22:30:45 UTC (rev 16656)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/build-distr.xml	2007-11-16 22:34:34 UTC (rev 16657)
@@ -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">

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml	2007-11-16 22:30:45 UTC (rev 16656)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/install/build.xml	2007-11-16 22:34:34 UTC (rev 16657)
@@ -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>
 

Modified: labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management-esb/build.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management-esb/build.xml	2007-11-16 22:30:45 UTC (rev 16656)
+++ labs/jbossesb/workspace/platform/JBESB_4_2_1_SOA_4_2/product/tools/console/management-esb/build.xml	2007-11-16 22:34:34 UTC (rev 16657)
@@ -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>