From scm-return-6209-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Sat Feb 19 18:22:12 2005 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 45543 invoked from network); 19 Feb 2005 18:22:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 19 Feb 2005 18:22:12 -0000 Received: (qmail 2085 invoked by uid 500); 19 Feb 2005 18:22:11 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 2067 invoked by uid 500); 19 Feb 2005 18:22:11 -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 2053 invoked by uid 99); 19 Feb 2005 18:22:11 -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; Sat, 19 Feb 2005 10:22:09 -0800 Received: (qmail 45526 invoked by uid 65534); 19 Feb 2005 18:22:08 -0000 Message-ID: <20050219182208.45525.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: Sat, 19 Feb 2005 18:22:08 -0000 Subject: svn commit: r154436 - in geronimo/trunk/modules: axis/src/test/org/apache/geronimo/axis/ client-builder/src/java/org/apache/geronimo/client/builder/ connector-builder/src/java/org/apache/geronimo/connector/deployment/ connector-builder/src/test/org/apache/geronimo/connector/deployment/ connector/src/java/org/apache/geronimo/connector/ connector/src/java/org/apache/geronimo/connector/outbound/ connector/src/test/org/apache/geronimo/connector/ connector/src/test/org/apache/geronimo/connector/outbound/ j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/ j2ee/src/java/org/apache/geronimo/j2ee/management/impl/ jetty-builder/src/java/org/apache/geronimo/jetty/deployment/ jetty-builder/src/test/org/apache/geronimo/jetty/deployment/ jetty/src/java/org/apache/geronimo/jetty/ jetty/src/test/org/apache/geronimo/jetty/ naming-builder/src/java/org/apache/geronimo/naming/deployment/ service-builder/src/java/org/apache/geronimo/deployment/service/ tomcat/src/java/org/apache/geronimo/tomcat/deployment/ tomcat/src/test/org/apache/geronimo/tomcat/ 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: Sat Feb 19 10:22:02 2005 New Revision: 154436 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D154436 Log: Attempt to simplify (?) and unify NameFactory and J2eeContext. Add missing= jsr-77 classes and correct jsr-77 errors Added: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /JCAResourceImpl.java geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /ResourceAdapterImpl.java Modified: geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractW= ebServiceTest.java geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBean= Test.java geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/clie= nt/builder/AppClientModuleBuilder.java geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilder.java geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilderTest.java geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /ResourceAdapterModuleImpl.java geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /outbound/JCAConnectionFactoryImpl.java geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector= /AdminObjectWrapperTest.java geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector= /outbound/ManagedConnectionFactoryWrapperTest.java geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/EARContext.java geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/J2eeContext.java geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/J2eeContextImpl.java geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/NameFactory.java geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/managemen= t/impl/Util.java geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty= /deployment/JettyModuleBuilder.java geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/JettyModuleBuilderTest.java geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySe= rvletHolder.java geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe= bAppContext.java geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/Abstrac= tWebModuleTest.java geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami= ng/deployment/ENCConfigBuilder.java geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/dep= loyment/service/ServiceConfigBuilder.java geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deplo= yment/TomcatModuleBuilder.java geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/Abstr= actWebModuleTest.java Modified: geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/Abs= tractWebServiceTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/test/org= /apache/geronimo/axis/AbstractWebServiceTest.java?view=3Ddiff&r1=3D154435&r= 2=3D154436 =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/axis/src/test/org/apache/geronimo/axis/AbstractW= ebServiceTest.java (original) +++ geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractW= ebServiceTest.java Sat Feb 19 10:22:02 2005 @@ -60,7 +60,7 @@ kernel.boot(); //start the J2EE server which would be started by the server plan //in the real case=20 - TestingUtils.startJ2EEContainerAndAxisServlet(kernel); +// TestingUtils.startJ2EEContainerAndAxisServlet(kernel); =20 //Start axis gbean =20 GBeanData axisgbData =3D new GBeanData(axisname,AxisGbean.getGBean= Info()); @@ -77,7 +77,7 @@ } =20 protected void tearDown() throws Exception { - TestingUtils.stopJ2EEContinerAndAxisServlet(kernel); +// TestingUtils.stopJ2EEContinerAndAxisServlet(kernel); kernel.shutdown(); File file =3D new File(AxisGeronimoConstants.AXIS_CONFIG_STORE); AxisGeronimoUtils.delete(file); Modified: geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/Axi= sGBeanTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/test/org= /apache/geronimo/axis/AxisGBeanTest.java?view=3Ddiff&r1=3D154435&r2=3D154436 =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/axis/src/test/org/apache/geronimo/axis/AxisGBean= Test.java (original) +++ geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBean= Test.java Sat Feb 19 10:22:02 2005 @@ -80,11 +80,11 @@ name =3D new ObjectName("test:name=3DAxisGBean"); kernel =3D new Kernel("test.kernel"); kernel.boot(); - TestingUtils.startJ2EEContainerAndAxisServlet(kernel); +// TestingUtils.startJ2EEContainerAndAxisServlet(kernel); } =20 protected void tearDown() throws Exception { - TestingUtils.stopJ2EEContinerAndAxisServlet(kernel); +// TestingUtils.stopJ2EEContinerAndAxisServlet(kernel); kernel.shutdown(); } } Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronim= o/client/builder/AppClientModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/sr= c/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view= =3Ddiff&r1=3D154435&r2=3D154436 =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/client-builder/src/java/org/apache/geronimo/clie= nt/builder/AppClientModuleBuilder.java (original) +++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/clie= nt/builder/AppClientModuleBuilder.java Sat Feb 19 10:22:02 2005 @@ -298,7 +298,8 @@ // generate the object name for the app client ObjectName appClientModuleName =3D null; try { - appClientModuleName =3D NameFactory.getModuleName(null, null, = null, appClientModule.getName(), NameFactory.APP_CLIENT_MODULE, earJ2eeCont= ext); + //TODO consider constructing a module context + appClientModuleName =3D NameFactory.getModuleName(null, null, = null, NameFactory.APP_CLIENT_MODULE, appClientModule.getName(), earJ2eeCont= ext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct module name= ", e); } 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=3D154435&r2=3D154436 =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 Sat Feb 19 10:22:02 2005 @@ -42,6 +42,8 @@ import org.apache.geronimo.connector.AdminObjectWrapper; import org.apache.geronimo.connector.ResourceAdapterModuleImpl; import org.apache.geronimo.connector.ResourceAdapterWrapper; +import org.apache.geronimo.connector.ResourceAdapterImpl; +import org.apache.geronimo.connector.JCAResourceImpl; import org.apache.geronimo.connector.outbound.JCAConnectionFactoryImpl; import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrap= per; import org.apache.geronimo.connector.outbound.connectionmanagerconfig.Loca= lTransactions; @@ -262,13 +264,14 @@ =20 public void initContext(EARContext earContext, Module module, ClassLoa= der cl) throws DeploymentException { J2eeContext earJ2eeContext =3D earContext.getJ2eeContext(); - J2eeContext moduleJ2eeContext =3D new J2eeContextImpl(earJ2eeConte= xt.getJ2eeDomainName(), earJ2eeContext.getJ2eeServerName(), earJ2eeContext.= getJ2eeApplicationName(), module.getName(), null, null); + J2eeContext moduleJ2eeContext =3D J2eeContextImpl.newModuleContext= FromApplication(earJ2eeContext, NameFactory.RESOURCE_ADAPTER_MODULE, module= .getName()); + J2eeContext resourceJ2eeContext =3D J2eeContextImpl.newModuleConte= xtFromApplication(earJ2eeContext, NameFactory.JCA_RESOURCE, module.getName(= )); XmlObject specDD =3D module.getSpecDD(); =20 //set up the metadata for the ResourceAdapterModule ObjectName resourceAdapterModuleName =3D null; try { - resourceAdapterModuleName =3D NameFactory.getModuleName(null, = null, null, null, NameFactory.RESOURCE_ADAPTER_MODULE, moduleJ2eeContext); + resourceAdapterModuleName =3D NameFactory.getModuleName(null, = null, null, null, null, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct module name= ", e); } @@ -280,11 +283,7 @@ resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE= _APPLICATION, earContext.getApplicationObjectName()); } =20 - try { - resourceAdapterModuleData.setAttribute("deploymentDescriptor",= module.getOriginalSpecDD()); - } catch (Exception e) { - throw new DeploymentException("Unable to initialize EJBModule = GBean", e); - } + resourceAdapterModuleData.setAttribute("deploymentDescriptor", mod= ule.getOriginalSpecDD()); =20 ResourceadapterType resourceadapter =3D ((ConnectorType) specDD).g= etResourceadapter(); // Create the resource adapter gbean @@ -320,12 +319,12 @@ try { if (resourceadapter.isSetInboundResourceadapter() && r= esourceadapter.getInboundResourceadapter().isSetMessageadapter()) { String resourceAdapterName =3D geronimoResourceAda= pter.getResourceadapterInstance().getResourceadapterName(); - ObjectName resourceAdapterObjectName =3D NameFacto= ry.getResourceComponentName(null, null, null, null, resourceAdapterName, Na= meFactory.JCA_RESOURCE_ADAPTER, moduleJ2eeContext); + ObjectName resourceAdapterObjectName =3D NameFacto= ry.getComponentName(null, null, null, null, null, resourceAdapterName, Name= Factory.JCA_RESOURCE_ADAPTER, resourceJ2eeContext); String containerId =3D resourceAdapterObjectName.g= etCanonicalName(); earContext.getRefContext().addResourceAdapterId(mo= dule.getModuleURI(), resourceAdapterName, containerId); } - } catch (Exception e) { - throw new DeploymentException("Could not set ResourceA= dapterClass", e); + } catch (MalformedObjectNameException e) { + throw new DeploymentException("Could not construct res= ource adapter instance", e); } } if (geronimoResourceAdapter.isSetOutboundResourceadapter()) { @@ -337,7 +336,7 @@ GerConnectiondefinitionInstanceType connectionDefi= nitionInstance =3D connectionDefinitionInstances[j]; String containerId =3D null; try { - containerId =3D NameFactory.getResourceCompone= ntNameString(null, null, null, null, connectionDefinitionInstance.getName()= , NameFactory.JCA_MANAGED_CONNECTION_FACTORY, moduleJ2eeContext); + containerId =3D NameFactory.getComponentName(n= ull, null, null, null, null, connectionDefinitionInstance.getName(), NameFa= ctory.JCA_MANAGED_CONNECTION_FACTORY, resourceJ2eeContext).getCanonicalName= (); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not const= ruct resource object name", e); } @@ -353,7 +352,7 @@ =20 String adminObjectObjectName =3D null; try { - adminObjectObjectName =3D NameFactory.getResourceCompo= nentNameString(null, null, null, null, gerAdminObjectInstance.getMessageDes= tinationName(), NameFactory.JCA_ADMIN_OBJECT, moduleJ2eeContext); + adminObjectObjectName =3D NameFactory.getComponentName= (null, null, null, null, gerAdminObjectInstance.getMessageDestinationName()= , NameFactory.JCA_ADMIN_OBJECT, resourceJ2eeContext).getCanonicalName(); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct res= ource object name", e); } @@ -365,28 +364,50 @@ =20 public String addGBeans(EARContext earContext, Module module, ClassLoa= der cl) throws DeploymentException { J2eeContext earJ2eeContext =3D earContext.getJ2eeContext(); - J2eeContext moduleJ2eeContext =3D new J2eeContextImpl(earJ2eeConte= xt.getJ2eeDomainName(), earJ2eeContext.getJ2eeServerName(), earJ2eeContext.= getJ2eeApplicationName(), module.getName(), null, null); + J2eeContext moduleJ2eeContext =3D J2eeContextImpl.newModuleContext= FromApplication(earJ2eeContext, NameFactory.RESOURCE_ADAPTER_MODULE, module= .getName()); + J2eeContext resourceJ2eeContext =3D J2eeContextImpl.newModuleConte= xtFromApplication(earJ2eeContext, NameFactory.JCA_RESOURCE, module.getName(= )); =20 XmlObject specDD =3D module.getSpecDD(); =20 // build the objectName ObjectName resourceAdapterModuleName =3D null; try { - resourceAdapterModuleName =3D NameFactory.getModuleName(null, = null, null, null, NameFactory.RESOURCE_ADAPTER_MODULE, moduleJ2eeContext); + resourceAdapterModuleName =3D NameFactory.getModuleName(null, = null, null, null, null, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct module name= ", e); } GBeanData resourceAdapterModuleData =3D earContext.getRefContext()= .getResourceAdapterModuleData(resourceAdapterModuleName); + ObjectName resourceAdapterjsr77Name =3D null; + try { + resourceAdapterjsr77Name =3D NameFactory.getComponentName(null= , null, null, null, null, resourceJ2eeContext.getJ2eeModuleName(), NameFact= ory.RESOURCE_ADAPTER, moduleJ2eeContext); + } catch (MalformedObjectNameException e) { + throw new DeploymentException("Could not construct resource ad= apter placeholder name", e); + } + resourceAdapterModuleData.setAttribute("resourceAdapter", resource= Adapterjsr77Name.getCanonicalName()); =20 // add it earContext.addGBean(resourceAdapterModuleData); =20 + //construct the bogus resource adapter and jca resource placeholde= rs + GBeanData resourceAdapterData =3D new GBeanData(resourceAdapterjsr= 77Name, ResourceAdapterImpl.GBEAN_INFO); + ObjectName jcaResourcejsr77Name =3D null; + try { + 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); + } + resourceAdapterData.setAttribute("JCAResource", jcaResourcejsr77Na= me.getCanonicalName()); + earContext.addGBean(resourceAdapterData); + + GBeanData jcaResourceData =3D new GBeanData(jcaResourcejsr77Name, = JCAResourceImpl.GBEAN_INFO); + earContext.addGBean(jcaResourceData); + GerConnectorType geronimoConnector =3D (GerConnectorType) module.g= etVendorDD(); =20 GbeanType[] gbeans =3D geronimoConnector.getGbeanArray(); ServiceConfigBuilder.addGBeans(gbeans, cl, moduleJ2eeContext, earC= ontext); =20 - addConnectorGBeans(earContext, moduleJ2eeContext, resourceAdapterM= oduleName, (ConnectorType) specDD, geronimoConnector, cl); + addConnectorGBeans(earContext, resourceJ2eeContext, resourceAdapte= rModuleName, (ConnectorType) specDD, geronimoConnector, cl); =20 return null; } @@ -412,7 +433,7 @@ =20 String resourceAdapterName =3D geronimoResourceAdapter.get= ResourceadapterInstance().getResourceadapterName(); try { - resourceAdapterObjectName =3D NameFactory.getResourceC= omponentName(null, null, null, null, resourceAdapterName, NameFactory.JCA_R= ESOURCE_ADAPTER, moduleJ2eeContext); + resourceAdapterObjectName =3D NameFactory.getComponent= Name(null, null, null, null, null, resourceAdapterName, NameFactory.JCA_RES= OURCE_ADAPTER, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct res= ource adapter object name", e); } @@ -467,7 +488,7 @@ // add it ObjectName adminObjectObjectName =3D null; try { - adminObjectObjectName =3D NameFactory.getResourceCompo= nentName(null, null, null, null, gerAdminObjectInstance.getMessageDestinati= onName(), NameFactory.JCA_ADMIN_OBJECT, moduleJ2eeContext); + adminObjectObjectName =3D NameFactory.getComponentName= (null, null, null, null, null, gerAdminObjectInstance.getMessageDestination= Name(), NameFactory.JCA_ADMIN_OBJECT, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct adm= in object object name", e); } @@ -634,7 +655,7 @@ // create the object name for our connection manager ObjectName connectionManagerObjectName =3D null; try { - connectionManagerObjectName =3D NameFactory.getResourceCompone= ntName(null, null, null, null, connectionfactoryInstance.getName(), NameFac= tory.JCA_CONNECTION_MANAGER, j2eeContext); + connectionManagerObjectName =3D NameFactory.getComponentName(n= ull, null, null, null, null, connectionfactoryInstance.getName(), NameFacto= ry.JCA_CONNECTION_MANAGER, j2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct connection = manager object name", e); } @@ -760,7 +781,7 @@ =20 ObjectName managedConnectionFactoryObjectName =3D null; try { - managedConnectionFactoryObjectName =3D NameFactory.getResource= ComponentName(null, null, null, null, connectiondefinitionInstance.getName(= ), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext); + managedConnectionFactoryObjectName =3D NameFactory.getComponen= tName(null, null, null, null, null, connectiondefinitionInstance.getName(),= NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct managed con= nection factory object name", e); } @@ -770,7 +791,7 @@ // ConnectionFactory ObjectName connectionFactoryObjectName =3D null; try { - connectionFactoryObjectName =3D NameFactory.getResourceCompone= ntName(null, null, null, null, connectiondefinitionInstance.getName(), Name= Factory.JCA_CONNECTION_FACTORY, j2eeContext); + connectionFactoryObjectName =3D NameFactory.getComponentName(n= ull, null, null, null, null, connectiondefinitionInstance.getName(), NameFa= ctory.JCA_CONNECTION_FACTORY, j2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct connection = factory object name", e); } Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/gero= nimo/connector/deployment/ConnectorModuleBuilderTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder= /src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTe= st.java?view=3Ddiff&r1=3D154435&r2=3D154436 =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/test/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilderTest.java (original) +++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/c= onnector/deployment/ConnectorModuleBuilderTest.java Sat Feb 19 10:22:02 2005 @@ -283,9 +283,10 @@ =20 =20 private void executeTestBuildModule(InstallAction action, boolean is15= ) throws Exception { - J2eeContext j2eeContext =3D new J2eeContextImpl("test", "bar", "nu= ll", "org/apache/geronimo/j2ee/deployment/test", null, null); + J2eeContext j2eeContext =3D new J2eeContextImpl("test", "bar", "nu= ll", "JCAResource", "org/apache/geronimo/j2ee/deployment/test", null, null); String resourceAdapterName =3D "testRA"; - ObjectName connectionTrackerName =3D NameFactory.getComponentName(= null, null, null, null, "ConnectionTracker", ConnectionTrackingCoordinator.= GBEAN_INFO.getJ2eeType(), j2eeContext);=20 + //N.B. short version of getComponentName + ObjectName connectionTrackerName =3D NameFactory.getComponentName(= null, null, null, null, "ConnectionTracker", ConnectionTrackingCoordinator.= GBEAN_INFO.getJ2eeType(), j2eeContext); //new ObjectName("test:J2EEServer=3Dbar,J2EEModule=3Dorg/a= pache/geronimo/j2ee/deployment/test,service=3DConnectionTracker"); =20 Kernel kernel =3D new Kernel("foo", new BasicGBeanRegistry()); @@ -398,7 +399,7 @@ assertTrue("No application object should be registered for= a standalone module", applications.isEmpty()); } =20 - ObjectName moduleName =3D NameFactory.getModuleName(null, null= , null, null, NameFactory.RESOURCE_ADAPTER_MODULE, j2eeContext); + ObjectName moduleName =3D NameFactory.getModuleName(null, null= , null, NameFactory.RESOURCE_ADAPTER_MODULE, null, j2eeContext); assertRunning(kernel, moduleName); =20 //1.5 only @@ -420,7 +421,7 @@ assertEquals(3, attributes2.size()); =20 // ResourceAdapter - ObjectName resourceAdapterObjectName =3D NameFactory.getRe= sourceComponentName(null, null, null, null, resourceAdapterName, NameFactor= y=2EJCA_RESOURCE_ADAPTER, j2eeContext); + ObjectName resourceAdapterObjectName =3D NameFactory.getCo= mponentName(null, null, null, null, null, resourceAdapterName, NameFactory.= JCA_RESOURCE_ADAPTER, j2eeContext); =20 assertRunning(kernel, resourceAdapterObjectName); assertAttributeValue(kernel, resourceAdapterObjectName, "R= AStringProperty", "NewStringValue"); @@ -437,42 +438,42 @@ =20 =20 // FirstTestOutboundConnectionFactory - ObjectName firstConnectionManagerFactory =3D NameFactory.getRe= sourceComponentName(null, null, null, null, "FirstTestOutboundConnectionFac= tory", NameFactory.JCA_CONNECTION_MANAGER, j2eeContext); + ObjectName firstConnectionManagerFactory =3D NameFactory.getCo= mponentName(null, null, null, null, null, "FirstTestOutboundConnectionFacto= ry", NameFactory.JCA_CONNECTION_MANAGER, j2eeContext); assertRunning(kernel, firstConnectionManagerFactory); =20 =20 - ObjectName firstOutCF =3D NameFactory.getResourceComponentName= (null, null, null, null, "FirstTestOutboundConnectionFactory", NameFactory.= JCA_CONNECTION_FACTORY, j2eeContext); + ObjectName firstOutCF =3D NameFactory.getComponentName(null, n= ull, null, null, null, "FirstTestOutboundConnectionFactory", NameFactory.JC= A_CONNECTION_FACTORY, j2eeContext); assertRunning(kernel, firstOutCF); =20 ObjectName firstOutSecurity =3D new ObjectName("geronimo.secur= ity:service=3DRealm,type=3DPasswordCredential,name=3DFirstTestOutboundConne= ctionFactory"); assertRunning(kernel, firstOutSecurity); =20 - ObjectName firstOutMCF =3D NameFactory.getResourceComponentNam= e(null, null, null, null, "FirstTestOutboundConnectionFactory", NameFactory= .JCA_MANAGED_CONNECTION_FACTORY, j2eeContext); + ObjectName firstOutMCF =3D NameFactory.getComponentName(null, = null, null, null, null, "FirstTestOutboundConnectionFactory", NameFactory.J= CA_MANAGED_CONNECTION_FACTORY, j2eeContext); assertRunning(kernel, firstOutMCF); assertAttributeValue(kernel, firstOutMCF, "OutboundStringPrope= rty1", "newvalue1"); assertAttributeValue(kernel, firstOutMCF, "OutboundStringPrope= rty2", "originalvalue2"); assertAttributeValue(kernel, firstOutMCF, "OutboundStringPrope= rty3", "newvalue2"); =20 // SecondTestOutboundConnectionFactory - ObjectName secondConnectionManagerFactory =3D NameFactory.getR= esourceComponentName(null, null, null, null, "SecondTestOutboundConnectionF= actory", NameFactory.JCA_CONNECTION_MANAGER, j2eeContext); + ObjectName secondConnectionManagerFactory =3D NameFactory.getC= omponentName(null, null, null, null, null, "SecondTestOutboundConnectionFac= tory", NameFactory.JCA_CONNECTION_MANAGER, j2eeContext); assertRunning(kernel, secondConnectionManagerFactory); =20 =20 - ObjectName secondOutCF =3D NameFactory.getResourceComponentNam= e(null, null, null, null, "SecondTestOutboundConnectionFactory", NameFactor= y=2EJCA_CONNECTION_FACTORY, j2eeContext); + ObjectName secondOutCF =3D NameFactory.getComponentName(null, = null, null, null, null, "SecondTestOutboundConnectionFactory", NameFactory.= JCA_CONNECTION_FACTORY, j2eeContext); assertRunning(kernel, secondOutCF); =20 - ObjectName secondOutMCF =3D NameFactory.getResourceComponentNa= me(null, null, null, null, "SecondTestOutboundConnectionFactory", NameFacto= ry.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext); + ObjectName secondOutMCF =3D NameFactory.getComponentName(null,= null, null, null, null, "SecondTestOutboundConnectionFactory", NameFactory= .JCA_MANAGED_CONNECTION_FACTORY, j2eeContext); assertRunning(kernel, secondOutMCF); =20 // ThirdTestOutboundConnectionFactory - ObjectName thirdConnectionManagerFactory =3D NameFactory.getRe= sourceComponentName(null, null, null, null, "ThirdTestOutboundConnectionFac= tory", NameFactory.JCA_CONNECTION_MANAGER, j2eeContext); + ObjectName thirdConnectionManagerFactory =3D NameFactory.getCo= mponentName(null, null, null, null, null, "ThirdTestOutboundConnectionFacto= ry", NameFactory.JCA_CONNECTION_MANAGER, j2eeContext); assertRunning(kernel, thirdConnectionManagerFactory); =20 =20 - ObjectName thirdOutCF =3D NameFactory.getResourceComponentName= (null, null, null, null, "ThirdTestOutboundConnectionFactory", NameFactory.= JCA_CONNECTION_FACTORY, j2eeContext); + ObjectName thirdOutCF =3D NameFactory.getComponentName(null, n= ull, null, null, null, "ThirdTestOutboundConnectionFactory", NameFactory.JC= A_CONNECTION_FACTORY, j2eeContext); assertRunning(kernel, thirdOutCF); =20 - ObjectName thirdOutMCF =3D NameFactory.getResourceComponentNam= e(null, null, null, null, "ThirdTestOutboundConnectionFactory", NameFactory= .JCA_MANAGED_CONNECTION_FACTORY, j2eeContext); + ObjectName thirdOutMCF =3D NameFactory.getComponentName(null, = null, null, null, null, "ThirdTestOutboundConnectionFactory", NameFactory.J= CA_MANAGED_CONNECTION_FACTORY, j2eeContext); assertRunning(kernel, thirdOutMCF); =20 // 1.5 only @@ -480,10 +481,10 @@ // =20 if (is15) { - ObjectName tweedledeeAdminObject =3D NameFactory.getResour= ceComponentName(null, null, null, null, "tweedledee", NameFactory.JCA_ADMIN= _OBJECT, j2eeContext); + ObjectName tweedledeeAdminObject =3D NameFactory.getCompon= entName(null, null, null, null, null, "tweedledee", NameFactory.JCA_ADMIN_O= BJECT, j2eeContext); assertRunning(kernel, tweedledeeAdminObject); =20 - ObjectName tweedledumAdminObject =3D NameFactory.getResour= ceComponentName(null, null, null, null, "tweedledum", NameFactory.JCA_ADMIN= _OBJECT, j2eeContext); + ObjectName tweedledumAdminObject =3D NameFactory.getCompon= entName(null, null, null, null, null, "tweedledum", NameFactory.JCA_ADMIN_O= BJECT, j2eeContext); assertRunning(kernel, tweedledumAdminObject); } =20 Added: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connec= tor/JCAResourceImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/jav= a/org/apache/geronimo/connector/JCAResourceImpl.java?view=3Dauto&rev=3D1544= 36 =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/src/java/org/apache/geronimo/connector= /JCAResourceImpl.java (added) +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /JCAResourceImpl.java Sat Feb 19 10:22:02 2005 @@ -0,0 +1,79 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie= d=2E + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.geronimo.connector; + +import javax.management.ObjectName; +import javax.management.MalformedObjectNameException; + +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; +import org.apache.geronimo.j2ee.management.impl.Util; +import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.kernel.jmx.JMXUtil; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; + +/** + * @version $Rev: $ $Date: $ + */ +public class JCAResourceImpl { + private final Kernel kernel; + private final J2eeContext moduleContext; + + private static final String[] CONNECTION_FACTORY_TYPES =3D {NameFactor= y=2EJCA_CONNECTION_FACTORY}; + private static final String[] RESOURCE_ADAPTER_INSTANCE_TYPES =3D {Nam= eFactory.JCA_RESOURCE_ADAPTER}; + + public JCAResourceImpl(String objectName, Kernel kernel) { + ObjectName myObjectName =3D JMXUtil.getObjectName(objectName); + moduleContext =3D J2eeContextImpl.newContext(myObjectName, NameFac= tory.JCA_RESOURCE); + + this.kernel =3D kernel; + } + + public String[] getConnectionFactories() throws MalformedObjectNameExc= eption { + return Util.getObjectNames(kernel, moduleContext, CONNECTION_FACTO= RY_TYPES); + } + + public String[] getResourceAdapterInstances() throws MalformedObjectNa= meException { + return Util.getObjectNames(kernel, moduleContext, RESOURCE_ADAPTER= _INSTANCE_TYPES); + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(JCAResourceI= mpl.class, NameFactory.JCA_RESOURCE); + infoBuilder.addAttribute("objectName", String.class, false); + infoBuilder.addAttribute("kernel", Kernel.class, false); + + infoBuilder.addAttribute("connectionFactories", String[].class, fa= lse); + infoBuilder.addAttribute("resourceAdapterInstances", String[].clas= s, false); + + infoBuilder.setConstructor(new String[]{ + "objectName", + "kernel" + }); + + GBEAN_INFO =3D infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + + +} Added: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connec= tor/ResourceAdapterImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/jav= a/org/apache/geronimo/connector/ResourceAdapterImpl.java?view=3Dauto&rev=3D= 154436 =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/src/java/org/apache/geronimo/connector= /ResourceAdapterImpl.java (added) +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /ResourceAdapterImpl.java Sat Feb 19 10:22:02 2005 @@ -0,0 +1,67 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie= d=2E + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.geronimo.connector; + +import java.util.Map; +import javax.management.ObjectName; +import javax.management.MalformedObjectNameException; + +import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.kernel.jmx.JMXUtil; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; +import org.apache.geronimo.j2ee.management.J2EEServer; +import org.apache.geronimo.j2ee.management.J2EEApplication; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.gbean.GBeanData; + +/** + * @version $Rev: $ $Date: $ + */ +public class ResourceAdapterImpl { + private final String jcaResource; + + public ResourceAdapterImpl(String objectName, String jcaResource) thro= ws MalformedObjectNameException { + this.jcaResource =3D jcaResource; + } + + public String getJCAResource() { + return jcaResource; + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(ResourceAdap= terImpl.class, NameFactory.RESOURCE_ADAPTER); + infoBuilder.addAttribute("objectName", String.class, false); + infoBuilder.addAttribute("JCAResource", String.class, true); + + infoBuilder.setConstructor(new String[]{ + "objectName", + "JCAResource" + }); + + GBEAN_INFO =3D infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +} Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/con= nector/ResourceAdapterModuleImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/jav= a/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java?view=3Ddiff&= r1=3D154435&r2=3D154436 =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/src/java/org/apache/geronimo/connector= /ResourceAdapterModuleImpl.java (original) +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /ResourceAdapterModuleImpl.java Sat Feb 19 10:22:02 2005 @@ -29,6 +29,8 @@ import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException; import org.apache.geronimo.j2ee.management.impl.Util; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.jmx.JMXUtil; =20 @@ -36,18 +38,17 @@ * @version $Rev$ $Date$ */ public class ResourceAdapterModuleImpl { - private final Kernel kernel; - private final String baseName; private final J2EEServer server; private final J2EEApplication application; private final String deploymentDescriptor; + private final String[] resourceAdapters; =20 private final GBeanData resourceAdapterGBeanData; private final Map activationSpecInfoMap; private final Map adminObjectInfoMap; private final Map managedConnectionFactoryInfoMap; =20 - public ResourceAdapterModuleImpl(Kernel kernel, + public ResourceAdapterModuleImpl(String resourceAdapter, String objectName,=20 J2EEServer server,=20 J2EEApplication application,=20 @@ -59,14 +60,8 @@ ObjectName myObjectName =3D JMXUtil.getObjectName(objectName); verifyObjectName(myObjectName); =20 - // build the base name used to query the server for child modules - Hashtable keyPropertyList =3D myObjectName.getKeyPropertyList(); - String name =3D (String) keyPropertyList.get("name"); - String j2eeServerName =3D (String) keyPropertyList.get("J2EEServer= "); - String j2eeApplicationName =3D (String) keyPropertyList.get("J2EEA= pplication"); - baseName =3D myObjectName.getDomain() + ":J2EEServer=3D" + j2eeSer= verName + ",J2EEApplication=3D" + j2eeApplicationName + ",ResouceAdapterMod= ule=3D" + name + ","; + this.resourceAdapters =3D new String[] {resourceAdapter}; =20 - this.kernel =3D kernel; this.server =3D server; this.application =3D application; this.deploymentDescriptor =3D deploymentDescriptor; @@ -97,7 +92,7 @@ } =20 public String[] getResourceAdapters() throws MalformedObjectNameExcept= ion { - return Util.getObjectNames(kernel, baseName, new String[]{"Resourc= eAdapter"}); + return resourceAdapters; } =20 public GBeanData getResourceAdapterGBeanData() { @@ -152,7 +147,7 @@ =20 infoBuilder.addAttribute("deploymentDescriptor", String.class, tru= e); =20 - infoBuilder.addAttribute("kernel", Kernel.class, false); + infoBuilder.addAttribute("resourceAdapter", String.class, true); infoBuilder.addAttribute("objectName", String.class, false); infoBuilder.addAttribute("server", String.class, false); infoBuilder.addAttribute("application", String.class, false); @@ -165,7 +160,7 @@ infoBuilder.addAttribute("managedConnectionFactoryInfoMap", Map.cl= ass, true); =20 infoBuilder.setConstructor(new String[]{ - "kernel", + "resourceAdapter", "objectName", "J2EEServer", "J2EEApplication", Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/con= nector/outbound/JCAConnectionFactoryImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/jav= a/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java?view= =3Ddiff&r1=3D154435&r2=3D154436 =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/src/java/org/apache/geronimo/connector= /outbound/JCAConnectionFactoryImpl.java (original) +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector= /outbound/JCAConnectionFactoryImpl.java Sat Feb 19 10:22:02 2005 @@ -41,9 +41,9 @@ this.managedConnectionFactory =3D managedConnectionFactory; } =20 - public String getServer() { - return server.getObjectName(); - } +// public String getServer() { +// return server.getObjectName(); +// } =20 public String getManagedConnectionFactory() { return managedConnectionFactory; @@ -83,7 +83,7 @@ infoFactory.addReference("J2EEServer", J2EEServer.class); =20 infoFactory.addAttribute("objectName", String.class, false); - infoFactory.addAttribute("server", String.class, false); +// infoFactory.addAttribute("server", String.class, false); infoFactory.addAttribute("managedConnectionFactory", String.class,= true); =20 infoFactory.setConstructor(new String[]{"objectName", "J2EEServer"= , "managedConnectionFactory"}); Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/con= nector/AdminObjectWrapperTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/tes= t/org/apache/geronimo/connector/AdminObjectWrapperTest.java?view=3Ddiff&r1= =3D154435&r2=3D154436 =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/src/test/org/apache/geronimo/connector= /AdminObjectWrapperTest.java (original) +++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector= /AdminObjectWrapperTest.java Sat Feb 19 10:22:02 2005 @@ -26,11 +26,12 @@ import junit.framework.TestCase; import org.apache.geronimo.connector.mock.MockAdminObject; import org.apache.geronimo.connector.mock.MockAdminObjectImpl; -import org.apache.geronimo.gbean.jmx.GBeanMBean; +import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.kernel.registry.BasicGBeanRegistry; =20 /** * @version $Rev$ $Date$ @@ -101,15 +102,15 @@ // } =20 protected void setUp() throws Exception { - J2eeContext j2eeContext =3D new J2eeContextImpl("test.domain", "ge= ronimo.server", "testapp", "testmodule", TARGET_NAME, NameFactory.JMS_RESOU= RCE); - kernel =3D new Kernel(j2eeContext.getJ2eeServerName(), j2eeContext= .getJ2eeDomainName()); + J2eeContext j2eeContext =3D new J2eeContextImpl("test.domain", "ge= ronimo.server", "testapp", NameFactory.RESOURCE_ADAPTER_MODULE, "testmodule= ", TARGET_NAME, NameFactory.JMS_RESOURCE); + kernel =3D new Kernel(j2eeContext.getJ2eeDomainName(), new BasicGB= eanRegistry()); kernel.boot(); selfName =3D NameFactory.getResourceComponentName(null, null, null= , null, null, null, j2eeContext); =20 - GBeanMBean aow =3D new GBeanMBean(AdminObjectWrapper.getGBeanInfo(= )); + GBeanData aow =3D new GBeanData(selfName, AdminObjectWrapper.getGB= eanInfo()); aow.setAttribute("adminObjectInterface", MockAdminObject.class.get= Name()); aow.setAttribute("adminObjectClass", MockAdminObjectImpl.class.get= Name()); - kernel.loadGBean(selfName, aow); + kernel.loadGBean(aow, this.getClass().getClassLoader()); =20 kernel.startGBean(selfName); } Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/con= nector/outbound/ManagedConnectionFactoryWrapperTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/tes= t/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTes= t=2Ejava?view=3Ddiff&r1=3D154435&r2=3D154436 =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/src/test/org/apache/geronimo/connector= /outbound/ManagedConnectionFactoryWrapperTest.java (original) +++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector= /outbound/ManagedConnectionFactoryWrapperTest.java Sat Feb 19 10:22:02 2005 @@ -155,7 +155,7 @@ cmfName =3D ObjectName.getInstance("test:role=3DConnectionManagerF= actory"); kernel.loadGBean(cmfName, cmf); =20 - J2eeContext j2eeContext =3D new J2eeContextImpl("test.domain", "ge= ronimo", "testapplication", "testmodule", TARGET_NAME, NameFactory.JCA_MANA= GED_CONNECTION_FACTORY); + J2eeContext j2eeContext =3D new J2eeContextImpl("test.domain", "ge= ronimo", "testapplication", "noModuleType", "testmodule", TARGET_NAME, Name= Factory.JCA_MANAGED_CONNECTION_FACTORY); managedConnectionFactoryName =3D NameFactory.getResourceComponentN= ame(null, null, null, null, null, null, j2eeContext); =20 GBeanMBean mcfw =3D new GBeanMBean(ManagedConnectionFactoryWrapper= .getGBeanInfo()); Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/= j2ee/deployment/EARContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/= java/org/apache/geronimo/j2ee/deployment/EARContext.java?view=3Ddiff&r1=3D1= 54435&r2=3D154436 =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/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/EARContext.java (original) +++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/d= eployment/EARContext.java Sat Feb 19 10:22:02 2005 @@ -48,7 +48,7 @@ =20 public EARContext(File baseDir, URI id, ConfigurationModuleType module= Type, URI parentID, Kernel kernel, String j2eeApplicationName, ObjectName t= ransactionContextManagerObjectName, ObjectName connectionTrackerObjectName,= ObjectName transactedTimerName, ObjectName nonTransactedTimerName, RefCont= ext refContext) throws MalformedObjectNameException, DeploymentException { super(baseDir, id, moduleType, parentID, kernel); - j2eeContext =3D new J2eeContextImpl(getDomain(), getServer(), j2ee= ApplicationName =3D=3D null ? NameFactory.NULL : j2eeApplicationName, null,= null, null); + j2eeContext =3D new J2eeContextImpl(getDomain(), getServer(), j2ee= ApplicationName =3D=3D null ? NameFactory.NULL : j2eeApplicationName, null,= null, null, null); domainObjectName =3D NameFactory.getDomainName(null, j2eeContext); serverObjectName =3D NameFactory.getServerName(null, null, j2eeCon= text); =20 Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2e= eobjectnames/J2eeContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org= /apache/geronimo/j2ee/j2eeobjectnames/J2eeContext.java?view=3Ddiff&r1=3D154= 435&r2=3D154436 =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/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/J2eeContext.java (original) +++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/J2eeContext.java Sat Feb 19 10:22:02 2005 @@ -48,4 +48,7 @@ =20 String getJ2eeType(String override); =20 + String getJ2eeModuleType(); + + String getJ2eeModuleType(String override); } Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2e= eobjectnames/J2eeContextImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org= /apache/geronimo/j2ee/j2eeobjectnames/J2eeContextImpl.java?view=3Ddiff&r1= =3D154435&r2=3D154436 =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/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/J2eeContextImpl.java (original) +++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/J2eeContextImpl.java Sat Feb 19 10:22:02 2005 @@ -26,29 +26,51 @@ private final String domainName; private final String serverName; private final String applicationName; + private final String moduleType; private final String moduleName; private final String j2eeName; private final String j2eeType; =20 - public J2eeContextImpl(String domainName, String serverName, String ap= plicationName, String moduleName, String j2eeName, String j2eeType) { + public J2eeContextImpl(String domainName, String serverName, String ap= plicationName, String moduleType, String moduleName, String j2eeName, Strin= g j2eeType) { this.domainName =3D domainName; this.serverName =3D serverName; this.applicationName =3D applicationName; + this.moduleType =3D moduleType; this.moduleName =3D moduleName; this.j2eeName =3D j2eeName; this.j2eeType =3D j2eeType; } =20 - public J2eeContextImpl(ObjectName source, String moduleType) { - this.domainName =3D source.getDomain(); - this.serverName =3D source.getKeyProperty(NameFactory.J2EE_SERVER); - this.applicationName =3D source.getKeyProperty(NameFactory.J2EE_AP= PLICATION); - this.moduleName =3D source.getKeyProperty(moduleType); - this.j2eeType =3D source.getKeyProperty(NameFactory.J2EE_TYPE); - this.j2eeName =3D source.getKeyProperty(NameFactory.J2EE_NAME); + public static J2eeContextImpl newContext(ObjectName source, String mod= uleType) { + return new J2eeContextImpl(source.getDomain(), + source.getKeyProperty(NameFactory.J2EE_SERVER), + source.getKeyProperty(NameFactory.J2EE_APPLICATION), + moduleType, + source.getKeyProperty(moduleType), + source.getKeyProperty(NameFactory.J2EE_TYPE), + source.getKeyProperty(NameFactory.J2EE_NAME)); + } + + public static J2eeContextImpl newModuleContextFromApplication(ObjectNa= me source, String moduleType, String moduleName) { + return new J2eeContextImpl(source.getDomain(), + source.getKeyProperty(NameFactory.J2EE_SERVER), + source.getKeyProperty(NameFactory.J2EE_NAME), //applicatio= n name in module is name key property in application's object name + moduleType, + moduleName, + null, + null); + } + + public static J2eeContextImpl newModuleContextFromApplication(J2eeCont= ext source, String moduleType, String moduleName) { + return new J2eeContextImpl(source.getJ2eeDomainName(), + source.getJ2eeServerName(), + source.getJ2eeApplicationName(), + moduleType, + moduleName, + null, + null); } =20 - public String getJ2eeDomainName() { return domainName; } @@ -61,6 +83,10 @@ return applicationName; } =20 + public String getJ2eeModuleType() { + return moduleType; + } + public String getJ2eeModuleName() { return moduleName; } @@ -74,27 +100,31 @@ } =20 public String getJ2eeDomainName(String override) { - return override =3D=3D null? domainName: override; + return override =3D=3D null ? domainName : override; } =20 public String getJ2eeServerName(String override) { - return override =3D=3D null? serverName: override; + return override =3D=3D null ? serverName : override; } =20 public String getJ2eeApplicationName(String override) { - return override =3D=3D null? applicationName: override; + return override =3D=3D null ? applicationName : override; + } + + public String getJ2eeModuleType(String override) { + return override =3D=3D null ? moduleType : override; } =20 public String getJ2eeModuleName(String override) { - return override =3D=3D null? moduleName: override; + return override =3D=3D null ? moduleName : override; } =20 //most likely the last 2 don't make any sense. public String getJ2eeName(String override) { - return override =3D=3D null? j2eeName: override; + return override =3D=3D null ? j2eeName : override; } =20 public String getJ2eeType(String override) { - return override =3D=3D null? j2eeType: override; + return override =3D=3D null ? j2eeType : override; } } Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2e= eobjectnames/NameFactory.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org= /apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?view=3Ddiff&r1=3D154= 435&r2=3D154436 =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/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/NameFactory.java (original) +++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjec= tnames/NameFactory.java Sat Feb 19 10:22:02 2005 @@ -94,6 +94,7 @@ public static final String CONFIGURATION_ENTRY =3D "ConfigurationEntry= "; public static final String PERSISTENT_CONFIGURATION_LIST =3D "Persiste= ntConfigurationList"; //duplicated in FileConfigurationList // public static final String URL_PATTERN =3D "URLPattern"; + public static String DEFAULT_SERVLET =3D "DefaultServlet"; =20 public static ObjectName getDomainName(String j2eeDomainName, J2eeCont= ext context) throws MalformedObjectNameException { Properties props =3D new Properties(); @@ -117,38 +118,36 @@ return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomain= Name), props); } =20 - public static ObjectName getModuleName(String j2eeDomainName, String j= 2eeServerName, String j2eeApplicationName, String j2eeModuleName, String j2= eeType, J2eeContext context) throws MalformedObjectNameException { + public static ObjectName getModuleName(String j2eeDomainName, String j= 2eeServerName, String j2eeApplicationName, String j2eeModuleType, String j2= eeModuleName, J2eeContext context) throws MalformedObjectNameException { Properties props =3D new Properties(); - props.put(J2EE_TYPE, context.getJ2eeType(j2eeType)); + //N.B.! module context will have the module's j2eeType as its modu= le type attribute. + props.put(J2EE_TYPE, context.getJ2eeModuleType(j2eeModuleType)); props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName)); props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApp= licationName)); props.put(J2EE_NAME, context.getJ2eeModuleName(j2eeModuleName)); return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomain= Name), props); } =20 - public static ObjectName getEjbComponentName(String j2eeDomainName, St= ring j2eeServerName, String j2eeApplicationName, String j2eeModuleName, Str= ing j2eeName, String j2eeType, J2eeContext context) throws MalformedObjectN= ameException { + public static ObjectName getComponentName(String j2eeDomainName, Strin= g j2eeServerName, String j2eeApplicationName, String j2eeModuleType, String= j2eeModuleName, String j2eeName, String j2eeType, J2eeContext context) thr= ows MalformedObjectNameException { Properties props =3D new Properties(); props.put(J2EE_TYPE, context.getJ2eeType(j2eeType)); props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName)); props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApp= licationName)); - props.put(EJB_MODULE, context.getJ2eeModuleName(j2eeModuleName)); + props.put(context.getJ2eeModuleType(j2eeModuleType), context.getJ2= eeModuleName(j2eeModuleName)); props.put(J2EE_NAME, context.getJ2eeName(j2eeName)); return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomain= Name), props); } =20 + public static ObjectName getEjbComponentName(String j2eeDomainName, St= ring j2eeServerName, String j2eeApplicationName, String j2eeModuleName, Str= ing j2eeName, String j2eeType, J2eeContext context) throws MalformedObjectN= ameException { + return getComponentName(j2eeDomainName, j2eeServerName, j2eeApplic= ationName, EJB_MODULE, j2eeModuleName, j2eeName, j2eeType, context); + } + public static String getEjbComponentNameString(String j2eeDomainName, = String j2eeServerName, String j2eeApplicationName, String j2eeModuleName, S= tring j2eeName, String j2eeType, J2eeContext context) throws MalformedObjec= tNameException { return getEjbComponentName(j2eeDomainName, j2eeServerName, j2eeApp= licationName, j2eeModuleName, j2eeName, j2eeType, context).getCanonicalName= (); } =20 public static ObjectName getResourceComponentName(String j2eeDomainNam= e, String j2eeServerName, String j2eeApplicationName, String j2eeModuleName= , String j2eeName, String j2eeType, J2eeContext context) throws MalformedOb= jectNameException { - Properties props =3D new Properties(); - props.put(J2EE_TYPE, context.getJ2eeType(j2eeType)); - props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName)); - props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApp= licationName)); -// props.put(RESOURCE_ADAPTER_MODULE, context.getJ2eeModuleName(j2e= eModuleName)); - props.put(JCA_RESOURCE, context.getJ2eeModuleName(j2eeModuleName)); - props.put(J2EE_NAME, context.getJ2eeName(j2eeName)); - return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomain= Name), props); + return getComponentName(j2eeDomainName, j2eeServerName, j2eeApplic= ationName, RESOURCE_ADAPTER_MODULE, j2eeModuleName, j2eeName, j2eeType, con= text); } =20 public static String getResourceComponentNameString(String j2eeDomainN= ame, String j2eeServerName, String j2eeApplicationName, String j2eeModuleNa= me, String j2eeName, String j2eeType, J2eeContext context) throws Malformed= ObjectNameException { @@ -182,17 +181,21 @@ return ObjectName.getInstance(buffer.toString()); } =20 + public static ObjectName getComponentInModuleQuery(String j2eeDomainNa= me, String j2eeServerName, String applicationName, String j2eeModuleType, S= tring j2eeModuleName, String j2eeType, J2eeContext context) throws Malforme= dObjectNameException { + StringBuffer buffer =3D new StringBuffer(context.getJ2eeDomainName= (j2eeDomainName)) + .append(":" + J2EE_TYPE + "=3D").append(context.getJ2eeTyp= e(j2eeType)) + .append("," + J2EE_SERVER + "=3D").append(context.getJ2eeS= erverName(j2eeServerName)) + .append("," + J2EE_APPLICATION + "=3D").append(context.get= J2eeApplicationName(applicationName)) + .append(",").append(context.getJ2eeModuleType(j2eeModuleTy= pe)).append("=3D").append(context.getJ2eeModuleName(j2eeModuleName)) + .append(",*"); + return ObjectName.getInstance(buffer.toString()); + } + public static ObjectName getWebComponentName(String j2eeDomainName, St= ring j2eeServerName, String j2eeApplicationName, String j2eeModuleName, Str= ing j2eeName, String j2eeType, J2eeContext context) throws MalformedObjectN= ameException { - Properties props =3D new Properties(); - props.put(J2EE_TYPE, context.getJ2eeType(j2eeType)); - props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName)); - props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApp= licationName)); - props.put(WEB_MODULE, context.getJ2eeModuleName(j2eeModuleName)); - props.put(J2EE_NAME, context.getJ2eeName(j2eeName)); - return ObjectName.getInstance(context.getJ2eeDomainName(j2eeDomain= Name), props); + return getComponentName(j2eeDomainName, j2eeServerName, j2eeApplic= ationName, WEB_MODULE, j2eeModuleName, j2eeName, j2eeType, context); } =20 - //THIS IS KIND OF WEIRD. Is there a better way??? + //TODO THIS IS KIND OF WEIRD. Is there a better way??? public static ObjectName getWebFilterMappingName(String j2eeDomainName= , String j2eeServerName, String j2eeApplicationName, String j2eeModuleName,= String filterName, String servletName, String urlPattern, J2eeContext cont= ext) throws MalformedObjectNameException { Properties props =3D new Properties(); props.put(J2EE_TYPE, WEB_FILTER_MAPPING); Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/man= agement/impl/Util.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org= /apache/geronimo/j2ee/management/impl/Util.java?view=3Ddiff&r1=3D154435&r2= =3D154436 =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/j2ee/src/java/org/apache/geronimo/j2ee/managemen= t/impl/Util.java (original) +++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/managemen= t/impl/Util.java Sat Feb 19 10:22:02 2005 @@ -24,11 +24,29 @@ import javax.management.ObjectName; =20 import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; =20 /** * @version $Rev$ $Date$ */ public class Util { + + public static String[] getObjectNames(Kernel kernel, J2eeContext conte= xt, String[] j2eeTypes) throws MalformedObjectNameException { + List objectNames =3D new LinkedList(); + for (int i =3D 0; i < j2eeTypes.length; i++) { + String j2eeType =3D j2eeTypes[i]; + ObjectName query =3D NameFactory.getComponentInModuleQuery(nul= l, null, null, null, null, j2eeType, context); + objectNames.addAll(kernel.listGBeans(query)); + } + String[] names =3D new String[objectNames.size()]; + Iterator iterator =3D objectNames.iterator(); + for (int i =3D 0; iterator.hasNext(); i++) { + names[i] =3D iterator.next().toString(); + } + return names; + } + public static String[] getObjectNames(Kernel kernel, Object parentName= , String[] j2eeTypes) throws MalformedObjectNameException { List objectNames =3D new LinkedList(); for (int i =3D 0; i < j2eeTypes.length; i++) { Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo= /jetty/deployment/JettyModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src= /java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=3Dd= iff&r1=3D154435&r2=3D154436 =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/jetty-builder/src/java/org/apache/geronimo/jetty= /deployment/JettyModuleBuilder.java (original) +++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty= /deployment/JettyModuleBuilder.java Sat Feb 19 10:22:02 2005 @@ -323,7 +323,7 @@ =20 public String addGBeans(EARContext earContext, Module module, ClassLoa= der cl) throws DeploymentException { J2eeContext earJ2eeContext =3D earContext.getJ2eeContext(); - J2eeContext moduleJ2eeContext =3D new J2eeContextImpl(earJ2eeConte= xt.getJ2eeDomainName(), earJ2eeContext.getJ2eeServerName(), earJ2eeContext.= getJ2eeApplicationName(), module.getName(), null, null); + J2eeContext moduleJ2eeContext =3D J2eeContextImpl.newModuleContext= FromApplication(earJ2eeContext, NameFactory.WEB_MODULE, module.getName()); WebModule webModule =3D (WebModule) module; =20 WebAppType webApp =3D (WebAppType) webModule.getSpecDD(); @@ -343,7 +343,7 @@ =20 ObjectName webModuleName =3D null; try { - webModuleName =3D NameFactory.getModuleName(null, null, null, = null, NameFactory.WEB_MODULE, moduleJ2eeContext); + webModuleName =3D NameFactory.getModuleName(null, null, null, = null, null, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct module name= ", e); } @@ -354,6 +354,12 @@ =20 GBeanData webModuleData =3D new GBeanData(webModuleName, JettyWebA= ppContext.GBEAN_INFO); try { + webModuleData.setReferencePattern("J2EEServer", earContext.get= ServerObjectName()); + if (!earContext.getJ2EEApplicationName().equals("null")) { + webModuleData.setReferencePattern("J2EEApplication", earCo= ntext.getApplicationObjectName()); + } + + webModuleData.setAttribute("deploymentDescriptor", module.getO= riginalSpecDD()); Set securityRoles =3D collectRoleNames(webApp); if (jettyWebApp.isSetSecurityRealmName()) { String securityRealmName =3D jettyWebApp.getSecurityRealmN= ame().trim(); Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo= /jetty/deployment/JettyModuleBuilderTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src= /test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?view= =3Ddiff&r1=3D154435&r2=3D154436 =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/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/JettyModuleBuilderTest.java (original) +++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty= /deployment/JettyModuleBuilderTest.java Sat Feb 19 10:22:02 2005 @@ -50,6 +50,7 @@ import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl; import org.apache.geronimo.jetty.JettyContainerImpl; import org.apache.geronimo.jetty.connector.HTTPConnector; import org.apache.geronimo.kernel.Kernel; @@ -83,7 +84,7 @@ private ObjectName tcmName; private GBeanData tcm; private ClassLoader cl; - private J2eeContext moduleContext =3D new J2eeContextImpl("jetty.test"= , "test", "null", "jettyTest", null, null); + private J2eeContext moduleContext =3D new J2eeContextImpl("jetty.test"= , "test", "null", NameFactory.WEB_MODULE, "jettyTest", null, null); private JettyModuleBuilder builder; private File basedir =3D new File(System.getProperty("basedir", ".")); private URI parentId =3D URI.create("org/apache/geronimo/Foo"); @@ -97,6 +98,9 @@ Module module =3D builder.createModule(null, jarFile); URI id =3D new URI("war4"); EARContext earContext =3D createEARContext(outputPath, id); + ObjectName serverName =3D earContext.getServerObjectName(); + GBeanData server =3D new GBeanData(serverName, J2EEServerImpl.GBEA= N_INFO); + start(server); builder.initContext(earContext, module, cl); builder.addGBeans(earContext, module, cl); earContext.close(); @@ -109,6 +113,7 @@ if (((Integer) kernel.getAttribute(configData.getName(), "state"))= .intValue() !=3D State.RUNNING_INDEX) { fail("gbean not started: " + configData.getName()); } + assertEquals(new Integer(State.RUNNING_INDEX), kernel.getAttribute= (ObjectName.getInstance("test:J2EEApplication=3Dnull,J2EEServer=3Dbar,j2eeT= ype=3DWebModule,name=3Dwar4"), "state")); Set names =3D kernel.listGBeans(ObjectName.getInstance("test:J2EEA= pplication=3Dnull,J2EEServer=3Dbar,WebModule=3Dwar4,*")); System.out.println("Object names: " + names); for (Iterator iterator =3D names.iterator(); iterator.hasNext();) { @@ -205,8 +210,8 @@ connectorName =3D NameFactory.getWebComponentName(null, null, null= , null, "jettyConnector", "WebResource", moduleContext); // webModuleName =3D NameFactory.getWebComponentName(null, null, nu= ll, null, NameFactory.WEB_MODULE, "WebResource", moduleContext); =20 - tmName =3D NameFactory.getComponentName(null, null, null, null, "T= ransactionManager", NameFactory.JTA_RESOURCE, moduleContext); - tcmName =3D NameFactory.getComponentName(null, null, null, null, "= TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext); + tmName =3D NameFactory.getComponentName(null, null, null, null, nu= ll, "TransactionManager", NameFactory.JTA_RESOURCE, moduleContext); + tcmName =3D NameFactory.getComponentName(null, null, null, null, n= ull, "TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext); ctcName =3D new ObjectName("geronimo.test:role=3DConnectionTrackin= gCoordinator"); =20 kernel =3D new Kernel("foo", new BasicGBeanRegistry()); @@ -246,6 +251,8 @@ start(tcm); ctc =3D new GBeanData(ctcName, ConnectionTrackingCoordinator.GBEAN= _INFO); start(ctc); + + } =20 protected void tearDown() throws Exception { Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J= ettyServletHolder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or= g/apache/geronimo/jetty/JettyServletHolder.java?view=3Ddiff&r1=3D154435&r2= =3D154436 =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/jetty/src/java/org/apache/geronimo/jetty/JettySe= rvletHolder.java (original) +++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettySe= rvletHolder.java Sat Feb 19 10:22:02 2005 @@ -106,7 +106,7 @@ public static final GBeanInfo GBEAN_INFO; =20 static { - GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(JettyServlet= Holder.class, NameFactory.SERVLET); + GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder(JettyServlet= Holder.class, NameFactory.DEFAULT_SERVLET); //todo replace with interface infoBuilder.addInterface(ServletHolder.class); =20 Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/J= ettyWebAppContext.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/or= g/apache/geronimo/jetty/JettyWebAppContext.java?view=3Ddiff&r1=3D154435&r2= =3D154436 =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/jetty/src/java/org/apache/geronimo/jetty/JettyWe= bAppContext.java (original) +++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWe= bAppContext.java Sat Feb 19 10:22:02 2005 @@ -24,10 +24,13 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import java.util.Hashtable; import java.security.PermissionCollection; import java.io.IOException; =20 import javax.naming.Context; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; =20 import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,9 +60,17 @@ import org.apache.geronimo.transaction.context.TransactionContextManager; import org.apache.geronimo.security.deploy.Security; import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.kernel.jmx.JMXUtil; import org.apache.geronimo.naming.reference.KernelAwareReference; import org.apache.geronimo.naming.reference.ClassLoaderAwareReference; import org.apache.geronimo.naming.java.SimpleReadOnlyContext; +import org.apache.geronimo.j2ee.management.J2EEServer; +import org.apache.geronimo.j2ee.management.J2EEApplication; +import org.apache.geronimo.j2ee.management.impl.Util; +import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext; +import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl; =20 /** * Wrapper for a WebApplicationContext that sets up its J2EE environment. @@ -69,6 +80,13 @@ public class JettyWebAppContext extends WebApplicationContext implements G= BeanLifecycle, JettyServletRegistration { private static Log log =3D LogFactory.getLog(JettyWebAppContext.class); =20 + private final Kernel kernel; + //jsr-77 stuff + private final J2eeContext moduleContext; + private final String originalSpecDD; + private final J2EEServer server; + private final J2EEApplication application; + private final ClassLoader webClassLoader; private final JettyContainer jettyContainer; =20 @@ -80,11 +98,17 @@ private final BeforeAfter chain; private final int contextLength; private final SecurityContextBeforeAfter securityInterceptor; + private static final String[] J2EE_TYPES =3D {NameFactory.SERVLET}; =20 /** * @deprecated never use this... this is only here because Jetty WebAp= plicationContext is externalizable */ public JettyWebAppContext() { + kernel =3D null; + server =3D null; + application =3D null; + moduleContext =3D null; + originalSpecDD =3D null; webClassLoader =3D null; jettyContainer =3D null; webAppRoot =3D null; @@ -96,42 +120,46 @@ =20 } =20 - public JettyWebAppContext(URI uri, - Map componentContext, - OnlineUserTransaction userTransaction, - ClassLoader classLoader, - URI[] webClassPath, - boolean contextPriorityClassLoader, - URL configurationBaseUrl, - Set unshareableResources, - Set applicationManagedSecurityResources, - - String displayName, - Map contextParamMap, - Collection listenerClassNames, - boolean distributable, - Map mimeMap, - String[] welcomeFiles, - Map localeEncodingMapping, - Map errorPages, - Authenticator authenticator, - String realmName, - Map tagLibMap, - int sessionTimeoutSeconds, - - String policyContextID, - String securityRealmName, - Security securityConfig, - //from jettyxmlconfig - Set securityRoles, - PermissionCollection uncheckedPermission= s, - PermissionCollection excludedPermissions, - Map rolePermissions, - - TransactionContextManager transactionCon= textManager, - TrackedConnectionAssociator trackedConne= ctionAssociator, - JettyContainer jettyContainer, - Kernel kernel) throws Exception, Illegal= AccessException, InstantiationException, ClassNotFoundException { + public JettyWebAppContext(String objectName, + String originalSpecDD, + URI uri, + Map componentContext, + OnlineUserTransaction userTransaction, + ClassLoader classLoader, + URI[] webClassPath, + boolean contextPriorityClassLoader, + URL configurationBaseUrl, + Set unshareableResources, + Set applicationManagedSecurityResources, + + String displayName, + Map contextParamMap, + Collection listenerClassNames, + boolean distributable, + Map mimeMap, + String[] welcomeFiles, + Map localeEncodingMapping, + Map errorPages, + Authenticator authenticator, + String realmName, + Map tagLibMap, + int sessionTimeoutSeconds, + + String policyContextID, + String securityRealmName, + Security securityConfig, + //from jettyxmlconfig + Set securityRoles, + PermissionCollection uncheckedPermissions, + PermissionCollection excludedPermissions, + Map rolePermissions, + + TransactionContextManager transactionContext= Manager, + TrackedConnectionAssociator trackedConnectio= nAssociator, + JettyContainer jettyContainer, + J2EEServer server, + J2EEApplication application, + Kernel kernel) throws Exception, IllegalAcce= ssException, InstantiationException, ClassNotFoundException { =20 assert uri !=3D null; assert componentContext !=3D null; @@ -143,8 +171,17 @@ assert trackedConnectionAssociator !=3D null; assert jettyContainer !=3D null; =20 + this.kernel =3D kernel; + this.server =3D server; + this.application =3D application; + ObjectName myObjectName =3D JMXUtil.getObjectName(objectName); + verifyObjectName(myObjectName); + moduleContext =3D J2eeContextImpl.newContext(myObjectName, NameFac= tory.WEB_MODULE); + this.jettyContainer =3D jettyContainer; =20 + this.originalSpecDD =3D originalSpecDD; + setConfigurationClassNames(new String[]{}); =20 URI root =3D URI.create(configurationBaseUrl.toString()); @@ -356,7 +393,55 @@ super.setDisplayName(displayName); } =20 + public String getDeploymentDescriptor() { + return originalSpecDD; + } + + public String getServer() { + return server.getObjectName(); + } + + public String getApplication() { + if (application =3D=3D null) { + return null; + } + return application.getObjectName(); + } + + public String[] getJavaVMs() { + return server.getJavaVMs(); + } =20 + public String[] getServlets() throws MalformedObjectNameException { + return Util.getObjectNames(kernel, moduleContext, J2EE_TYPES); + } + + /** + * ObjectName must match this pattern: + *

