geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r587764 - in /geronimo/server/trunk/modules: geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
Date Wed, 24 Oct 2007 03:17:48 GMT
Author: gawor
Date: Tue Oct 23 20:17:47 2007
New Revision: 587764

URL: http://svn.apache.org/viewvc?rev=587764&view=rev
Log:
support for TimerService injection (GERONIMO-3455)

Modified:
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=587764&r1=587763&r2=587764&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
Tue Oct 23 20:17:47 2007
@@ -321,6 +321,7 @@
             if (resourceType.equals("javax.ejb.SessionContext")) return true;
             if (resourceType.equals("javax.ejb.MessageDrivenContext")) return true;
             if (resourceType.equals("javax.ejb.EntityContext")) return true;
+            if (resourceType.equals("javax.ejb.TimerService")) return true;
 
             //If it already exists in xml as a message-destination-ref or resource-env-ref,
we are done.
             MessageDestinationRefType[] messageDestinationRefs = annotatedApp.getMessageDestinationRefArray();

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=587764&r1=587763&r2=587764&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Tue Oct 23 20:17:47 2007
@@ -36,6 +36,7 @@
 import javax.ejb.EntityContext;
 import javax.ejb.MessageDrivenContext;
 import javax.ejb.SessionContext;
+import javax.ejb.TimerService;
 import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
@@ -370,6 +371,8 @@
                     iterator.remove();
                 } else if (ref.getType().equals(MessageDrivenContext.class.getName())) {
                     iterator.remove();
+                } else if (ref.getType().equals(TimerService.class.getName())) {
+                    iterator.remove();                
                 } else {
                     ref.setMappedName(null);
                 }



Mime
View raw message