[jboss-cvs] JBossAS SVN: r106010 - in trunk: component-matrix and 1 other directories.

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

Author: jaikiran
Date: 2010-06-12 12:20:34 -0400 (Sat, 12 Jun 2010)
New Revision: 106010

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
Log:
JBAS-8101 Integrate EJB3.1 timerservice into AS

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-06-12 15:50:02 UTC (rev 106009)
+++ trunk/build/build.xml	2010-06-12 16:20:34 UTC (rev 106010)
@@ -709,11 +709,11 @@
       <fileset dir="${ejb3.module.output}/resources">
         <include name="ejb3-container-jboss-beans.xml"/>
         <include name="ejb3-interceptors-aop.xml"/>
-        <include name="ejb3-timerservice-jboss-beans.xml"/>
         <include name="ejb3-connectors-jboss-beans.xml"/>
       </fileset>
     	<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-as:jar"/>
     	<fileset refid="org.jboss.shrinkwrap:shrinkwrap-extension-vdf:jar" />
+      <fileset refid="org.jboss.ejb3.timerservice:jboss-ejb3-timerservice-mk2:jar"/>
 	  <fileset dir="${ejb3.module.output}/resources/META-INF">
         <include name="singleton-container-aop.xml"/>
       </fileset>
@@ -734,6 +734,7 @@
 	      <include name="ejb3-metadata-deployers-jboss-beans.xml"/>
 		  <include name="jboss-ejb3-singleton-deployer-jboss-beans.xml"/>
       </fileset>
+      <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-deployer:jar"/>
     </copy>
 
   </target>
@@ -2092,6 +2093,7 @@
       <fileset refid="org.jboss.ejb3:jboss-ejb3-metadata:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-metadata-deployers:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-mc-int:jar"/>
+      <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-naming:jar"/>
       <fileset refid="org.jboss.ejb3.nointerface:jboss-ejb3-nointerface-impl:jar"/>
       <fileset refid="org.jboss.ejb3.nointerface:jboss-ejb3-nointerface-spi:jar"/>
       <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-aop-impl:jar"/>
@@ -2111,6 +2113,8 @@
 	  <fileset refid="org.jboss.ejb3.proxy:proxy-reflect:jar"/>
       <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-spi:jar"/>
       <fileset refid="org.jboss.ejb3.timeout:jboss-ejb3-timeout-3.1:jar"/>
+      <fileset refid="org.jboss.ejb3.timerservice:ejb31-calendar-expr-parser:jar"/>
+      <fileset refid="org.jboss.ejb3.timerservice:jboss-ejb3-timerservice-extension:jar"/>
       <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:jar"/>
       <fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-impl-vfs3:jar"/>  
     	<fileset refid="org.jboss.embedded:jboss-embedded-api:jar" />

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-06-12 15:50:02 UTC (rev 106009)
+++ trunk/component-matrix/pom.xml	2010-06-12 16:20:34 UTC (rev 106010)
@@ -104,7 +104,7 @@
     <version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha5</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.bom>0.1.2</version.org.jboss.ejb3.bom>
+    <version.org.jboss.ejb3.bom>0.1.3-alpha-1</version.org.jboss.ejb3.bom>
     <!-- This to move into the EJB3 BOM -->
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -131,7 +131,7 @@
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.common>2.0.0.Alpha14</version.org.jboss.metadata.common>
     <version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
-    <version.org.jboss.metadata.ejb>2.0.0-alpha-11</version.org.jboss.metadata.ejb>
+    <version.org.jboss.metadata.ejb>2.0.0-alpha-16</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
     <version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>
     <version.org.jboss.mod_cluster>1.1.0.CR2</version.org.jboss.mod_cluster>

Modified: trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml	2010-06-12 15:50:02 UTC (rev 106009)
+++ trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml	2010-06-12 16:20:34 UTC (rev 106010)
@@ -8,6 +8,8 @@
    <bean name="EJBContextBinder" class="org.jboss.ejb3.context.naming.EJBContextBinder">
       <depends>NameSpaces</depends>
    </bean>
+
+   <bean name="TimerServiceBinder" class="org.jboss.ejb3.timerservice.naming.TimerServiceBinder"/>
    
    <bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
       <!-- TODO: allow for configuration