geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355623 - /geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Date Fri, 09 Dec 2005 22:55:56 GMT
Author: djencks
Date: Fri Dec  9 14:55:54 2005
New Revision: 355623

URL: http://svn.apache.org/viewcvs?rev=355623&view=rev
Log:
GERONIMO-1319 admin object dependencies

Modified:
    geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java

Modified: geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=355623&r1=355622&r2=355623&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Fri Dec  9 14:55:54 2005
@@ -31,13 +31,16 @@
  */
 public abstract class AbstractWebModuleBuilder implements ModuleBuilder {
     protected static final ObjectName MANAGED_CONNECTION_FACTORY_PATTERN;
+    private static final ObjectName ADMIN_OBJECT_PATTERN;
     protected static final ObjectName STATELESS_SESSION_BEAN_PATTERN;
     protected static final ObjectName STATEFUL_SESSION_BEAN_PATTERN;
     protected static final ObjectName ENTITY_BEAN_PATTERN;
 
+
     static {
         try {
             MANAGED_CONNECTION_FACTORY_PATTERN = ObjectName.getInstance("*:j2eeType=" + NameFactory.JCA_MANAGED_CONNECTION_FACTORY
+  ",*");
+            ADMIN_OBJECT_PATTERN = ObjectName.getInstance("*:j2eeType=" + NameFactory.JCA_ADMIN_OBJECT
+  ",*");
             STATELESS_SESSION_BEAN_PATTERN = ObjectName.getInstance("*:j2eeType=" + NameFactory.STATELESS_SESSION_BEAN
+  ",*");
             STATEFUL_SESSION_BEAN_PATTERN = ObjectName.getInstance("*:j2eeType=" + NameFactory.STATEFUL_SESSION_BEAN
+  ",*");
             ENTITY_BEAN_PATTERN = ObjectName.getInstance("*:j2eeType=" + NameFactory.ENTITY_BEAN
+  ",*");
@@ -50,6 +53,7 @@
     protected Set findGBeanDependencies(EARContext earContext) {
         Set dependencies = new HashSet();
         dependencies.addAll(earContext.listGBeans(MANAGED_CONNECTION_FACTORY_PATTERN));
+        dependencies.addAll(earContext.listGBeans(ADMIN_OBJECT_PATTERN));
         dependencies.addAll(earContext.listGBeans(STATELESS_SESSION_BEAN_PATTERN));
         dependencies.addAll(earContext.listGBeans(STATEFUL_SESSION_BEAN_PATTERN));
         dependencies.addAll(earContext.listGBeans(ENTITY_BEAN_PATTERN));



Mime
View raw message