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

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

Author: mageshbk at jboss.com
Date: 2012-03-31 02:48:09 -0400 (Sat, 31 Mar 2012)
New Revision: 37973

Modified:
   labs/jbossesb/trunk/product/install/build.xml
Log:
[JBESB-3771] - Use jaxb jars from the sever that is being deployed to.

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2012-03-30 15:18:51 UTC (rev 37972)
+++ labs/jbossesb/trunk/product/install/build.xml	2012-03-31 06:48:09 UTC (rev 37973)
@@ -473,7 +473,7 @@
 	    </antcall>
 
         <!-- soap.esb -->
-	    <antcall target="deployEsbModule">
+	    <antcall target="deploySoapModule">
 	    	<param name="esbModuleName" value="soap.esb" />
 	    </antcall>
             
@@ -488,20 +488,39 @@
             </antcall>
         </target>
 
+    <target name="deploySoapModule">
+        <echo>Deploying ESB ${esbModuleName} to ${deploy.dir}</echo>
+
+        <copy todir="${deploy.dir}/${esbModuleName}">
+            <fileset dir="${org.jboss.esb.dist.lib}/${esbModuleName}" excludes="${messaging.excludes},jaxb-impl*.jar,jaxb-xjc*.jar"/>
+            <fileset dir="${client.dir}" includes="jaxb-impl*.jar jaxb-xjc*.jar"/>
+        </copy>
+
+        <antcall target="transformDeployment">
+            <param name="esbModuleName" value="${esbModuleName}"/>
+        </antcall>
+    </target>
+
 	<target name="deployEsbModule">
 		<echo>Deploying ESB ${esbModuleName} to ${deploy.dir}</echo>
         
 		<copy todir="${deploy.dir}/${esbModuleName}">
             <fileset dir="${org.jboss.esb.dist.lib}/${esbModuleName}" excludes="${messaging.excludes}"/>
         </copy>
-		
+
+        <antcall target="transformDeployment">
+            <param name="esbModuleName" value="${esbModuleName}"/>
+        </antcall>
+	</target>	
+
+    <target name="transformDeployment">
 		<xslt style="deployment-xml.xsl" in="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml" out="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml.transformed">
 			<param name="jmsProvider" expression="${messaging.provider}"/>
 		</xslt>
 		
 		<delete file="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml" failonerror="false" />
 		<move file="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml.transformed" tofile="${deploy.dir}/${esbModuleName}/META-INF/deployment.xml" />
-	</target>	
+    </target>
 
     <target name="internal.deploy.jbossas6" if="jbossas6" description="Deploys Internal Services to the JBossAS6">
 	<copy tofile="${deployers.dir}/esb.deployer/META-INF/esb-deployers-jboss-beans.xml" overwrite="true"