+ * domain:j2eeType=3DWebModule,name=3DMyName,J2EEServer=3DMyServer,J2E= EApplication=3DMyApplication + */ + private void verifyObjectName(ObjectName objectName) { + if (objectName.isPattern()) { + throw new InvalidObjectNameException("ObjectName can not be a = pattern", objectName); + } + Hashtable keyPropertyList =3D objectName.getKeyPropertyList(); + if (!NameFactory.WEB_MODULE.equals(keyPropertyList.get("j2eeType")= )) { + throw new InvalidObjectNameException("WebModule object name j2= eeType property must be 'WebModule'", objectName); + } + if (!keyPropertyList.containsKey(NameFactory.J2EE_NAME)) { + throw new InvalidObjectNameException("WebModule object must co= ntain a name property", objectName); + } + if (!keyPropertyList.containsKey(NameFactory.J2EE_SERVER)) { + throw new InvalidObjectNameException("WebModule object name mu= st contain a J2EEServer property", objectName); + } + if (!keyPropertyList.containsKey(NameFactory.J2EE_APPLICATION)) { + throw new InvalidObjectNameException("WebModule object name mu= st contain a J2EEApplication property", objectName); + } + if (keyPropertyList.size() !=3D 4) { + throw new InvalidObjectNameException("WebModule object name ca= n only have j2eeType, name, J2EEApplication, and J2EEServer properties", ob= jectName); + } + } public void registerServletHolder(ServletHolder servletHolder, String = servletName, Set servletMappings, Map webRoleRefPermissions) throws Excepti= on { //TODO filters handler.addServletHolder(servletHolder); @@ -389,6 +474,7 @@ =20 static { GBeanInfoBuilder infoBuilder =3D new GBeanInfoBuilder("Jetty WebAp= plication Context", JettyWebAppContext.class); + infoBuilder.addAttribute("deploymentDescriptor", String.class, tru= e); //from jetty's webapp context =20 infoBuilder.addAttribute("displayName", String.class, true); @@ -433,9 +519,19 @@ infoBuilder.addAttribute("excludedPermissions", PermissionCollecti= on.class, true); infoBuilder.addAttribute("rolePermissions", Map.class, true); =20 + infoBuilder.addReference("J2EEServer", J2EEServer.class); + infoBuilder.addReference("J2EEApplication", J2EEApplication.class); + infoBuilder.addAttribute("kernel", Kernel.class, false); + infoBuilder.addAttribute("objectName", String.class, false); + infoBuilder.addAttribute("server", String.class, false); + infoBuilder.addAttribute("application", String.class, false); + infoBuilder.addAttribute("javaVMs", String[].class, false); + infoBuilder.addAttribute("servlets", String[].class, false); =20 infoBuilder.setConstructor(new String[]{ + "objectName", + "deploymentDescriptor", "uri", "componentContext", "userTransaction", @@ -472,6 +568,8 @@ "TrackedConnectionAssociator", "JettyContainer", =20 + "J2EEServer", + "J2EEApplication", "kernel" }); =20 Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/A= bstractWebModuleTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/or= g/apache/geronimo/jetty/AbstractWebModuleTest.java?view=3Ddiff&r1=3D154435&= r2=3D154436 =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/jetty/src/test/org/apache/geronimo/jetty/Abstrac= tWebModuleTest.java (original) +++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/Abstrac= tWebModuleTest.java Sat Feb 19 10:22:02 2005 @@ -67,7 +67,7 @@ private ObjectName tcmName; private GBeanData tcm; private ClassLoader cl; - private J2eeContext moduleContext =3D new J2eeContextImpl("jetty.test"= , "test", "null", "jettyTest", null, null); + private J2eeContext moduleContext =3D new J2eeContextImpl("jetty.test"= , "test", "null", NameFactory.WEB_MODULE, "jettyTest", null, null); private GBeanData loginConfigurationGBean; protected ObjectName loginConfigurationName; private GBeanData securityServiceGBean; @@ -239,10 +239,10 @@ cl =3D this.getClass().getClassLoader(); containerName =3D NameFactory.getWebComponentName(null, null, null= , null, "jettyContainer", "WebResource", moduleContext); connectorName =3D NameFactory.getWebComponentName(null, null, null= , null, "jettyConnector", "WebResource", moduleContext); - webModuleName =3D NameFactory.getWebComponentName(null, null, null= , null, NameFactory.WEB_MODULE, "WebResource", moduleContext); + webModuleName =3D NameFactory.getModuleName(null, null, null, null= , "testModule", moduleContext); =20 - tmName =3D NameFactory.getComponentName(null, null, null, null, "T= ransactionManager", NameFactory.JTA_RESOURCE, moduleContext); - tcmName =3D NameFactory.getComponentName(null, null, null, null, "= TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext); + tmName =3D NameFactory.getComponentName(null, null, null, null, nu= ll, "TransactionManager", NameFactory.JTA_RESOURCE, moduleContext); + tcmName =3D NameFactory.getComponentName(null, null, null, null, n= ull, "TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext); ctcName =3D new ObjectName("geronimo.test:role=3DConnectionTrackin= gCoordinator"); =20 kernel =3D new Kernel("test.kernel"); Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronim= o/naming/deployment/ENCConfigBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/sr= c/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?view=3Dd= iff&r1=3D154435&r2=3D154436 =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/naming-builder/src/java/org/apache/geronimo/nami= ng/deployment/ENCConfigBuilder.java (original) +++ geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami= ng/deployment/ENCConfigBuilder.java Sat Feb 19 10:22:02 2005 @@ -222,13 +222,14 @@ } else { //construct name from components try { - containerId =3D NameFactory.getResourceComponentNameString= (getStringValue(gerResourceRef.getDomain()), + containerId =3D NameFactory.getComponentName(getStringValu= e(gerResourceRef.getDomain()), getStringValue(gerResourceRef.getServer()), getStringValue(gerResourceRef.getApplication()), + NameFactory.JCA_RESOURCE, getStringValue(gerResourceRef.getModule()), getStringValue(gerResourceRef.getName()), gerResourceRef.getType() =3D=3D null ? type : gerR= esourceRef.getType().trim(), - j2eeContext); + j2eeContext).getCanonicalName(); } catch (MalformedObjectNameException e) { throw new DeploymentException("could not construct object = name for resource", e); } @@ -278,14 +279,15 @@ } else { //construct name from components try { - containerId =3D NameFactory.getResourceComponentNameString= (getStringValue(gerResourceEnvRef.getDomain()), + containerId =3D NameFactory.getComponentName(getStringValu= e(gerResourceEnvRef.getDomain()), getStringValue(gerResourceEnvRef.getServer()), getStringValue(gerResourceEnvRef.getApplication()), + NameFactory.JCA_RESOURCE, getStringValue(gerResourceEnvRef.getModule()), getStringValue(gerResourceEnvRef.getName()), NameFactory.JMS_RESOURCE, //gerResourceEnvRef.getType(), - j2eeContext); + j2eeContext).getCanonicalName(); } catch (MalformedObjectNameException e) { throw new DeploymentException("could not construct object = name for jms resource", e); } Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geroni= mo/deployment/service/ServiceConfigBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/s= rc/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?vi= ew=3Ddiff&r1=3D154435&r2=3D154436 =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/service-builder/src/java/org/apache/geronimo/dep= loyment/service/ServiceConfigBuilder.java (original) +++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/dep= loyment/service/ServiceConfigBuilder.java Sat Feb 19 10:22:02 2005 @@ -141,7 +141,7 @@ throw new DeploymentException(e); } =20 - J2eeContext j2eeContext =3D new J2eeContextImpl(context.getDomain(= ), context.getServer(), NameFactory.NULL, configID.toString(), null, null); + J2eeContext j2eeContext =3D new J2eeContextImpl(context.getDomain(= ), context.getServer(), NameFactory.NULL, NameFactory.J2EE_MODULE, configID= .toString(), null, null); DependencyType[] includes =3D configType.getIncludeArray(); addIncludes(context, includes, repository); addDependencies(context, configType.getDependencyArray(), reposito= ry); @@ -228,6 +228,7 @@ String namePart =3D gbean.getNamePart(); try { String j2eeType =3D gBeanInfo.getJ2eeType(); + //todo investigate using the module type from the j2eecont= ext. objectName =3D NameFactory.getComponentName(null, null, nu= ll, null, namePart, j2eeType, j2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Invalid ObjectName: " + nam= ePart, e); Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat= /deployment/TomcatModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/o= rg/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=3Ddiff&r= 1=3D154435&r2=3D154436 =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/tomcat/src/java/org/apache/geronimo/tomcat/deplo= yment/TomcatModuleBuilder.java (original) +++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/deplo= yment/TomcatModuleBuilder.java Sat Feb 19 10:22:02 2005 @@ -81,10 +81,7 @@ =20 public String addGBeans(EARContext earContext, Module module, ClassLoa= der cl) throws DeploymentException { J2eeContext earJ2eeContext =3D earContext.getJ2eeContext(); - J2eeContext moduleJ2eeContext =3D new J2eeContextImpl(earJ2eeConte= xt.getJ2eeDomainName(), - earJ2eeContext= .getJ2eeServerName(), - earJ2eeContext= .getJ2eeApplicationName(), - module.getName= (), null, null); + J2eeContext moduleJ2eeContext =3D J2eeContextImpl.newModuleContext= FromApplication(earJ2eeContext, NameFactory.WEB_MODULE, module.getName()); WebModule webModule =3D (WebModule) module; =20 // construct the webClassLoader @@ -102,7 +99,7 @@ =20 ObjectName webModuleName =3D null; try { - webModuleName =3D NameFactory.getModuleName(null, null, null, = null, NameFactory.WEB_MODULE, moduleJ2eeContext); + webModuleName =3D NameFactory.getModuleName(null, null, null, = null, null, moduleJ2eeContext); } catch (MalformedObjectNameException e) { throw new DeploymentException("Could not construct module name= ", e); } Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat= /AbstractWebModuleTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/o= rg/apache/geronimo/tomcat/AbstractWebModuleTest.java?view=3Ddiff&r1=3D15443= 5&r2=3D154436 =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/tomcat/src/test/org/apache/geronimo/tomcat/Abstr= actWebModuleTest.java (original) +++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/Abstr= actWebModuleTest.java Sat Feb 19 10:22:02 2005 @@ -69,7 +69,7 @@ private ObjectName tcmName; private GBeanData tcm; private ClassLoader cl; - private J2eeContext moduleContext =3D new J2eeContextImpl("tomcat.test= ", "test", "null", "tomcatTest", null, null); + private J2eeContext moduleContext =3D new J2eeContextImpl("tomcat.test= ", "test", "null", NameFactory.WEB_MODULE, "tomcatTest", null, null); private GBeanData securityServiceGBean; protected ObjectName securityServiceName; private ObjectName loginServiceName;