Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 74298 invoked from network); 22 Feb 2005 23:05:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 22 Feb 2005 23:05:50 -0000 Received: (qmail 63242 invoked by uid 500); 22 Feb 2005 23:05:50 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 63214 invoked by uid 500); 22 Feb 2005 23:05:49 -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 Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 63199 invoked by uid 99); 22 Feb 2005 23:05:49 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 22 Feb 2005 15:05:49 -0800 Received: (qmail 74277 invoked by uid 65534); 22 Feb 2005 23:05:48 -0000 Message-ID: <20050222230548.74275.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 22 Feb 2005 23:05:47 -0000 Subject: svn commit: r154906 - geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java To: scm@geronimo.apache.org From: djencks@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: djencks Date: Tue Feb 22 15:05:45 2005 New Revision: 154906 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D154906 Log: fix admin object names pre-generated during install step Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/gero= nimo/connector/deployment/ConnectorModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder= /src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.j= ava?view=3Ddiff&r1=3D154905&r2=3D154906 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java (original) +++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java Tue Feb 22 15:05:45 2005 @@ -352,7 +352,7 @@ =20 String adminObjectObjectName =3D null; try { - adminObjectObjectName =3D NameFactory.getComponentName= (null, null, null, null, gerAdminObjectInstance.getMessageDestinationName()= , NameFactory.JCA_ADMIN_OBJECT, resourceJ2eeContext).getCanonicalName(); + adminObjectObjectName =3D NameFactory.getComponentName= (null, null, null, null, null, gerAdminObjectInstance.getMessageDestination= Name(), NameFactory.JCA_ADMIN_OBJECT, resourceJ2eeContext).getCanonicalName= (); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct res= ource object name", e); } @@ -392,6 +392,7 @@ GBeanData resourceAdapterData =3D new GBeanData(resourceAdapterjsr= 77Name, ResourceAdapterImpl.GBEAN_INFO); ObjectName jcaResourcejsr77Name =3D null; try { + //TODO double check the module type is correct. jcaResourcejsr77Name =3D NameFactory.getComponentName(null, nu= ll, null, NameFactory.RESOURCE_ADAPTER, null, resourceJ2eeContext.getJ2eeMo= duleName(), NameFactory.JCA_RESOURCE, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct jca resourc= e placeholder name", e); @@ -724,6 +725,7 @@ connectionManagerGBean.setAttribute("pooling", pooling); connectionManagerGBean.setReferencePattern("ConnectionTracker"= , earContext.getConnectionTrackerObjectName()); if (connectionManager.getRealmBridge() !=3D null) { + //TODO eliminate RealmBridge or find a better name ObjectName realmBridgeName =3D NameFactory.getComponentNam= e(null, null, null, null, connectionManager.getRealmBridge().trim(), Abstra= ctRealmBridge.GBEAN_INFO.getJ2eeType(), j2eeContext); connectionManagerGBean.setReferencePattern("RealmBridge", = realmBridgeName); }