[Jboss-cvs] JBossAS SVN: r56544 - trunk/build

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

Author: ryan.campbell at jboss.com
Date: 2006-09-04 09:24:24 -0400 (Mon, 04 Sep 2006)
New Revision: 56544

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
   trunk/build/build.xml
Log:
merge from JEE5_TCK branch

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-09-04 11:41:18 UTC (rev 56543)
+++ trunk/build/build-distr.xml	2006-09-04 13:24:24 UTC (rev 56544)
@@ -698,14 +698,16 @@
     <!-- Default server config -->
 
     <!-- Copy the default jbossmq deployment configuration -->
+   <!--
     <mkdir dir="${install.all.deploy.hasingleton}/jms"/>
     <copy todir="${install.all.deploy.hasingleton}/jms" filtering="no">
       <fileset dir="${_module.output}/etc/server/default/deploy">
         <include name="**"/>
       </fileset>
     </copy>
-
+   -->
     <!-- Copy example jms configs -->
+   <!--
     <mkdir dir="${install.examples.jms}"/>
     <copy todir="${install.examples.jms}" filtering="no">
       <fileset dir="${_module.output}/etc/server/examples/deploy">
@@ -714,17 +716,20 @@
          <include name="standalone/*.xml"/>
       </fileset>
     </copy>
+   -->
   </target>
 
   <target name="_module-messaging-all" depends="_module-messaging-most">
 
     <!-- Copy the generated javadocs -->
+<!--
     <mkdir dir="${install.api}/${_module.name}"/>
     <copy todir="${install.api}/${_module.name}" filtering="no">
       <fileset dir="${_module.output}/api">
          <include name="**/*"/>
       </fileset>
     </copy>
+-->
   </target>
 
 
@@ -1162,6 +1167,7 @@
     </copy>
 
     <!-- Include the HTTP invoker service unpacked -->
+ <!--
     <delete dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
     <mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
     <unjar src="${_module.output}/lib/jbossmq-httpil.sar"
@@ -1172,7 +1178,7 @@
     <unjar src="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war"
        dest="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/jbossmq-httpil.war" />
     <delete file="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar/tmp.war" />
-
+-->
     <!-- copy the jboss-monitoring JAR -->
     <copy file="${project.root}/varia/output/lib/jboss-monitoring.jar"
           todir="${install.server}/all/lib"/>
@@ -1728,8 +1734,15 @@
          <include name="jboss-backport-concurrent.jar"/>
        </fileset>
      </copy>
+     
+     <!--Copy jboss-messaging libraries-->
+     <mkdir dir="${install.all.lib}"/>
+     <copy todir="${install.all.lib}" filtering="no">
+	        <fileset dir="${jboss.messaging.lib}">
+	           <include name="jboss-messaging.jar"/>
+	        </fileset>
+     </copy>
 
-
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.lib}"/>
     <copy todir="${install.lib}" filtering="no">

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2006-09-04 11:41:18 UTC (rev 56543)
+++ trunk/build/build-thirdparty.xml	2006-09-04 13:24:24 UTC (rev 56544)
@@ -87,7 +87,7 @@
       <componentref name="hsqldb" version="1.8.0.2"/>
       <componentref name="ibm-wsdl4j" version="1.5.2jboss"/>
       <componentref name="jacorb" version="2.2.4jboss.patch1"/>
-      <componentref name="javassist" version="3.3.0.GA"/>
+      <componentref name="javassist" version="snapshot"/>
       <componentref name="jaxen" version="1.1beta4"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="snapshot"/>
@@ -96,6 +96,7 @@
       <componentref name="jboss/jbossretro" version="1.0.2.GA"/>
       <componentref name="jboss/jbossws14" version="1.0.2.GA"/>
       <componentref name="jboss/jbossws" version="1.0.2.GA"/>
+      <componentref name="jboss/messaging" version="snapshot"/>
       <componentref name="jboss/microcontainer" version="snapshot"/>
       <componentref name="jboss/microcontainer14" version="snapshot"/>
       <componentref name="jboss/remoting" version="1.4.3.GA"/>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-09-04 11:41:18 UTC (rev 56543)
+++ trunk/build/build.xml	2006-09-04 13:24:24 UTC (rev 56544)
@@ -732,10 +732,13 @@
           file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
     <copy tofile="${install.default.deploy}/jbossweb-tomcat6.sar/META-INF/jboss-service.xml"
           file="${project.root}/tomcat/src/resources/jboss-service.xml" overwrite="true"/>
+<!--
     <copy todir="${install.default.deploy}">
       <fileset dir="${install.all.deploy.hasingleton}">
         <include name="jms/**"/>
+-->
         <!-- Trim the default config jms layer to only the JVM/UIL2 invoker -->
+<!--       
         <exclude name="jms/jbossmq-hail.sar/**"/>
       </fileset>
     </copy>
@@ -744,6 +747,7 @@
          <include name="jms-ds.xml"/>
       </fileset>
     </copy>
+--> 
     <unjar src="${project.root}/varia/output/lib/http-invoker.sar"
       dest="${install.default}/deploy/http-invoker.sar"/>