[jboss-cvs] JBossAS SVN: r58695 - in trunk/server/src: etc/deployers main/org/jboss/ejb main/org/jboss/ejb/deployers

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

Author: scott.stark at jboss.org
Date: 2006-11-27 17:55:33 -0500 (Mon, 27 Nov 2006)
New Revision: 58695

Modified:
   trunk/server/src/etc/deployers/ejb-deployer-beans.xml
   trunk/server/src/main/org/jboss/ejb/Container.java
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
Log:
Add a dependency on the EjbDeployer timerServiceName property to the EjbModule if defined.


Modified: trunk/server/src/etc/deployers/ejb-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ejb-deployer-beans.xml	2006-11-27 22:22:09 UTC (rev 58694)
+++ trunk/server/src/etc/deployers/ejb-deployer-beans.xml	2006-11-27 22:55:33 UTC (rev 58695)
@@ -42,5 +42,7 @@
        <property name="webServiceName">jboss:service=WebService</property>
        <!-- The CachedConnectionManager service used by the CachedConnectionInterceptor -->
        <property name="cachedConnectionManagerName">jboss.jca:service=CachedConnectionManager</property>
+       <!-- The ejb timer service -->
+       <property name="timerServiceName">jboss.ejb:service=EJBTimerService</property>
     </bean>
 </deployment>

Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java	2006-11-27 22:22:09 UTC (rev 58694)
+++ trunk/server/src/main/org/jboss/ejb/Container.java	2006-11-27 22:55:33 UTC (rev 58695)
@@ -761,6 +761,7 @@
    {
       try
       {
+         // TODO: this name needs to be externalized
          // pass to the ejb timer service the container ObjectName
          server.invoke(
                EJBTimerService.OBJECT_NAME,

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-11-27 22:22:09 UTC (rev 58694)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2006-11-27 22:55:33 UTC (rev 58695)
@@ -50,10 +50,12 @@
 {
    /** */
    private String transactionManagerServiceName;
-   /** */
+   /** Class loading web server name */
    private String webServiceName;
    /** The CachedConnectionManager service used by the CachedConnectionInterceptor */
    private String ccmServiceName;
+   /** The ejb timer service */
+   private String timerServiceName;
 
    /**
     * A utility method that takes a deployment unit name and strips it down to the base war
@@ -112,6 +114,16 @@
       this.ccmServiceName = ccmServiceName;
    }
 
+   public String getTimerServiceName()
+   {
+      return timerServiceName;
+   }
+
+   public void setTimerServiceName(String timerServiceName)
+   {
+      this.timerServiceName = timerServiceName;
+   }
+
    @Override
    public void deploy(DeploymentUnit unit, ApplicationMetaData deployment)
       throws DeploymentException
@@ -181,6 +193,7 @@
       ejbModule.setAttributes(attrs);
 
       // CCM for CachedConnectionInterceptor dependency
+      // TODO: this should be injected directly to the interceptor
       if( ccmServiceName != null && ccmServiceName.length() > 0 )
       {
          List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
@@ -189,6 +202,16 @@
          dependencies.add(ccm);
          ejbModule.setDependencies(dependencies);
       }
+      // Dependency on the timer service
+      // TODO: this should be injected directly to the ejb container
+      if( timerServiceName != null && timerServiceName.length() > 0 )
+      {
+         List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();
+         ServiceDependencyMetaData ccm = new ServiceDependencyMetaData();
+         ccm.setIDependOn(timerServiceName);
+         dependencies.add(ccm);
+         ejbModule.setDependencies(dependencies);
+      }
 
       unit.addAttachment(ServiceMetaData.class, ejbModule);
    }