Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 29073 invoked from network); 9 Dec 2005 23:05:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Dec 2005 23:05:17 -0000 Received: (qmail 70840 invoked by uid 500); 9 Dec 2005 23:05:17 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 70829 invoked by uid 500); 9 Dec 2005 23:05:17 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 70818 invoked by uid 99); 9 Dec 2005 23:05:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2005 15:05:16 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 09 Dec 2005 15:05:16 -0800 Received: (qmail 28975 invoked by uid 65534); 9 Dec 2005 23:04:56 -0000 Message-ID: <20051209230456.28974.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r355630 - /geronimo/branches/1.0/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Date: Fri, 09 Dec 2005 23:04:55 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Fri Dec 9 15:04:54 2005 New Revision: 355630 URL: http://svn.apache.org/viewcvs?rev=355630&view=rev Log: GERONIMO-1319 admin object dependencies Modified: geronimo/branches/1.0/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Modified: geronimo/branches/1.0/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=355630&r1=355629&r2=355630&view=diff ============================================================================== --- geronimo/branches/1.0/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java (original) +++ geronimo/branches/1.0/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java Fri Dec 9 15:04: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));