geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Geir Magnusson Jr." <ge...@apache.org>
Subject Re: svn commit: r231369 - in /geronimo/trunk: applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/ modules/assembly/src/plan/ modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ modules/connector-...
Date Fri, 12 Aug 2005 22:03:56 GMT
What's the point?  Decouple the connector from Geronimo?  Seems like  
now you need to update two files if you change something.

Was there some IRC discussion about this?

geir

On Aug 10, 2005, at 9:42 PM, chirino@apache.org wrote:

> Author: chirino
> Date: Wed Aug 10 18:42:16 2005
> New Revision: 231369
>
> URL: http://svn.apache.org/viewcvs?rev=231369&view=rev
> Log:
> http://issues.apache.org/jira/browse/GERONIMO-873
> Decouple the connector module from the kernel module by extracting  
> the GBeanInfo definitions to a new set of GBean classes.
>
>
> Modified:
>     geronimo/trunk/applications/console-standard/src/java/org/ 
> apache/geronimo/console/jmsmanager/handlers/ 
> CreateDestinationHandler.java
>     geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
>     geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
>     geronimo/trunk/modules/connector-builder/src/java/org/apache/ 
> geronimo/connector/deployment/ConnectorModuleBuilder.java
>     geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_0/geronimo-ra.xml
>     geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_5/geronimo-ra.xml
>     geronimo/trunk/modules/connector-builder/src/test-data/data/ 
> external-application-plan.xml
>     geronimo/trunk/modules/connector-builder/src/test/org/apache/ 
> geronimo/connector/deployment/ConnectorModuleBuilderTest.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ActivationSpecWrapper.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/AdminObjectWrapper.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/BootstrapContext.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/JCAResourceImpl.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterImpl.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterModuleImpl.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterWrapper.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/AbstractConnectionManager.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/GenericConnectionManager.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/JCAConnectionFactoryImpl.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/ManagedConnectionFactoryWrapper.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/connectiontracking/ 
> ConnectionTrackingCoordinator.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/security/PasswordCredentialRealm.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/transactionlog/JDBCLog.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/work/GeronimoWorkManager.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/jetty-builder/src/test/org/apache/ 
> geronimo/jetty/deployment/JettyModuleBuilderTest.java
>     geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ 
> AbstractWebModuleTest.java
>     geronimo/trunk/modules/tomcat-builder/src/test/org/apache/ 
> geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
>     geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/ 
> tomcat/AbstractWebModuleTest.java
>
> Modified: geronimo/trunk/applications/console-standard/src/java/org/ 
> apache/geronimo/console/jmsmanager/handlers/ 
> CreateDestinationHandler.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/ 
> console-standard/src/java/org/apache/geronimo/console/jmsmanager/ 
> handlers/CreateDestinationHandler.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/applications/console-standard/src/java/org/ 
> apache/geronimo/console/jmsmanager/handlers/ 
> CreateDestinationHandler.java (original)
> +++ geronimo/trunk/applications/console-standard/src/java/org/ 
> apache/geronimo/console/jmsmanager/handlers/ 
> CreateDestinationHandler.java Wed Aug 10 18:42:16 2005
> @@ -34,6 +34,7 @@
>  import org.apache.commons.logging.Log;
>  import org.apache.commons.logging.LogFactory;
>  import org.apache.geronimo.connector.AdminObjectWrapper;
> +import org.apache.geronimo.connector.AdminObjectWrapperGBean;
>  import org.apache.geronimo.console.core.jms.TopicBrowserGBean;
>  import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
>  import org.apache.geronimo.gbean.DynamicGAttributeInfo;
> @@ -61,12 +62,12 @@
>
>      static {
>          GBeanInfoBuilder queueInfoBuilder = new GBeanInfoBuilder(
> -                AdminObjectWrapper.class,  
> AdminObjectWrapper.GBEAN_INFO);
> +                AdminObjectWrapper.class,  
> AdminObjectWrapperGBean.GBEAN_INFO);
>          queueInfoBuilder.addAttribute(new DynamicGAttributeInfo 
> ("PhysicalName",
>                  String.class.getName(), true, true, true));
>          QUEUE_INFO = queueInfoBuilder.getBeanInfo();
>          GBeanInfoBuilder topicInfoBuilder = new GBeanInfoBuilder(
> -                AdminObjectWrapper.class,  
> AdminObjectWrapper.GBEAN_INFO);
> +                AdminObjectWrapper.class,  
> AdminObjectWrapperGBean.GBEAN_INFO);
>          topicInfoBuilder.addAttribute(new DynamicGAttributeInfo 
> ("PhysicalName",
>                  String.class.getName(), true, true, true));
>          TOPIC_INFO = topicInfoBuilder.getBeanInfo();
>
> Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client- 
> plan.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/ 
> src/plan/j2ee-client-plan.xml?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml  
> (original)
> +++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml  
> Wed Aug 10 18:42:16 2005
> @@ -110,10 +110,10 @@
>          <attribute name="poolName">DefaultThreadPool</attribute>
>      </gbean>
>
> -    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinator">
> +    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinatorGBean">
>      </gbean>
>
> -    <gbean name="DefaultWorkManager"   
> class="org.apache.geronimo.connector.work.GeronimoWorkManager">
> +    <gbean name="DefaultWorkManager"   
> class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
>          <attribute name="syncMaximumPoolSize">10</attribute>
>          <attribute name="startMaximumPoolSize">10</attribute>
>          <attribute name="scheduledMaximumPoolSize">10</attribute>
>
> Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server- 
> plan.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/ 
> src/plan/j2ee-server-plan.xml?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml  
> (original)
> +++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml  
> Wed Aug 10 18:42:16 2005
> @@ -184,10 +184,10 @@
>          <attribute name="poolName">DefaultThreadPool</attribute>
>      </gbean>
>
> -    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinator">
> +    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinatorGBean">
>      </gbean>
>
> -    <gbean name="DefaultWorkManager"  
> class="org.apache.geronimo.connector.work.GeronimoWorkManager">
> +    <gbean name="DefaultWorkManager"  
> class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
>          <attribute name="syncMaximumPoolSize">10</attribute>
>          <attribute name="startMaximumPoolSize">10</attribute>
>          <attribute name="scheduledMaximumPoolSize">10</attribute>
>
> Modified: geronimo/trunk/modules/connector-builder/src/java/org/ 
> apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector- 
> builder/src/java/org/apache/geronimo/connector/deployment/ 
> ConnectorModuleBuilder.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector-builder/src/java/org/apache/ 
> geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
> +++ geronimo/trunk/modules/connector-builder/src/java/org/apache/ 
> geronimo/connector/deployment/ConnectorModuleBuilder.java Wed Aug  
> 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2004 The Apache Software Foundation
> + * Copyright 2004-2005 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.
> @@ -32,6 +32,7 @@
>  import java.util.Set;
>  import java.util.jar.JarFile;
>  import java.util.zip.ZipEntry;
> +
>  import javax.management.MalformedObjectNameException;
>  import javax.management.ObjectName;
>  import javax.naming.Reference;
> @@ -39,13 +40,17 @@
>  import org.apache.geronimo.common.DeploymentException;
>  import org.apache.geronimo.common.propertyeditor.PropertyEditors;
>  import org.apache.geronimo.connector.ActivationSpecWrapper;
> +import org.apache.geronimo.connector.ActivationSpecWrapperGBean;
>  import org.apache.geronimo.connector.AdminObjectWrapper;
> -import org.apache.geronimo.connector.ResourceAdapterModuleImpl;
> +import org.apache.geronimo.connector.AdminObjectWrapperGBean;
> +import org.apache.geronimo.connector.JCAResourceImplGBean;
> +import org.apache.geronimo.connector.ResourceAdapterImplGBean;
> +import org.apache.geronimo.connector.ResourceAdapterModuleImplGBean;
>  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.ResourceAdapterWrapperGBean;
> +import  
> org.apache.geronimo.connector.outbound.JCAConnectionFactoryImplGBean;
>  import  
> org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper 
> ;
> +import  
> org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper 
> GBean;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTr 
> ansactions;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTrans 
> actions;
> @@ -55,7 +60,7 @@
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.Transac 
> tionLog;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.Transac 
> tionSupport;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATrans 
> actions;
> -import  
> org.apache.geronimo.connector.outbound.security.PasswordCredentialReal 
> m;
> +import  
> org.apache.geronimo.connector.outbound.security.PasswordCredentialReal 
> mGBean;
>  import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
>  import org.apache.geronimo.deployment.util.DeploymentUtil;
>  import org.apache.geronimo.deployment.xbeans.DependencyType;
> @@ -74,8 +79,8 @@
>  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.GBeanNotFoundException;
> +import org.apache.geronimo.kernel.Kernel;
>  import org.apache.geronimo.kernel.repository.Repository;
>  import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
>  import org.apache.geronimo.naming.reference.ResourceReference;
> @@ -277,7 +282,7 @@
>          } catch (MalformedObjectNameException e) {
>              throw new DeploymentException("Could not construct  
> module name", e);
>          }
> -        GBeanData resourceAdapterModuleData = new GBeanData 
> (resourceAdapterModuleName, ResourceAdapterModuleImpl.GBEAN_INFO);
> +        GBeanData resourceAdapterModuleData = new GBeanData 
> (resourceAdapterModuleName,  
> ResourceAdapterModuleImplGBean.GBEAN_INFO);
>
>          // initalize the GBean
>          resourceAdapterModuleData.setReferencePattern 
> (NameFactory.J2EE_SERVER, earContext.getServerObjectName());
> @@ -290,7 +295,7 @@
>          ResourceadapterType resourceadapter = ((ConnectorType)  
> specDD).getResourceadapter();
>          // Create the resource adapter gbean
>          if (resourceadapter.isSetResourceadapterClass()) {
> -            GBeanInfoBuilder resourceAdapterInfoBuilder = new  
> GBeanInfoBuilder(ResourceAdapterWrapper.class,  
> ResourceAdapterWrapper.GBEAN_INFO);
> +            GBeanInfoBuilder resourceAdapterInfoBuilder = new  
> GBeanInfoBuilder(ResourceAdapterWrapper.class,  
> ResourceAdapterWrapperGBean.GBEAN_INFO);
>              GBeanData resourceAdapterGBeanData = setUpDynamicGBean 
> (resourceAdapterInfoBuilder, resourceadapter.getConfigPropertyArray 
> (), cl);
>
>              resourceAdapterGBeanData.setAttribute 
> ("resourceAdapterClass", resourceadapter.getResourceadapterClass 
> ().getStringValue().trim());
> @@ -401,7 +406,7 @@
>          earContext.addGBean(resourceAdapterModuleData);
>
>          //construct the bogus resource adapter and jca resource  
> placeholders
> -        GBeanData resourceAdapterData = new GBeanData 
> (resourceAdapterjsr77Name, ResourceAdapterImpl.GBEAN_INFO);
> +        GBeanData resourceAdapterData = new GBeanData 
> (resourceAdapterjsr77Name, ResourceAdapterImplGBean.GBEAN_INFO);
>          ObjectName jcaResourcejsr77Name = null;
>          try {
>              //TODO double check the module type is correct.
> @@ -412,7 +417,7 @@
>          resourceAdapterData.setAttribute("JCAResource",  
> jcaResourcejsr77Name.getCanonicalName());
>          earContext.addGBean(resourceAdapterData);
>
> -        GBeanData jcaResourceData = new GBeanData 
> (jcaResourcejsr77Name, JCAResourceImpl.GBEAN_INFO);
> +        GBeanData jcaResourceData = new GBeanData 
> (jcaResourcejsr77Name, JCAResourceImplGBean.GBEAN_INFO);
>          earContext.addGBean(jcaResourceData);
>
>          GerConnectorType geronimoConnector = (GerConnectorType)  
> module.getVendorDD();
> @@ -516,7 +521,7 @@
>              String messageListenerInterface =  
> messagelistenerType.getMessagelistenerType().getStringValue().trim();
>              ActivationspecType activationspec =  
> messagelistenerType.getActivationspec();
>              String activationSpecClassName =  
> activationspec.getActivationspecClass().getStringValue().trim();
> -            GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (ActivationSpecWrapper.class, ActivationSpecWrapper.GBEAN_INFO);
> +            GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (ActivationSpecWrapper.class, ActivationSpecWrapperGBean.GBEAN_INFO);
>
>              //add all javabean properties that have both getter  
> and setter.  Ignore the "required" flag from the dd.
>              Map getters = new HashMap();
> @@ -565,7 +570,7 @@
>          for (int i = 0; i < connectionDefinitionArray.length; i++) {
>              ConnectionDefinitionType connectionDefinition =  
> connectionDefinitionArray[i];
>
> -            GBeanInfoBuilder managedConnectionFactoryInfoBuilder =  
> new GBeanInfoBuilder(ManagedConnectionFactoryWrapper.class,  
> ManagedConnectionFactoryWrapper.GBEAN_INFO);
> +            GBeanInfoBuilder managedConnectionFactoryInfoBuilder =  
> new GBeanInfoBuilder(ManagedConnectionFactoryWrapper.class,  
> ManagedConnectionFactoryWrapperGBean.GBEAN_INFO);
>              GBeanData managedConnectionFactoryGBeanData =  
> setUpDynamicGBean(managedConnectionFactoryInfoBuilder,  
> connectionDefinition.getConfigPropertyArray(), cl);
>
>              // set the standard properties
> @@ -585,7 +590,7 @@
>          for (int i = 0; i < adminobjectArray.length; i++) {
>              AdminobjectType adminObject = adminobjectArray[i];
>
> -            GBeanInfoBuilder adminObjectInfoBuilder = new  
> GBeanInfoBuilder(AdminObjectWrapper.class,  
> AdminObjectWrapper.GBEAN_INFO);
> +            GBeanInfoBuilder adminObjectInfoBuilder = new  
> GBeanInfoBuilder(AdminObjectWrapper.class,  
> AdminObjectWrapperGBean.GBEAN_INFO);
>              GBeanData adminObjectGBeanData = setUpDynamicGBean 
> (adminObjectInfoBuilder, adminObject.getConfigPropertyArray(), cl);
>
>              // set the standard properties
> @@ -674,7 +679,7 @@
>          // create the data holder for our connection manager
>          GBeanInfo gbeanInfo;
>          try {
> -            gbeanInfo = GBeanInfo.getGBeanInfo 
> ("org.apache.geronimo.connector.outbound.GenericConnectionManager",  
> cl);
> +            gbeanInfo = GBeanInfo.getGBeanInfo 
> ("org.apache.geronimo.connector.outbound.GenericConnectionManagerGBean 
> ", cl);
>          } catch (InvalidConfigurationException e) {
>              throw new DeploymentException("Unable to create  
> GMBean", e);
>          }
> @@ -770,7 +775,7 @@
>               
> managedConnectionFactoryInstanceGBeanData.setReferencePattern 
> ("ConnectionManagerContainer", connectionManagerObjectName);
>              if (connectiondefinitionInstance.getCredentialInterface 
> () != null && GerCredentialInterfaceType.Enum.forString 
> ("javax.resource.spi.security.PasswordCredential").equals 
> (connectiondefinitionInstance.getCredentialInterface())) {
>                  ObjectName realmObjectName = ObjectName.getInstance 
> (BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME +  
> connectiondefinitionInstance.getName());
> -                GBeanData realmGBean = new GBeanData 
> (realmObjectName, PasswordCredentialRealm.getGBeanInfo());
> +                GBeanData realmGBean = new GBeanData 
> (realmObjectName, PasswordCredentialRealmGBean.getGBeanInfo());
>                  realmGBean.setAttribute("realmName",  
> BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME +  
> connectiondefinitionInstance.getName());
>                  earContext.addGBean(realmGBean);
>                   
> managedConnectionFactoryInstanceGBeanData.setReferencePattern 
> ("ManagedConnectionFactoryListener", realmObjectName);
> @@ -806,7 +811,7 @@
>          } catch (MalformedObjectNameException e) {
>              throw new DeploymentException("Could not construct  
> connection factory object name", e);
>          }
> -        GBeanData connectionFactoryGBeanData = new GBeanData 
> (connectionFactoryObjectName, JCAConnectionFactoryImpl.GBEAN_INFO);
> +        GBeanData connectionFactoryGBeanData = new GBeanData 
> (connectionFactoryObjectName,  
> JCAConnectionFactoryImplGBean.GBEAN_INFO);
>          connectionFactoryGBeanData.setReferencePattern 
> ("J2EEServer", earContext.getServerObjectName());
>          connectionFactoryGBeanData.setAttribute 
> ("managedConnectionFactory",  
> managedConnectionFactoryObjectName.getCanonicalName());
>
>
> Modified: geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_0/geronimo-ra.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector- 
> builder/src/test-data/connector_1_0/geronimo-ra.xml? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_0/geronimo-ra.xml (original)
> +++ geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_0/geronimo-ra.xml Wed Aug 10 18:42:16 2005
> @@ -79,7 +79,7 @@
>      </resourceadapter>
>
>      <!--normally this is in the j2ee-server-plan.xml.  It is  
> included here so the gbeans can start in unit tests-->
> -    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinator">
> +    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinatorGBean">
>      </gbean>
>
>      <gbean name="TargetRealm"  
> class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPassw 
> ordRealmBridge">
>
> Modified: geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_5/geronimo-ra.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector- 
> builder/src/test-data/connector_1_5/geronimo-ra.xml? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_5/geronimo-ra.xml (original)
> +++ geronimo/trunk/modules/connector-builder/src/test-data/ 
> connector_1_5/geronimo-ra.xml Wed Aug 10 18:42:16 2005
> @@ -104,10 +104,10 @@
>      </adminobject>
>
>      <!--normally this is in the j2ee-server-plan.xml.  It is  
> included here so the gbeans can start in unit tests-->
> -    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinator">
> +    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinatorGBean">
>      </gbean>
>
> -    <gbean name="DefaultWorkManager"  
> class="org.apache.geronimo.connector.work.GeronimoWorkManager">
> +    <gbean name="DefaultWorkManager"  
> class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
>          <attribute name="syncMaximumPoolSize">10</attribute>
>          <attribute name="startMaximumPoolSize">10</attribute>
>          <attribute name="scheduledMaximumPoolSize">10</attribute>
>
> Modified: geronimo/trunk/modules/connector-builder/src/test-data/ 
> data/external-application-plan.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector- 
> builder/src/test-data/data/external-application-plan.xml? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector-builder/src/test-data/data/ 
> external-application-plan.xml (original)
> +++ geronimo/trunk/modules/connector-builder/src/test-data/data/ 
> external-application-plan.xml Wed Aug 10 18:42:16 2005
> @@ -173,10 +173,10 @@
>      </module>
>
>      <!--normally this is in the j2ee-server-plan.xml.  It is  
> included here so the gbeans can start in unit tests-->
> -    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinator">
> +    <gbean name="ConnectionTracker"  
> class="org.apache.geronimo.connector.outbound.connectiontracking.Conne 
> ctionTrackingCoordinatorGBean">
>      </gbean>
>
> -    <gbean name="DefaultWorkManager"  
> class="org.apache.geronimo.connector.work.GeronimoWorkManager">
> +    <gbean name="DefaultWorkManager"  
> class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
>          <attribute name="syncMaximumPoolSize">10</attribute>
>          <attribute name="startMaximumPoolSize">10</attribute>
>          <attribute name="scheduledMaximumPoolSize">10</attribute>
>
> Modified: geronimo/trunk/modules/connector-builder/src/test/org/ 
> apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector- 
> builder/src/test/org/apache/geronimo/connector/deployment/ 
> ConnectorModuleBuilderTest.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector-builder/src/test/org/apache/ 
> geronimo/connector/deployment/ConnectorModuleBuilderTest.java  
> (original)
> +++ geronimo/trunk/modules/connector-builder/src/test/org/apache/ 
> geronimo/connector/deployment/ConnectorModuleBuilderTest.java Wed  
> Aug 10 18:42:16 2005
> @@ -42,6 +42,7 @@
>  import junit.framework.TestCase;
>  import org.apache.geronimo.common.DeploymentException;
>  import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinator;
> +import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinatorGBean;
>  import org.apache.geronimo.deployment.DeploymentContext;
>  import org.apache.geronimo.deployment.util.DeploymentUtil;
>  import org.apache.geronimo.gbean.GBeanData;
> @@ -308,7 +309,7 @@
>          J2eeContext j2eeContext = new J2eeContextImpl("test",  
> "bar", "null", "JCAResource", "org/apache/geronimo/j2ee/deployment/ 
> test", null, null);
>          String resourceAdapterName = "testRA";
>          //N.B. short version of getComponentName
> -        ObjectName connectionTrackerName =  
> NameFactory.getComponentName(null, null, null, null,  
> "ConnectionTracker",  
> ConnectionTrackingCoordinator.GBEAN_INFO.getJ2eeType(), j2eeContext);
> +        ObjectName connectionTrackerName =  
> NameFactory.getComponentName(null, null, null, null,  
> "ConnectionTracker",  
> ConnectionTrackingCoordinatorGBean.GBEAN_INFO.getJ2eeType(),  
> j2eeContext);
>                  //new ObjectName 
> ("test:J2EEServer=bar,J2EEModule=org/apache/geronimo/j2ee/ 
> deployment/test,service=ConnectionTracker");
>
>          Kernel kernel = KernelFactory.newInstance().createKernel 
> ("foo");
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/ActivationSpecWrapper.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ActivationSpecWrapper.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ActivationSpecWrapper.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2004 The Apache Software Foundation
> + * Copyright 2004-2005 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.
> @@ -26,12 +26,9 @@
>
>  import org.apache.geronimo.gbean.DynamicGBean;
>  import org.apache.geronimo.gbean.DynamicGBeanDelegate;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.transaction.manager.NamedXAResource;
>  import org.apache.geronimo.transaction.manager.ResourceManager;
>  import  
> org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * Wrapper for ActivationSpec instances.
> @@ -170,35 +167,5 @@
>      public void returnResource(NamedXAResource xaResource) {
>          //do nothing, no way to return anything.
>      }
> -
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (ActivationSpecWrapper.class, NameFactory.JCA_ACTIVATION_SPEC);
> -        infoBuilder.addAttribute("activationSpecClass",  
> String.class, true);
> -        infoBuilder.addAttribute("containerId", String.class, true);
> -        infoBuilder.addAttribute("classLoader", ClassLoader.class,  
> false);
> -
> -        infoBuilder.addReference("ResourceAdapterWrapper",  
> ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
> -
> -        infoBuilder.addOperation("activate", new Class[] 
> {MessageEndpointFactory.class});
> -        infoBuilder.addOperation("deactivate", new Class[] 
> {MessageEndpointFactory.class});
> -
> -        infoBuilder.addInterface(ResourceManager.class);
> -
> -        infoBuilder.setConstructor(new String[]{
> -            "activationSpecClass",
> -            "containerId",
> -            "ResourceAdapterWrapper",
> -            "classLoader"});
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
> -
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/AdminObjectWrapper.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/AdminObjectWrapper.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/AdminObjectWrapper.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/AdminObjectWrapper.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -19,9 +19,6 @@
>
>  import org.apache.geronimo.gbean.DynamicGBean;
>  import org.apache.geronimo.gbean.DynamicGBeanDelegate;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * Wrapper around AdminObject that exposes its config-properties  
> as GBeanAttributes and
> @@ -122,27 +119,5 @@
>          return null;
>      }
>
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (AdminObjectWrapper.class, NameFactory.JCA_ADMIN_OBJECT);
> -        infoBuilder.addAttribute("adminObjectInterface",  
> String.class, true);
> -        infoBuilder.addAttribute("adminObjectClass", String.class,  
> true);
> -        infoBuilder.addAttribute("classLoader", ClassLoader.class,  
> false);
> -
> -        infoBuilder.addOperation("$getResource");
> -
> -        infoBuilder.setConstructor(new String[]{
> -            "adminObjectInterface",
> -            "adminObjectClass",
> -            "classLoader"
> -        });
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/BootstrapContext.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/BootstrapContext.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/BootstrapContext.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/BootstrapContext.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -23,9 +23,6 @@
>  import javax.resource.spi.XATerminator;
>  import javax.resource.spi.work.WorkManager;
>
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> -
>  /**
>   * GBean BootstrapContext implementation that refers to externally  
> configured WorkManager
>   * and XATerminator gbeans.
> @@ -74,29 +71,6 @@
>       */
>      public Timer createTimer() throws UnavailableException {
>          return new Timer();
> -    }
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (BootstrapContext.class);
> -          //adding interface does not work, creates attributes for  
> references???
> -//        infoFactory.addInterface 
> (javax.resource.spi.BootstrapContext.class);
> -
> -        infoFactory.addOperation("createTimer");
> -        infoFactory.addOperation("getWorkManager");
> -        infoFactory.addOperation("getXATerminator");
> -
> -        infoFactory.addReference("WorkManager", WorkManager.class);
> -        infoFactory.addReference("XATerminator", XATerminator.class);
> -
> -        infoFactory.setConstructor(new String[]{"WorkManager",  
> "XATerminator"});
> -
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
>      }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/JCAResourceImpl.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/JCAResourceImpl.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/JCAResourceImpl.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/JCAResourceImpl.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -16,17 +16,15 @@
>   */
>  package org.apache.geronimo.connector;
>
> -import javax.management.ObjectName;
>  import javax.management.MalformedObjectNameException;
> +import javax.management.ObjectName;
>
>  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.j2eeobjectnames.NameFactory;
>  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:  $
> @@ -52,28 +50,5 @@
>      public String[] getResourceAdapterInstances() throws  
> MalformedObjectNameException {
>          return Util.getObjectNames(kernel, moduleContext,  
> RESOURCE_ADAPTER_INSTANCE_TYPES);
>      }
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (JCAResourceImpl.class, NameFactory.JCA_RESOURCE);
> -        infoBuilder.addAttribute("objectName", String.class, false);
> -        infoBuilder.addAttribute("kernel", Kernel.class, false);
> -
> -        infoBuilder.addAttribute("connectionFactories", String 
> [].class, false);
> -        infoBuilder.addAttribute("resourceAdapterInstances", String 
> [].class, false);
> -
> -        infoBuilder.setConstructor(new String[]{
> -            "objectName",
> -            "kernel"
> -        });
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
> -
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/ResourceAdapterImpl.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/ResourceAdapterImpl.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterImpl.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterImpl.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -18,10 +18,6 @@
>
>  import javax.management.MalformedObjectNameException;
>
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
> -
>  /**
>   * @version $Rev:  $ $Date:  $
>   */
> @@ -36,23 +32,5 @@
>          return jcaResource;
>      }
>
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (ResourceAdapterImpl.class, NameFactory.RESOURCE_ADAPTER);
> -        infoBuilder.addAttribute("objectName", String.class, false);
> -        infoBuilder.addAttribute("JCAResource", String.class, true);
> -
> -        infoBuilder.setConstructor(new String[]{
> -            "objectName",
> -            "JCAResource"
> -        });
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/ResourceAdapterModuleImpl.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/ 
> ResourceAdapterModuleImpl.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- 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 Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2004 The Apache Software Foundation
> + * Copyright 2005 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.
> @@ -18,13 +18,10 @@
>
>  import java.util.Hashtable;
>  import java.util.Map;
> -import javax.management.MalformedObjectNameException;
> +
>  import javax.management.ObjectName;
>
>  import org.apache.geronimo.gbean.GBeanData;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>  import org.apache.geronimo.j2ee.management.J2EEApplication;
>  import org.apache.geronimo.j2ee.management.J2EEServer;
>  import org.apache.geronimo.j2ee.management.ResourceAdapterModule;
> @@ -151,46 +148,5 @@
>          if (keyPropertyList.size() != 4) {
>              throw new InvalidObjectNameException 
> ("ResourceAdapterModule object name can only have j2eeType, name,  
> J2EEApplication, and J2EEServer properties", objectName);
>          }
> -    }
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (ResourceAdapterModuleImpl.class,  
> NameFactory.RESOURCE_ADAPTER_MODULE);
> -        infoBuilder.addReference("J2EEServer", J2EEServer.class,  
> null);
> -        infoBuilder.addReference("J2EEApplication",  
> J2EEApplication.class, null);
> -
> -        infoBuilder.addAttribute("deploymentDescriptor",  
> String.class, true);
> -
> -        infoBuilder.addAttribute("resourceAdapter", String.class,  
> true);
> -        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("resourceAdapters", String 
> [].class, false);
> -
> -        infoBuilder.addAttribute("resourceAdapterGBeanData",  
> GBeanData.class, true);
> -        infoBuilder.addAttribute("activationSpecInfoMap",  
> Map.class, true);
> -        infoBuilder.addAttribute("adminObjectInfoMap", Map.class,  
> true);
> -        infoBuilder.addAttribute 
> ("managedConnectionFactoryInfoMap", Map.class, true);
> -        infoBuilder.addInterface(ResourceAdapterModule.class);
> -
> -        infoBuilder.setConstructor(new String[]{
> -            "resourceAdapter",
> -            "objectName",
> -            "J2EEServer",
> -            "J2EEApplication",
> -            "deploymentDescriptor",
> -            "resourceAdapterGBeanData",
> -            "activationSpecInfoMap",
> -            "adminObjectInfoMap",
> -            "managedConnectionFactoryInfoMap"
> -        });
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
>      }
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/ResourceAdapterWrapper.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterWrapper.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/ResourceAdapterWrapper.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -29,10 +29,7 @@
>  import org.apache.geronimo.connector.work.GeronimoWorkManager;
>  import org.apache.geronimo.gbean.DynamicGBean;
>  import org.apache.geronimo.gbean.DynamicGBeanDelegate;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.gbean.GBeanLifecycle;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * Dynamic GBean wrapper around a ResourceAdapter object, exposing  
> the config-properties as
> @@ -42,8 +39,6 @@
>   */
>  public class ResourceAdapterWrapper implements GBeanLifecycle,  
> DynamicGBean, ResourceAdapter {
>
> -    public static final GBeanInfo GBEAN_INFO;
> -
>      private final String resourceAdapterClass;
>
>      private final BootstrapContext bootstrapContext;
> @@ -127,24 +122,5 @@
>          return null;
>      }
>
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
> -        infoBuilder.addAttribute("resourceAdapterClass",  
> String.class, true);
> -        infoBuilder.addAttribute("classLoader", ClassLoader.class,  
> false);
> -
> -        infoBuilder.addReference("WorkManager",  
> GeronimoWorkManager.class, NameFactory.JCA_WORK_MANAGER);
> -
> -        infoBuilder.addOperation 
> ("registerResourceAdapterAssociation", new Class[] 
> {ResourceAdapterAssociation.class});
> -
> -        infoBuilder.addInterface(ResourceAdapter.class);
> -
> -        infoBuilder.setConstructor(new String[] 
> {"resourceAdapterClass", "WorkManager", "classLoader"});
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/AbstractConnectionManager.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/ 
> AbstractConnectionManager.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/AbstractConnectionManager.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/AbstractConnectionManager.java Wed Aug 10  
> 18:42:16 2005
> @@ -23,11 +23,8 @@
>  import javax.resource.spi.LazyAssociatableConnectionManager;
>  import javax.resource.spi.ManagedConnectionFactory;
>
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> -import org.apache.geronimo.transaction.manager.NamedXAResource;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.Pooling 
> Support;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
> +import org.apache.geronimo.transaction.manager.NamedXAResource;
>
>  /**
>   * @version $Rev$ $Date$
> @@ -158,19 +155,6 @@
>          ConnectionInterceptor getRecoveryStack();
>
>          PoolingSupport getPoolingAttributes();
> -    }
> -
> -    protected static final GBeanInfo GBEAN_INFO;
> -
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (AbstractConnectionManager.class, NameFactory.JCA_CONNECTION_MANAGER);
> -
> -        infoBuilder.addInterface(ConnectionManagerContainer.class);
> -        //these attributes are persisted via the pooling state.
> -        infoBuilder.addInterface(PoolingAttributes.class);
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
>      }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/GenericConnectionManager.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/ 
> GenericConnectionManager.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/GenericConnectionManager.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/GenericConnectionManager.java Wed Aug 10  
> 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -21,11 +21,8 @@
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.Pooling 
> Support;
>  import  
> org.apache.geronimo.connector.outbound.connectionmanagerconfig.Transac 
> tionSupport;
>  import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> acker;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.security.bridge.RealmBridge;
>  import  
> org.apache.geronimo.transaction.context.TransactionContextManager;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * GenericConnectionManager sets up a connection manager stack  
> according to the
> @@ -126,39 +123,6 @@
>          public PoolingSupport getPoolingAttributes() {
>              return poolingSupport;
>          }
> -    }
> -
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder 
> (GenericConnectionManager.class,  
> AbstractConnectionManager.GBEAN_INFO);
> -
> -        infoBuilder.addAttribute("transactionSupport",  
> TransactionSupport.class, true);
> -        infoBuilder.addAttribute("pooling", PoolingSupport.class,  
> true);
> -
> -        infoBuilder.addAttribute("objectName", String.class, false);
> -        infoBuilder.addAttribute("classLoader", ClassLoader.class,  
> false);
> -
> -        infoBuilder.addReference("ConnectionTracker",  
> ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
> -        infoBuilder.addReference("RealmBridge", RealmBridge.class,  
> NameFactory.GERONIMO_SERVICE);
> -        infoBuilder.addReference("TransactionContextManager",  
> TransactionContextManager.class, NameFactory.JTA_RESOURCE);
> -
> -        infoBuilder.setConstructor(new String[]{
> -            "transactionSupport",
> -            "pooling",
> -            "RealmBridge",
> -            "ConnectionTracker",
> -            "TransactionContextManager",
> -            "objectName",
> -            "classLoader"
> -        });
> -
> -        GBEAN_INFO = infoBuilder.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GenericConnectionManager.GBEAN_INFO;
>      }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/JCAConnectionFactoryImpl.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/ 
> JCAConnectionFactoryImpl.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- 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 Wed Aug 10  
> 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2004 The Apache Software Foundation
> + * Copyright 2005 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.
> @@ -17,13 +17,11 @@
>  package org.apache.geronimo.connector.outbound;
>
>  import java.util.Hashtable;
> +
>  import javax.management.ObjectName;
>
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.j2ee.management.J2EEServer;
>  import  
> org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>  import org.apache.geronimo.kernel.jmx.JMXUtil;
>
>  /**
> @@ -76,22 +74,4 @@
>  //        }
>      }
>
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (JCAConnectionFactoryImpl.class, NameFactory.JCA_CONNECTION_FACTORY);
> -        infoFactory.addReference("J2EEServer", J2EEServer.class);
> -
> -        infoFactory.addAttribute("objectName", String.class, false);
> -//        infoFactory.addAttribute("server", String.class, false);
> -        infoFactory.addAttribute("managedConnectionFactory",  
> String.class, true);
> -
> -        infoFactory.setConstructor(new String[]{"objectName",  
> "J2EEServer", "managedConnectionFactory"});
> -
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/ 
> ManagedConnectionFactoryWrapper.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/ManagedConnectionFactoryWrapper.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/ManagedConnectionFactoryWrapper.java Wed Aug 10  
> 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -26,6 +26,7 @@
>
>  import net.sf.cglib.proxy.Callback;
>  import net.sf.cglib.proxy.Enhancer;
> +
>  import org.apache.commons.logging.Log;
>  import org.apache.commons.logging.LogFactory;
>  import org.apache.geronimo.connector.ConnectorMethodInterceptor;
> @@ -33,14 +34,11 @@
>  import  
> org.apache.geronimo.connector.outbound.security.ManagedConnectionFacto 
> ryListener;
>  import org.apache.geronimo.gbean.DynamicGBean;
>  import org.apache.geronimo.gbean.DynamicGBeanDelegate;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.gbean.GBeanLifecycle;
>  import org.apache.geronimo.kernel.Kernel;
>  import org.apache.geronimo.naming.geronimo.GeronimoContextManager;
>  import org.apache.geronimo.transaction.manager.NamedXAResource;
>  import org.apache.geronimo.transaction.manager.ResourceManager;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * @version $Rev$ $Date$
> @@ -304,52 +302,4 @@
>      public void returnResource(NamedXAResource xaResource) {
>          ((ConnectionManagerContainer.ReturnableXAResource)  
> xaResource).returnConnection();
>      }
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (ManagedConnectionFactoryWrapper.class,  
> NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
> -
> -        infoFactory.addAttribute("managedConnectionFactoryClass",  
> String.class, true);
> -        infoFactory.addAttribute("connectionFactoryInterface",  
> String.class, true);
> -        infoFactory.addAttribute("implementedInterfaces", String 
> [].class, true);
> -        infoFactory.addAttribute("connectionFactoryImplClass",  
> String.class, true);
> -        infoFactory.addAttribute("connectionInterface",  
> String.class, true);
> -        infoFactory.addAttribute("connectionImplClass",  
> String.class, true);
> -        infoFactory.addAttribute("globalJNDIName", String.class,  
> true);
> -        infoFactory.addAttribute("kernel", Kernel.class, false);
> -        infoFactory.addAttribute("objectName", String.class, false);
> -        infoFactory.addAttribute("classLoader", ClassLoader.class,  
> false);
> -
> -        infoFactory.addOperation("$getResource");
> -        infoFactory.addOperation("$getConnectionFactory");
> -
> -        infoFactory.addInterface(ResourceManager.class);
> -
> -        infoFactory.addReference("ResourceAdapterWrapper",  
> ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
> -        infoFactory.addReference("ConnectionManagerContainer",  
> ConnectionManagerContainer.class, NameFactory.JCA_CONNECTION_MANAGER);
> -        infoFactory.addReference 
> ("ManagedConnectionFactoryListener",  
> ManagedConnectionFactoryListener.class, NameFactory.SECURITY_REALM);
> -
> -        infoFactory.setConstructor(new String[]{
> -            "managedConnectionFactoryClass",
> -            "connectionFactoryInterface",
> -            "implementedInterfaces",
> -            "connectionFactoryImplClass",
> -            "connectionInterface",
> -            "connectionImplClass",
> -            "globalJNDIName",
> -            "ResourceAdapterWrapper",
> -            "ConnectionManagerContainer",
> -            "ManagedConnectionFactoryListener",
> -            "kernel",
> -            "objectName",
> -            "classLoader"});
> -
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
> -
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/connectiontracking/ 
> ConnectionTrackingCoordinator.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/connectiontracking/ 
> ConnectionTrackingCoordinator.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/connectiontracking/ 
> ConnectionTrackingCoordinator.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/connectiontracking/ 
> ConnectionTrackingCoordinator.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -28,11 +28,8 @@
>  import org.apache.geronimo.connector.outbound.ConnectionInfo;
>  import  
> org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
>  import org.apache.geronimo.connector.outbound.ManagedConnectionInfo;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.transaction.InstanceContext;
>  import org.apache.geronimo.transaction.TrackedConnectionAssociator;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * ConnectionTrackingCoordinator tracks connections that are in  
> use by
> @@ -52,8 +49,6 @@
>   */
>  public class ConnectionTrackingCoordinator implements  
> TrackedConnectionAssociator, ConnectionTracker {
>
> -    public final static GBeanInfo GBEAN_INFO;
> -
>      private final ThreadLocal currentInstanceContexts = new  
> ThreadLocal();
>
>      public InstanceContext enter(InstanceContext newInstanceContext)
> @@ -143,17 +138,6 @@
>              boolean applicationManagedSecurity =  
> applicationManagedSecurityResources.contains(key);
>              connectionInfo.setApplicationManagedSecurity 
> (applicationManagedSecurity);
>          }
> -    }
> -
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (ConnectionTrackingCoordinator.class,  
> NameFactory.JCA_CONNECTION_TRACKER);
> -        infoFactory.addInterface(TrackedConnectionAssociator.class);
> -        infoFactory.addInterface(ConnectionTracker.class);
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
>      }
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/security/PasswordCredentialRealm.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/security/ 
> PasswordCredentialRealm.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/security/PasswordCredentialRealm.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/security/PasswordCredentialRealm.java Wed Aug 10  
> 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -17,19 +17,17 @@
>
>  package org.apache.geronimo.connector.outbound.security;
>
> -import javax.resource.spi.ManagedConnectionFactory;
>  import java.util.HashMap;
>  import java.util.Map;
>
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> +import javax.resource.spi.ManagedConnectionFactory;
> +
>  import org.apache.geronimo.kernel.Kernel;
>  import org.apache.geronimo.security.jaas.ConfigurationEntryFactory;
>  import org.apache.geronimo.security.jaas.JaasLoginCoordinator;
>  import  
> org.apache.geronimo.security.jaas.JaasLoginModuleConfiguration;
>  import org.apache.geronimo.security.jaas.LoginModuleControlFlag;
>  import org.apache.geronimo.security.realm.SecurityRealm;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>
>  /**
> @@ -37,8 +35,6 @@
>   */
>  public class PasswordCredentialRealm implements SecurityRealm,  
> ConfigurationEntryFactory, ManagedConnectionFactoryListener {
>
> -    private static final GBeanInfo GBEAN_INFO;
> -
>      ManagedConnectionFactory managedConnectionFactory;
>      private final Kernel kernel;
>      private final String realmName;
> @@ -93,20 +89,4 @@
>          return new JaasLoginModuleConfiguration 
> (JaasLoginCoordinator.class.getName(),  
> LoginModuleControlFlag.REQUIRED, options, true, realmName);
>      }
>
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (PasswordCredentialRealm.class, NameFactory.SECURITY_REALM);
> -
> -        infoFactory.addInterface 
> (ManagedConnectionFactoryListener.class);
> -        infoFactory.addInterface(ConfigurationEntryFactory.class);
> -        infoFactory.addAttribute("kernel", Kernel.class, false);
> -        infoFactory.addAttribute("realmName", String.class, true);
> -
> -        infoFactory.setConstructor(new String[]{"kernel",  
> "realmName"});
> -
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/outbound/transactionlog/JDBCLog.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/outbound/transactionlog/ 
> JDBCLog.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/transactionlog/JDBCLog.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/outbound/transactionlog/JDBCLog.java Wed Aug 10 18:42:16  
> 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2004 The Apache Software Foundation
> + * Copyright 2004-2005 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.
> @@ -30,8 +30,6 @@
>  import javax.transaction.xa.Xid;
>
>  import  
> org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper 
> ;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.gbean.GBeanLifecycle;
>  import org.apache.geronimo.transaction.manager.LogException;
>  import org.apache.geronimo.transaction.manager.Recovery;
> @@ -39,7 +37,6 @@
>  import  
> org.apache.geronimo.transaction.manager.TransactionBranchInfoImpl;
>  import org.apache.geronimo.transaction.manager.TransactionLog;
>  import org.apache.geronimo.transaction.manager.XidFactory;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>
>  /**
>   * "Last Resource optimization" for single servers wishing to have  
> valid xa transactions with
> @@ -201,23 +198,4 @@
>          return 0;
>      }
>
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (JDBCLog.class, NameFactory.JCA_RESOURCE);
> -
> -        infoFactory.addAttribute("systemId", String.class, true);
> -
> -        infoFactory.addInterface(TransactionLog.class);
> -
> -        infoFactory.addReference 
> ("ManagedConnectionFactoryWrapper",  
> ManagedConnectionFactoryWrapper.class,  
> NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
> -
> -        infoFactory.setConstructor(new String[]{"systemId",  
> "DataSource"});
> -
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
>  }
>
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/ 
> geronimo/connector/work/GeronimoWorkManager.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/java/org/apache/geronimo/connector/work/ 
> GeronimoWorkManager.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/work/GeronimoWorkManager.java (original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ 
> connector/work/GeronimoWorkManager.java Wed Aug 10 18:42:16 2005
> @@ -1,6 +1,6 @@
>  /**
>   *
> - * Copyright 2003-2004 The Apache Software Foundation
> + * Copyright 2003-2005 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.
> @@ -17,26 +17,24 @@
>
>  package org.apache.geronimo.connector.work;
>
> +import javax.resource.spi.XATerminator;
>  import javax.resource.spi.work.ExecutionContext;
>  import javax.resource.spi.work.Work;
>  import javax.resource.spi.work.WorkCompletedException;
>  import javax.resource.spi.work.WorkException;
>  import javax.resource.spi.work.WorkListener;
>  import javax.resource.spi.work.WorkManager;
> -import javax.resource.spi.XATerminator;
>
> -import EDU.oswego.cs.dl.util.concurrent.Executor;
>  import org.apache.geronimo.connector.work.pool.NullWorkExecutorPool;
>  import org.apache.geronimo.connector.work.pool.ScheduleWorkExecutor;
>  import org.apache.geronimo.connector.work.pool.StartWorkExecutor;
>  import org.apache.geronimo.connector.work.pool.SyncWorkExecutor;
>  import org.apache.geronimo.connector.work.pool.WorkExecutor;
>  import org.apache.geronimo.connector.work.pool.WorkExecutorPool;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
>  import org.apache.geronimo.gbean.GBeanLifecycle;
>  import  
> org.apache.geronimo.transaction.context.TransactionContextManager;
> -import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
> +
> +import EDU.oswego.cs.dl.util.concurrent.Executor;
>
>  /**
>   * WorkManager implementation which uses under the cover three  
> WorkExecutorPool
> @@ -249,33 +247,5 @@
>              throw wcj;
>          }
>      }
> -
> -    public static final GBeanInfo GBEAN_INFO;
> -
> -    static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder 
> (GeronimoWorkManager.class, NameFactory.JCA_WORK_MANAGER);
> -        infoFactory.addInterface(WorkManager.class);
> -
> -        infoFactory.addAttribute("syncMaximumPoolSize",  
> Integer.TYPE, true);
> -        infoFactory.addAttribute("startMaximumPoolSize",  
> Integer.TYPE, true);
> -        infoFactory.addAttribute("scheduledMaximumPoolSize",  
> Integer.TYPE, true);
> -
> -        infoFactory.addOperation("getXATerminator");
> -
> -        infoFactory.addReference("TransactionContextManager",  
> TransactionContextManager.class, NameFactory.JTA_RESOURCE);
> -
> -        infoFactory.setConstructor(new String[]{
> -            "syncMaximumPoolSize",
> -            "startMaximumPoolSize",
> -            "scheduledMaximumPoolSize",
> -            "TransactionContextManager"});
> -
> -        GBEAN_INFO = infoFactory.getBeanInfo();
> -    }
> -
> -    public static GBeanInfo getGBeanInfo() {
> -        return GBEAN_INFO;
> -    }
> -
>
>  }
>
> Modified: geronimo/trunk/modules/connector/src/test/org/apache/ 
> geronimo/connector/AdminObjectWrapperTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- 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 Wed Aug 10 18:42:16 2005
> @@ -107,7 +107,7 @@
>          kernel.boot();
>          selfName = NameFactory.getComponentName(null, null, null,  
> NameFactory.JCA_RESOURCE, null, null, null, j2eeContext);
>
> -        GBeanData aow = new GBeanData(selfName,  
> AdminObjectWrapper.getGBeanInfo());
> +        GBeanData aow = new GBeanData(selfName,  
> AdminObjectWrapperGBean.getGBeanInfo());
>          aow.setAttribute("adminObjectInterface",  
> MockAdminObject.class.getName());
>          aow.setAttribute("adminObjectClass",  
> MockAdminObjectImpl.class.getName());
>          kernel.loadGBean(aow, this.getClass().getClassLoader());
>
> Modified: geronimo/trunk/modules/connector/src/test/org/apache/ 
> geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/ 
> src/test/org/apache/geronimo/connector/outbound/ 
> ManagedConnectionFactoryWrapperTest.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- 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 Wed Aug  
> 10 18:42:16 2005
> @@ -151,7 +151,7 @@
>          kernel.loadGBean(ctc, cl);
>
>          cmfName = ObjectName.getInstance 
> ("test:role=ConnectionManagerContainer");
> -        GBeanData cmf = new GBeanData(cmfName,  
> GenericConnectionManager.getGBeanInfo());
> +        GBeanData cmf = new GBeanData(cmfName,  
> GenericConnectionManagerGBean.getGBeanInfo());
>          cmf.setAttribute("transactionSupport",  
> NoTransactions.INSTANCE);
>          cmf.setAttribute("pooling", new NoPool());
>          cmf.setReferencePatterns("ConnectionTracker",  
> Collections.singleton(ctcName));
> @@ -160,7 +160,7 @@
>          J2eeContext j2eeContext = new J2eeContextImpl 
> ("test.domain", "geronimo", "testapplication", "noModuleType",  
> "testmodule", TARGET_NAME,  
> NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
>          managedConnectionFactoryName = NameFactory.getComponentName 
> (null, null, null, NameFactory.JCA_RESOURCE, null, null, null,  
> j2eeContext);
>
> -        GBeanData mcfw = new GBeanData 
> (managedConnectionFactoryName,  
> ManagedConnectionFactoryWrapper.getGBeanInfo());
> +        GBeanData mcfw = new GBeanData 
> (managedConnectionFactoryName,  
> ManagedConnectionFactoryWrapperGBean.getGBeanInfo());
>          mcfw.setAttribute("managedConnectionFactoryClass",  
> MockManagedConnectionFactory.class.getName());
>          mcfw.setAttribute("connectionFactoryInterface",  
> ConnectionFactory.class.getName());
>          mcfw.setAttribute("implementedInterfaces", new String[]  
> {Serializable.class.getName(),  
> ConnectionFactoryExtension.class.getName()});
>
> 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?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- 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 Wed Aug 10  
> 18:42:16 2005
> @@ -28,15 +28,16 @@
>  import java.util.List;
>  import java.util.Map;
>  import java.util.Set;
> -import java.util.Collection;
> +
>  import javax.management.MalformedObjectNameException;
>  import javax.management.ObjectName;
>  import javax.naming.Reference;
>  import javax.xml.namespace.QName;
>
>  import junit.framework.TestCase;
> +
>  import org.apache.geronimo.common.DeploymentException;
> -import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinator;
> +import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinatorGBean;
>  import org.apache.geronimo.deployment.DeploymentContext;
>  import org.apache.geronimo.deployment.util.UnpackedJarFile;
>  import org.apache.geronimo.gbean.GBeanData;
> @@ -48,8 +49,8 @@
>  import org.apache.geronimo.j2ee.deployment.RefContext;
>  import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
>  import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
> -import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
>  import  
> org.apache.geronimo.j2ee.deployment.UnavailableWebServiceBuilder;
> +import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
>  import org.apache.geronimo.j2ee.deployment.NamingContext;
>  import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
>  import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
> @@ -57,16 +58,16 @@
>  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.KernelFactory;
>  import org.apache.geronimo.kernel.Kernel;
> -import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
> +import org.apache.geronimo.kernel.KernelFactory;
>  import org.apache.geronimo.kernel.config.Configuration;
> +import org.apache.geronimo.kernel.config.ConfigurationData;
> +import org.apache.geronimo.kernel.config.ConfigurationManager;
> +import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
>  import org.apache.geronimo.kernel.config.ConfigurationModuleType;
>  import org.apache.geronimo.kernel.config.ConfigurationStore;
>  import org.apache.geronimo.kernel.config.InvalidConfigException;
>  import org.apache.geronimo.kernel.config.NoSuchConfigException;
> -import org.apache.geronimo.kernel.config.ConfigurationData;
> -import org.apache.geronimo.kernel.config.ConfigurationManager;
>  import org.apache.geronimo.kernel.jmx.JMXUtil;
>  import org.apache.geronimo.kernel.management.State;
>  import org.apache.geronimo.security.SecurityServiceImpl;
> @@ -298,7 +299,7 @@
>          tcm = new GBeanData(tcmName,  
> TransactionContextManager.GBEAN_INFO);
>          tcm.setReferencePattern("TransactionManager", tmName);
>          start(tcm);
> -        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinator.GBEAN_INFO);
> +        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
>          start(ctc);
>
>
>
> Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/ 
> jetty/AbstractWebModuleTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/ 
> test/org/apache/geronimo/jetty/AbstractWebModuleTest.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ 
> AbstractWebModuleTest.java (original)
> +++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ 
> AbstractWebModuleTest.java Wed Aug 10 18:42:16 2005
> @@ -29,6 +29,7 @@
>
>  import junit.framework.TestCase;
>  import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinator;
> +import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinatorGBean;
>  import org.apache.geronimo.gbean.GBeanData;
>  import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
>  import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
> @@ -288,7 +289,7 @@
>          tcm = new GBeanData(tcmName,  
> TransactionContextManager.GBEAN_INFO);
>          tcm.setReferencePattern("TransactionManager", tmName);
>          start(tcm);
> -        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinator.GBEAN_INFO);
> +        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
>          start(ctc);
>      }
>
>
> Modified: geronimo/trunk/modules/tomcat-builder/src/test/org/apache/ 
> geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat- 
> builder/src/test/org/apache/geronimo/tomcat/deployment/ 
> TomcatModuleBuilderTest.java?rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/tomcat-builder/src/test/org/apache/ 
> geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
> +++ geronimo/trunk/modules/tomcat-builder/src/test/org/apache/ 
> geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Wed Aug 10  
> 18:42:16 2005
> @@ -43,7 +43,7 @@
>  import org.apache.commons.io.FileUtils;
>  import org.apache.geronimo.axis.builder.AxisBuilder;
>  import org.apache.geronimo.common.DeploymentException;
> -import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinator;
> +import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinatorGBean;
>  import org.apache.geronimo.deployment.DeploymentContext;
>  import org.apache.geronimo.deployment.util.UnpackedJarFile;
>  import org.apache.geronimo.gbean.GBeanData;
> @@ -447,7 +447,7 @@
>          tcm = new GBeanData(tcmName,  
> TransactionContextManager.GBEAN_INFO);
>          tcm.setReferencePattern("TransactionManager", tmName);
>          start(tcm);
> -        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinator.GBEAN_INFO);
> +        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
>          start(ctc);
>
>      }
>
> 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/org/apache/geronimo/tomcat/AbstractWebModuleTest.java? 
> rev=231369&r1=231368&r2=231369&view=diff
> ====================================================================== 
> ========
> --- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/ 
> tomcat/AbstractWebModuleTest.java (original)
> +++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/ 
> tomcat/AbstractWebModuleTest.java Wed Aug 10 18:42:16 2005
> @@ -32,6 +32,7 @@
>  import junit.framework.TestCase;
>
>  import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinator;
> +import  
> org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTr 
> ackingCoordinatorGBean;
>  import org.apache.geronimo.gbean.GBeanData;
>  import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
>  import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
> @@ -390,7 +391,7 @@
>          tcm = new GBeanData(tcmName,  
> TransactionContextManager.GBEAN_INFO);
>          tcm.setReferencePattern("TransactionManager", tmName);
>          start(tcm);
> -        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinator.GBEAN_INFO);
> +        ctc = new GBeanData(ctcName,  
> ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
>          start(ctc);
>      }
>
>
>
>

-- 
Geir Magnusson Jr                                  +1-203-665-6437
geirm@apache.org



Mime
View raw message