[jboss-cvs] JBossAS SVN: r76366 - in trunk: ejb3 and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-07-29 06:21:56 -0400 (Tue, 29 Jul 2008)
New Revision: 76366

Modified:
   trunk/build/build-distr.xml
   trunk/ejb3/build.xml
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-07-29 10:20:47 UTC (rev 76365)
+++ trunk/build/build-distr.xml	2008-07-29 10:21:56 UTC (rev 76366)
@@ -147,12 +147,10 @@
     </copy>
 
     <mkdir dir="${install.server}/all/deploy/cluster"/>
-    <copy todir="${install.server}/all/deploy/cluster" filtering="no">
-     <fileset dir="${_module.output}/lib">
-       <include name="ejb3-entity-cache-beans.xml"/>
-       <include name="ejb3-clustered-sfsbcache-beans.xml"/>
-     </fileset>
-   </copy>
+    <copy file="${_module.output}/lib/ejb3-entity-cache-beans.xml"
+          todfile="${install.server}/all/deploy/cluster/ejb3-entity-cache-jboss-beans.xml" filtering="no"/>
+    <copy file="${_module.output}/lib/ejb3-clustered-sfsbcache-beans.xml"
+          todfile="${install.server}/all/deploy/cluster/ejb3-clustered-sfsbcache-jboss-beans.xml" filtering="no"/>
 
     <copy todir="${install.server}/all/deployers" filtering="no">
       <fileset dir="${_module.output}/lib">

Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml	2008-07-29 10:20:47 UTC (rev 76365)
+++ trunk/ejb3/build.xml	2008-07-29 10:21:56 UTC (rev 76366)
@@ -332,8 +332,8 @@
             <include name="jboss-ejb3-iiop.jar"/>
          </fileset>
          <fileset dir="${resources}">
-            <include name="META-INF/ejb3-deployers-beans.xml"/>
-            <include name="META-INF/jpa-deployers-beans.xml"/>
+            <include name="META-INF/ejb3-deployers-jboss-beans.xml"/>
+            <include name="META-INF/jpa-deployers-jboss-beans.xml"/>
          </fileset>
          <fileset dir="output/resources">
             <include name="META-INF/persistence.properties"/>