[jboss-cvs] JBossAS SVN: r57659 - trunk/build

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

Author: bill.burke at jboss.com
Date: 2006-10-13 12:48:12 -0400 (Fri, 13 Oct 2006)
New Revision: 57659

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
   trunk/build/build.xml
Log:
update common-core, update ejb3 deployment structure

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-10-13 15:08:20 UTC (rev 57658)
+++ trunk/build/build-distr.xml	2006-10-13 16:48:12 UTC (rev 57659)
@@ -173,14 +173,19 @@
 
       <copy todir="${install.server}/all/deploy" filtering="no">
         <fileset dir="${_module.output}/lib">
-           <include name="ejb3.deployer/**"/>
            <include name="ejb3-interceptors-aop.xml"/>
            <include name="ejb3-entity-cache-service.xml"/>
            <include name="ejb3-clustered-sfsbcache-service.xml"/>
            <include name="ejb3-timer-service.xml"/>
+           <include name="ejb3-connectors-service.xml"/>
         </fileset>
       </copy>
 
+      <copy todir="${install.server}/all/deployers" filtering="no">
+        <fileset dir="${_module.output}/lib">
+           <include name="ejb3.deployer/**"/>
+        </fileset>
+      </copy>
    <!-- Copy the third party libraries -->
    <copy todir="${install.all.lib}" filtering="no">
      <fileset dir="${hibernate.entitymanager.lib}">

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2006-10-13 15:08:20 UTC (rev 57658)
+++ trunk/build/build-thirdparty.xml	2006-10-13 16:48:12 UTC (rev 57659)
@@ -87,7 +87,7 @@
       <componentref name="jboss/aop" version="2.0.0.alpha1"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="snapshot"/>
-      <componentref name="jboss/common-core" version="2.0.1.GA"/>
+      <componentref name="jboss/common-core" version="2.0.2.CR1"/>
       <componentref name="jboss/common-logging-log4j" version="2.0.1.GA"/>
       <componentref name="jboss/common-logging-jdk" version="2.0.1.GA"/>
       <componentref name="jboss/common-logging-spi" version="2.0.1.GA"/>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-10-13 15:08:20 UTC (rev 57658)
+++ trunk/build/build.xml	2006-10-13 16:48:12 UTC (rev 57659)
@@ -719,7 +719,7 @@
         <exclude name="deploy/deploy.last/**"/>
         <exclude name="deploy/httpha-invoker.sar/**"/>
         <exclude name="deploy/snmp-adaptor.sar/**"/>
-        <exclude name="deploy/ejb3*service.xml"/>
+        <exclude name="deploy/ejb3*cache*service.xml"/>
         <exclude name="farm/**"/>
         <exclude name="deploy/juddi-service.sar/**"/>
         <exclude name="deploy/tc6-cluster.sar/**"/>