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

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

Author: tfennelly
Date: 2007-10-02 11:54:40 -0400 (Tue, 02 Oct 2007)
New Revision: 15514

Added:
   labs/jbossesb/trunk/product/lib/ext/jboss-jaxb-intros.jar
Removed:
   labs/jbossesb/trunk/product/extras/
Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/install/build.xml
Log:
Update build to pull JAXB Intros from the repo: http://jira.jboss.com/jira/browse/JBESB-1068

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2007-10-02 14:24:14 UTC (rev 15513)
+++ labs/jbossesb/trunk/product/build.xml	2007-10-02 15:54:40 UTC (rev 15514)
@@ -119,7 +119,7 @@
 		depends="org.jboss.esb.internal.init, org.jboss.esb.rosetta.compile"/>
 
     <target name="org.jboss.esb.jar" depends="org.jboss.esb.internal.init, org.jboss.esb.rosetta.jar,
-		org.jboss.soa.esb.services.jar, extras.jar"/>
+		org.jboss.soa.esb.services.jar"/>
 
 	<target name="org.jboss.esb.rosetta.compile" depends="org.jboss.esb.internal.init">
 		<echo message="Compiling modules"/>
@@ -190,14 +190,6 @@
 		<ant dir="services" target="esb"/>
 	</target>
 
-    <target name="extras.jar">
-        <echo message="Building extras archives"/>
-        <property name="dist.extras" value="build/jbossesb/extras" />
-
-        <mkdir dir="${dist.extras}" />
-        <ant dir="extras/jaxbintros" />
-    </target>
-
     <target name="org.jboss.esb.javadocs" depends="org.jboss.esb.internal.init" unless="skip.javadoc">
 		<echo message="Building javadocs"/>
 		<mkdir dir="${org.jboss.esb.internal.javadocs.dest}"/>
@@ -413,6 +405,7 @@
 		<ant antfile="build-distr.xml" target="dist" />
 		<copy todir="${org.jboss.esb.internal.jar.dest}">
 			<fileset dir="build" includes="jbossesb.sar/**"/>
+            <fileset dir="lib/ext" includes="jboss-jaxb-intros.jar"/>
 		</copy>
 	</target>
 	

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-10-02 14:24:14 UTC (rev 15513)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-10-02 15:54:40 UTC (rev 15514)
@@ -228,6 +228,7 @@
 		<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"/>
+
 		<property name="jaxb.intros.jar" value="jboss-jaxb-intros.jar"/>
 		<property name="jbossesb.soap.jar" value="jbossesb-soap.jar"/>
 		
@@ -236,7 +237,7 @@
 		
 		<available property="jaxb.intros.exist" file="${jbossws.location}/${jaxb.intros.jar}" type="file"/>
 		<copy todir="${jbossws.location}">
-			<fileset dir="${org.jboss.esb.dist}/extras/jaxbintros" includes="${jaxb.intros.jar}"/>
+			<fileset dir="${org.jboss.esb.dist.lib}" includes="${jaxb.intros.jar}"/>
 			<fileset dir="${org.jboss.esb.dist.lib}/soap.esb" includes="${jbossesb.soap.jar}"/>
 		</copy>
 		

Added: labs/jbossesb/trunk/product/lib/ext/jboss-jaxb-intros.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/jboss-jaxb-intros.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream