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

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

Author: bstansberry at jboss.com
Date: 2006-11-18 06:08:28 -0500 (Sat, 18 Nov 2006)
New Revision: 58538

Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
Log:
Update to JBC 2.0.0.Alpha1
Use -beans.xml for clustering services

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-11-18 11:07:43 UTC (rev 58537)
+++ trunk/build/build-distr.xml	2006-11-18 11:08:28 UTC (rev 58538)
@@ -174,8 +174,8 @@
       <copy todir="${install.server}/all/deploy" filtering="no">
         <fileset dir="${_module.output}/lib">
            <include name="ejb3-interceptors-aop.xml"/>
-           <include name="ejb3-entity-cache-service.xml"/>
-           <include name="ejb3-clustered-sfsbcache-service.xml"/>
+           <include name="ejb3-entity-cache-beans.xml"/>
+           <include name="ejb3-clustered-sfsbcache-beans.xml"/>
            <include name="ejb3-timer-service.xml"/>
            <include name="ejb3-connectors-service.xml"/>
         </fileset>
@@ -960,8 +960,8 @@
     <mkdir dir="${install.server}/all/deploy"/>
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/etc">
-         <include name="cluster-service.xml"/>
-         <include name="deploy-hasingleton-service.xml"/>
+         <include name="cluster-beans.xml"/>
+         <include name="deploy-hasingleton-beans.xml"/>
       </fileset>
     </copy>
     <mkdir dir="${install.server}/all/deploy/jgroups-multiplexer.sar"/>
@@ -973,7 +973,7 @@
     <mkdir dir="${install.server}/all/deploy/deploy.last"/>
     <copy todir="${install.server}/all/deploy/deploy.last" filtering="no">
       <fileset dir="${_module.output}/etc">
-         <include name="farm-service.xml"/>
+         <include name="farm-beans.xml"/>
       </fileset>
     </copy>
 
@@ -1728,7 +1728,8 @@
      <mkdir dir="${install.all.lib}"/>
      <copy todir="${install.all.lib}" filtering="no">
         <fileset dir="${jboss.cache.lib}">
-           <include name="jboss-cache-jdk50.jar"/>
+           <include name="jbosscache.jar"/>
+           <include name="pojocache.jar"/>
         </fileset>
        <fileset dir="${jboss.backport.concurrent.lib}">
          <include name="jboss-backport-concurrent.jar"/>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-11-18 11:07:43 UTC (rev 58537)
+++ trunk/build/build.xml	2006-11-18 11:08:28 UTC (rev 58538)
@@ -685,14 +685,15 @@
         <exclude name="lib/jacorb.jar"/>
         <exclude name="lib/jaxr-client.jar" />
         <exclude name="lib/jboss-iiop.jar"/>
-        <exclude name="lib/jboss-cache-jdk50.jar"/>
+        <exclude name="lib/jbosscache.jar"/>
+        <exclude name="lib/pojocache.jar"/>
         <exclude name="lib/jbossha.jar"/>
         <exclude name="lib/jbossmqha.jar"/>
         <exclude name="lib/wsdl4j.jar"/>
-        <exclude name="deploy/cluster-service.xml"/>
+        <exclude name="deploy/cluster-beans.xml"/>
         <exclude name="deploy/jgroups-multiplexer.sar/**"/>
         <exclude name="deploy/hajndi-service.xml"/>
-        <exclude name="deploy/deploy-hasingleton-service.xml"/>
+        <exclude name="deploy/deploy-hasingleton-beans.xml"/>
         <exclude name="deploy/iiop-service.xml"/>
         <exclude name="deploy/jbossweb-ejb.jar"/>
         <exclude name="deploy/jms/hajndi-jms-ds.xml"/>