[jboss-cvs] JBossAS SVN: r110628 - in branches/JBPAPP_5_1: ejb3/src/main/org/jboss/as/ejb3/timerservice and 1 other directory.

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

Author: wolfc
Date: 2011-02-11 08:13:38 -0500 (Fri, 11 Feb 2011)
New Revision: 110628

Modified:
   branches/JBPAPP_5_1/component-matrix/pom.xml
   branches/JBPAPP_5_1/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java
Log:
JBPAPP-5334, JBPAPP-3308: upgrade to ejb3 1.0.2 and using TimerServiceFactory_2


Modified: branches/JBPAPP_5_1/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_1/component-matrix/pom.xml	2011-02-11 12:37:39 UTC (rev 110627)
+++ branches/JBPAPP_5_1/component-matrix/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
@@ -66,7 +66,7 @@
     <version.org.jboss.cluster.server.api>1.2.0.Final</version.org.jboss.cluster.server.api>
     <version.org.jboss.common.core>2.2.16.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.0.10.GA</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.bom>1.0.1</version.org.jboss.ejb3.bom>
+    <version.org.jboss.ejb3.bom>1.0.2</version.org.jboss.ejb3.bom>
     <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jopr>1.3.4.SP1</version.org.jboss.jopr>    

Modified: branches/JBPAPP_5_1/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java
===================================================================
--- branches/JBPAPP_5_1/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java	2011-02-11 12:37:39 UTC (rev 110627)
+++ branches/JBPAPP_5_1/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java	2011-02-11 13:13:38 UTC (rev 110628)
@@ -27,7 +27,7 @@
 import org.jboss.ejb.AllowedOperationsAssociation;
 import org.jboss.ejb.txtimer.EJBTimerService;
 import org.jboss.ejb3.timerservice.spi.TimedObjectInvoker;
-import org.jboss.ejb3.timerservice.spi.TimerServiceFactory;
+import org.jboss.ejb3.timerservice.spi.TimerServiceFactory_2;
 import org.jboss.logging.Logger;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
@@ -38,7 +38,7 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version $Revision$
  */
-public class JBossTimerServiceFactory implements TimerServiceFactory
+public class JBossTimerServiceFactory implements TimerServiceFactory_2
 {
    private static Logger log = Logger.getLogger(JBossTimerServiceFactory.class);
    
@@ -98,16 +98,21 @@
          }
       }
    }
-   
+
    public void restoreTimerService(TimerService aTimerService)
    {
+      log.warn("JBPAPP-3308: deprecated restoreTimerService(TimerService) is called");
+      restoreTimerService(aTimerService, null);
+   }
+
+   public void restoreTimerService(TimerService aTimerService, ClassLoader loader)
+   {
       if (aTimerService == null)
       {
          log.warn("TIMER SERVICE IS NOT INSTALLED");
          return;
       }
       TimerServiceFacade timerService = (TimerServiceFacade) aTimerService;
-      ClassLoader loader = null;
       
       // FIXME: A hack to circumvent the check in TimerServiceFacade
       // In AS itself (/EJB2) the container has an unsecured timer service association
@@ -122,7 +127,7 @@
          AllowedOperationsAssociation.popInMethodFlag();
       }
    }
-   
+
    public void suspendTimerService(TimerService timerService)
    {
       removeTimerService(timerService);