geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel Kernel.java
Date Sat, 05 Jun 2004 01:40:09 GMT
dain        2004/06/04 18:40:09

  Modified:    modules/assembly/src/plan j2ee-deployer-plan.xml
                        j2ee-server-plan.xml
               modules/connector/src/java/org/apache/geronimo/connector
                        AdminObjectWrapper.java
               modules/connector/src/java/org/apache/geronimo/connector/deployment
                        AbstractRARConfigBuilder.java
                        RAR_1_0ConfigBuilder.java RAR_1_5ConfigBuilder.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound
                        ManagedConnectionFactoryWrapper.java
               modules/connector/src/test/org/apache/geronimo/connector
                        AdminObjectWrapperTest.java
               modules/connector/src/test/org/apache/geronimo/connector/outbound
                        ManagedConnectionFactoryWrapperTest.java
               modules/deployment/src/java/org/apache/geronimo/deployment/service
                        ServiceConfigBuilder.java
               modules/deployment/src/test-resources/etc
                        bootstrapped-service.xml
               modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment
                        EARConfigBuilder.java
               modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting
                        JMXConnector.java
               modules/kernel/src/java/org/apache/geronimo/kernel/config
                        ConfigurationManagerImpl.java
               modules/kernel/src/java/org/apache/geronimo/kernel
                        Kernel.java
  Log:
  Replaced gbean references to kernel with gbean attributes
  
  Revision  Changes    Path
  1.16      +1 -5      incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml
  
  Index: j2ee-deployer-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- j2ee-deployer-plan.xml	19 May 2004 21:11:30 -0000	1.15
  +++ j2ee-deployer-plan.xml	5 Jun 2004 01:40:08 -0000	1.16
  @@ -73,28 +73,24 @@
   
       <gbean name="geronimo.deployer:role=Builder,type=RAR_1_0,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.RAR_1_0ConfigBuilder">
           <attribute name="ConnectionTrackerNamePattern" type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
  -        <reference name="Kernel">geronimo.boot:role=Kernel</reference>
           <reference name="Repository">*:role=Repository,*</reference>
       </gbean>
   
       <gbean name="geronimo.deployer:role=Builder,type=RAR_1_5,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.RAR_1_5ConfigBuilder">
           <attribute name="ConnectionTrackerNamePattern" type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
  -        <reference name="Kernel">geronimo.boot:role=Kernel</reference>
           <reference name="Repository">*:role=Repository,*</reference>
       </gbean>
   
       <gbean name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
  -        <reference name="Kernel">geronimo.boot:role=Kernel</reference>
           <reference name="Repository">*:role=Repository,*</reference>
       </gbean>
   
       <gbean name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
  -        <reference name="Kernel">geronimo.boot:role=Kernel</reference>
           <reference name="Repository">*:role=Repository,*</reference>
           <attribute name="j2eeServer" type="javax.management.ObjectName">geronimo.server:type=J2EEServer,name=geronimo</attribute>
           <reference name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer</reference>
           <reference name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer</reference>
  -<!--        <reference name="ConnectorConfigBuilder"></reference> -->
  +        <!--        <reference name="ConnectorConfigBuilder"></reference>
-->
       </gbean>
   
       <gbean name="geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder"/>
  
  
  
  1.23      +3 -4      incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
  
  Index: j2ee-server-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- j2ee-server-plan.xml	31 May 2004 00:05:02 -0000	1.22
  +++ j2ee-server-plan.xml	5 Jun 2004 01:40:08 -0000	1.23
  @@ -66,7 +66,7 @@
           <uri>geronimo/jars/geronimo-jmxremoting-1.0-SNAPSHOT.jar</uri>
       </dependency>
       <dependency>
  -      <uri>activemq/jars/activemq-SNAPSHOT.jar</uri>
  +        <uri>activemq/jars/activemq-SNAPSHOT.jar</uri>
       </dependency>
   
       <!-- required for rar 1.5 to load realms -->
  @@ -132,8 +132,8 @@
       <gbean name="geronimo.server:type=WebConnector,container=Jetty,port=8080" class="org.apache.geronimo.jetty.connector.HTTPConnector">
           <attribute name="Port" type="int">8080</attribute>
           <reference name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference>
  -<!--        <attribute name="MaxConnections" type="int">10</attribute>-->
  -<!--        <attribute name="MaxIdleTime" type="int">10</attribute>-->
  +        <!--        <attribute name="MaxConnections" type="int">10</attribute>-->
  +        <!--        <attribute name="MaxIdleTime" type="int">10</attribute>-->
       </gbean>
   
       <!-- JMS container
  @@ -180,6 +180,5 @@
       <gbean name="geronimo.server:role=JMXService,name=localhost" class="org.apache.geronimo.jmxremoting.JMXConnector">
           <attribute name="URL" type="java.lang.String">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
           <attribute name="ApplicationConfigName" type="java.lang.String">JMX</attribute>
  -        <reference name="Kernel">geronimo.boot:role=Kernel</reference>
       </gbean>
   </configuration>
  
  
  
  1.7       +9 -12     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java
  
  Index: AdminObjectWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectWrapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AdminObjectWrapper.java	2 Jun 2004 05:33:01 -0000	1.6
  +++ AdminObjectWrapper.java	5 Jun 2004 01:40:09 -0000	1.7
  @@ -29,14 +29,11 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.WaitingException;
  -import org.apache.geronimo.kernel.KernelMBean;
  +import org.apache.geronimo.kernel.Kernel;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class AdminObjectWrapper implements GBean, DynamicGBean {
   
       public static final GBeanInfo GBEAN_INFO;
  @@ -46,7 +43,7 @@
   
       private final DynamicGBeanDelegate delegate;
       private final Object adminObject;
  -    private final KernelMBean kernel;
  +    private final Kernel kernel;
       private final ObjectName selfName;
   
       private ConnectorMethodInterceptor interceptor;
  @@ -62,7 +59,7 @@
           selfName = null;
       }
   
  -    public AdminObjectWrapper(Class adminObjectInterface, Class adminObjectClass, KernelMBean
kernel, ObjectName selfName) throws IllegalAccessException, InstantiationException {
  +    public AdminObjectWrapper(Class adminObjectInterface, Class adminObjectClass, Kernel
kernel, ObjectName selfName) throws IllegalAccessException, InstantiationException {
           this.adminObjectInterface = adminObjectInterface;
           this.adminObjectClass = adminObjectClass;
           adminObject = adminObjectClass.newInstance();
  @@ -96,7 +93,7 @@
               enhancer.setCallbackType(MethodInterceptor.class);
               enhancer.setUseFactory(false);//????
               interceptor = new ConnectorMethodInterceptor(kernel.getKernelName(), selfName);
  -            enhancer.setCallbacks(new Callback[] {interceptor});
  +            enhancer.setCallbacks(new Callback[]{interceptor});
               proxy = enhancer.create(new Class[0], new Object[0]);
           }
           //connect proxy
  @@ -129,17 +126,17 @@
           GBeanInfoFactory infoFactory = new GBeanInfoFactory(AdminObjectWrapper.class);
           infoFactory.addAttribute("AdminObjectInterface", Class.class, true);
           infoFactory.addAttribute("AdminObjectClass", Class.class, true);
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
           infoFactory.addAttribute("SelfName", ObjectName.class, true);
   
           infoFactory.addOperation("getProxy");
           infoFactory.addOperation("getMethodInterceptor");
   
  -        infoFactory.addReference("Kernel", KernelMBean.class);
   
  -        infoFactory.setConstructor(new String[] {
  +        infoFactory.setConstructor(new String[]{
               "AdminObjectInterface",
               "AdminObjectClass",
  -            "Kernel",
  +            "kernel",
               "SelfName"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
  
  
  
  1.19      +16 -23    incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigBuilder.java
  
  Index: AbstractRARConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigBuilder.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AbstractRARConfigBuilder.java	2 Jun 2004 05:33:02 -0000	1.18
  +++ AbstractRARConfigBuilder.java	5 Jun 2004 01:40:09 -0000	1.19
  @@ -70,11 +70,8 @@
   import org.apache.xmlbeans.XmlObject;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public abstract class AbstractRARConfigBuilder implements ConfigurationBuilder {
   
       private static final SchemaTypeLoader[] SCHEMA_TYPE_LOADERS = new SchemaTypeLoader[]{XmlBeans.getContextTypeLoader()};
  @@ -132,15 +129,15 @@
       protected abstract XmlObject getConnectorDocument(JarInputStream jarInputStream) throws
XmlException, IOException, DeploymentException;
   
       public XmlObject getDeploymentPlan(URL module) throws XmlException {
  -         try {
  +        try {
               URL moduleBase = new URL("jar:" + module.toString() + "!/");
               XmlObject plan = XmlBeansUtil.getXmlObject(new URL(moduleBase, "META-INF/geronimo-ra.xml"),
GerConnectorDocument.type);
  -             if (plan != null && canConfigure(plan)) {
  -                 return plan;
  -             } else {
  -                 return null;
  -             }
  -         } catch (MalformedURLException e) {
  +            if (plan != null && canConfigure(plan)) {
  +                return plan;
  +            } else {
  +                return null;
  +            }
  +        } catch (MalformedURLException e) {
               return null;
           }
       }
  @@ -278,10 +275,8 @@
           } else if (connectionManager.getTransactionLog() != null) {
               transactionSupport = TransactionLog.INSTANCE;
           } else if (connectionManager.getXaTransaction() != null) {
  -            transactionSupport = new XATransactions(
  -                    connectionManager.getXaTransaction().getTransactionCaching() != null,
  -                    connectionManager.getXaTransaction().getThreadCaching() != null
  -            );
  +            transactionSupport = new XATransactions(connectionManager.getXaTransaction().getTransactionCaching()
!= null,
  +                    connectionManager.getXaTransaction().getThreadCaching() != null);
           } else {
               throw new DeploymentException("Unexpected transaction support element");
           }
  @@ -291,8 +286,7 @@
                       connectionManager.getSinglePool().getBlockingTimeoutMilliseconds(),
                       connectionManager.getSinglePool().getMatchOne() != null,
                       connectionManager.getSinglePool().getMatchAll() != null,
  -                    connectionManager.getSinglePool().getSelectOneAssumeMatch() != null
  -            );
  +                    connectionManager.getSinglePool().getSelectOneAssumeMatch() != null);
           } else if (connectionManager.getPartitionedPool() != null) {
               pooling = new PartitionedPool(connectionManager.getPartitionedPool().getPartitionByConnectionrequestinfo()
!= null,
                       connectionManager.getPartitionedPool().getPartitionBySubject() != null,
  @@ -300,13 +294,12 @@
                       connectionManager.getPartitionedPool().getBlockingTimeoutMilliseconds(),
                       connectionManager.getPartitionedPool().getMatchOne() != null,
                       connectionManager.getPartitionedPool().getMatchAll() != null,
  -                    connectionManager.getPartitionedPool().getSelectOneAssumeMatch() !=
null
  -            );
  +                    connectionManager.getPartitionedPool().getSelectOneAssumeMatch() !=
null);
           } else if (connectionManager.getNoPool() != null) {
               pooling = new NoPool();
           } else {
               throw new DeploymentException("Unexpected pooling support element");
  -          }
  +        }
           try {
               connectionManagerGBean.setAttribute("Name", connectionfactoryInstance.getName());
               connectionManagerGBean.setAttribute("TransactionSupport", transactionSupport);
  @@ -335,12 +328,12 @@
   
           infoFactory.addInterface(ConfigurationBuilder.class);
   
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
           infoFactory.addAttribute("ConnectionTrackerNamePattern", ObjectName.class, true);
   
           infoFactory.addReference("Repository", Repository.class);
  -        infoFactory.addReference("Kernel", Kernel.class);
   
  -        infoFactory.setConstructor(new String[]{"Kernel", "Repository", "ConnectionTrackerNamePattern"});
  +        infoFactory.setConstructor(new String[]{"kernel", "Repository", "ConnectionTrackerNamePattern"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
  
  
  
  1.11      +2 -6      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilder.java
  
  Index: RAR_1_0ConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- RAR_1_0ConfigBuilder.java	3 Jun 2004 07:24:15 -0000	1.10
  +++ RAR_1_0ConfigBuilder.java	5 Jun 2004 01:40:09 -0000	1.11
  @@ -58,11 +58,8 @@
   import org.apache.xmlbeans.XmlOptions;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class RAR_1_0ConfigBuilder extends AbstractRARConfigBuilder {
   
       public RAR_1_0ConfigBuilder(Kernel kernel, Repository repository, ObjectName connectionTrackerNamePattern)
{
  @@ -124,7 +121,6 @@
                           context.addGBean(ObjectName.getInstance(BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME
+ connectionfactoryInstance.getName()), realmGBean);
                           managedConnectionFactoryGBean.setReferencePatterns("ManagedConnectionFactoryListener",
Collections.singleton(ObjectName.getInstance(BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME +
connectionfactoryInstance.getName())));
                       }
  -                    managedConnectionFactoryGBean.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
                       managedConnectionFactoryGBean.setAttribute("SelfName", managedConnectionFactoryObjectName);
                   } catch (Exception e) {
                       throw new DeploymentException(e);
  
  
  
  1.16      +2 -7      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java
  
  Index: RAR_1_5ConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- RAR_1_5ConfigBuilder.java	3 Jun 2004 07:24:16 -0000	1.15
  +++ RAR_1_5ConfigBuilder.java	5 Jun 2004 01:40:09 -0000	1.16
  @@ -68,11 +68,8 @@
   import org.apache.xmlbeans.XmlOptions;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class RAR_1_5ConfigBuilder extends AbstractRARConfigBuilder {
   
   
  @@ -178,7 +175,6 @@
                           context.addGBean(ObjectName.getInstance(BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME
+ connectionfactoryInstance.getName()), realmGBean);
                           managedConnectionFactoryGBean.setReferencePatterns("ManagedConnectionFactoryListener",
Collections.singleton(ObjectName.getInstance(BASE_PASSWORD_CREDENTIAL_LOGIN_MODULE_NAME +
connectionfactoryInstance.getName())));
                       }
  -                    managedConnectionFactoryGBean.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
                       managedConnectionFactoryGBean.setAttribute("SelfName", managedConnectionFactoryObjectName);
                   } catch (Exception e) {
                       throw new DeploymentException(e);
  @@ -205,7 +201,6 @@
                       ObjectName adminObjectObjectName = ObjectName.getInstance(JMXReferenceFactory.BASE_ADMIN_OBJECT_NAME
+ gerAdminobjectInstance.getAdminobjectName());
                       adminObjectGBean.setAttribute("AdminObjectInterface", cl.loadClass(adminobject.getAdminobjectInterface().getStringValue()));
                       adminObjectGBean.setAttribute("AdminObjectClass", cl.loadClass(adminobject.getAdminobjectClass().getStringValue()));
  -                    adminObjectGBean.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
                       adminObjectGBean.setAttribute("SelfName", adminObjectObjectName);
                       context.addGBean(adminObjectObjectName, adminObjectGBean);
                   } catch (Exception e) {
  
  
  
  1.11      +9 -10     incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
  
  Index: ManagedConnectionFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ManagedConnectionFactoryWrapper.java	2 Jun 2004 05:33:02 -0000	1.10
  +++ ManagedConnectionFactoryWrapper.java	5 Jun 2004 01:40:09 -0000	1.11
  @@ -36,7 +36,7 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.WaitingException;
  -import org.apache.geronimo.kernel.KernelMBean;
  +import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.naming.geronimo.GeronimoContextManager;
   
   /**
  @@ -70,7 +70,7 @@
       private boolean registered = false;
       private Object proxy;
       private ConnectorMethodInterceptor interceptor;
  -    private final KernelMBean kernel;
  +    private final Kernel kernel;
       private final ObjectName selfName;
   
       //default constructor for enhancement proxy endpoint
  @@ -84,8 +84,7 @@
           selfName = null;
       }
   
  -    public ManagedConnectionFactoryWrapper(
  -            Class managedConnectionFactoryClass,
  +    public ManagedConnectionFactoryWrapper(Class managedConnectionFactoryClass,
               Class connectionFactoryInterface,
               Class connectionFactoryImplClass,
               Class connectionInterface,
  @@ -94,7 +93,7 @@
               ResourceAdapterWrapper resourceAdapterWrapper,
               ConnectionManagerFactory connectionManagerFactory,
               ManagedConnectionFactoryListener managedConnectionFactoryListener,
  -            KernelMBean kernel,
  +            Kernel kernel,
               ObjectName selfName) throws InstantiationException, IllegalAccessException
{
           this.managedConnectionFactoryClass = managedConnectionFactoryClass;
           this.connectionFactoryInterface = connectionFactoryInterface;
  @@ -165,7 +164,7 @@
               if (resourceAdapterWrapper == null) {
                   throw new IllegalStateException("Managed connection factory expects to
be registered with a ResourceAdapter, but there is no ResourceAdapter");
               }
  -            resourceAdapterWrapper.registerManagedConnectionFactory((ResourceAdapterAssociation)managedConnectionFactory);
  +            resourceAdapterWrapper.registerManagedConnectionFactory((ResourceAdapterAssociation)
managedConnectionFactory);
               registered = true;
               log.debug("Registered managedConnectionFactory with ResourceAdapter " + resourceAdapterWrapper.toString());
           }
  @@ -183,7 +182,7 @@
               enhancer.setCallbackType(net.sf.cglib.proxy.MethodInterceptor.class);
               enhancer.setUseFactory(false);//????
               interceptor = new ConnectorMethodInterceptor(kernel.getKernelName(), selfName);
  -            enhancer.setCallbacks(new Callback[] {interceptor});
  +            enhancer.setCallbacks(new Callback[]{interceptor});
               proxy = enhancer.create(new Class[0], new Object[0]);
           }
           //connect proxy
  @@ -247,6 +246,7 @@
           infoFactory.addAttribute("ConnectionImplClass", Class.class, true);
           infoFactory.addAttribute("SelfName", ObjectName.class, true);
           infoFactory.addAttribute("GlobalJNDIName", String.class, true);
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
   
           infoFactory.addOperation("getProxy");
           infoFactory.addOperation("getMethodInterceptor");
  @@ -254,7 +254,6 @@
           infoFactory.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class);
           infoFactory.addReference("ConnectionManagerFactory", ConnectionManagerFactory.class);
           infoFactory.addReference("ManagedConnectionFactoryListener", ManagedConnectionFactoryListener.class);
  -        infoFactory.addReference("Kernel", KernelMBean.class);
   
           infoFactory.setConstructor(new String[]{
               "ManagedConnectionFactoryClass",
  @@ -266,7 +265,7 @@
               "ResourceAdapterWrapper",
               "ConnectionManagerFactory",
               "ManagedConnectionFactoryListener",
  -            "Kernel",
  +            "kernel",
               "SelfName"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
  
  
  
  1.2       +4 -10     incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
  
  Index: AdminObjectWrapperTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AdminObjectWrapperTest.java	9 Mar 2004 20:15:43 -0000	1.1
  +++ AdminObjectWrapperTest.java	5 Jun 2004 01:40:09 -0000	1.2
  @@ -21,8 +21,6 @@
   import java.io.ByteArrayOutputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
  -import java.util.Collections;
  -
   import javax.management.ObjectName;
   
   import junit.framework.TestCase;
  @@ -37,11 +35,8 @@
   import org.apache.xmlbeans.XmlObject;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class AdminObjectWrapperTest extends TestCase {
   
       private Kernel kernel;
  @@ -66,7 +61,7 @@
       }
   
       public void testSerialization() throws Exception {
  -        MockAdminObject proxy = (MockAdminObject)kernel.invoke(selfName, "getProxy");
  +        MockAdminObject proxy = (MockAdminObject) kernel.invoke(selfName, "getProxy");
           ByteArrayOutputStream baos = new ByteArrayOutputStream();
           ObjectOutputStream oos = new ObjectOutputStream(baos);
           oos.writeObject(proxy);
  @@ -81,7 +76,7 @@
           assertNotNull(mockAdminObject);
           kernel.stopGBean(selfName);
           ObjectInputStream ois2 = new ObjectInputStream(new ByteArrayInputStream(bytes));
  -        MockAdminObject proxy3 = (MockAdminObject)ois2.readObject();
  +        MockAdminObject proxy3 = (MockAdminObject) ois2.readObject();
           try {
               proxy3.getSomething();
               fail();
  @@ -155,7 +150,6 @@
           GBeanMBean aow = new GBeanMBean(AdminObjectWrapper.getGBeanInfo());
           aow.setAttribute("AdminObjectInterface", MockAdminObject.class);
           aow.setAttribute("AdminObjectClass", MockAdminObjectImpl.class);
  -        aow.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
           aow.setAttribute("SelfName", selfName);
           kernel.loadGBean(selfName, aow);
   
  
  
  
  1.4       +8 -15     incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
  
  Index: ManagedConnectionFactoryWrapperTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ManagedConnectionFactoryWrapperTest.java	24 May 2004 19:10:35 -0000	1.3
  +++ ManagedConnectionFactoryWrapperTest.java	5 Jun 2004 01:40:09 -0000	1.4
  @@ -23,7 +23,6 @@
   import java.io.ObjectOutputStream;
   import java.util.Collections;
   import java.util.Hashtable;
  -
   import javax.management.ObjectName;
   import javax.naming.Context;
   import javax.naming.InitialContext;
  @@ -49,11 +48,8 @@
   import org.apache.xmlbeans.XmlObject;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
  - *
  - * */
  + */
   public class ManagedConnectionFactoryWrapperTest extends TestCase {
   
       private Kernel kernel;
  @@ -81,7 +77,7 @@
       }
   
       public void testSerialization() throws Exception {
  -        ConnectionFactory proxy = (ConnectionFactory)kernel.invoke(selfName, "getProxy");
  +        ConnectionFactory proxy = (ConnectionFactory) kernel.invoke(selfName, "getProxy");
           ByteArrayOutputStream baos = new ByteArrayOutputStream();
           ObjectOutputStream oos = new ObjectOutputStream(baos);
           oos.writeObject(proxy);
  @@ -96,7 +92,7 @@
           assertNotNull(connection);
           kernel.stopGBean(selfName);
           ObjectInputStream ois2 = new ObjectInputStream(new ByteArrayInputStream(bytes));
  -        ConnectionFactory proxy3 = (ConnectionFactory)ois2.readObject();
  +        ConnectionFactory proxy3 = (ConnectionFactory) ois2.readObject();
           try {
               proxy3.getConnection();
               fail();
  @@ -114,7 +110,7 @@
           env.put("java.naming.provider.url", "rmi://localhost:1099");
   
           Context ctx = new InitialContext(env);
  -        ConnectionFactory cf = (ConnectionFactory)ctx.lookup("geronimo:" + GLOBAL_NAME);
  +        ConnectionFactory cf = (ConnectionFactory) ctx.lookup("geronimo:" + GLOBAL_NAME);
           assertNotNull(cf);
           kernel.stopGBean(selfName);
           try {
  @@ -123,7 +119,7 @@
           } catch (NamingException ne) {
           }
           kernel.startGBean(selfName);
  -        ConnectionFactory cf2 = (ConnectionFactory)ctx.lookup("geronimo:" + GLOBAL_NAME);
  +        ConnectionFactory cf2 = (ConnectionFactory) ctx.lookup("geronimo:" + GLOBAL_NAME);
           assertNotNull(cf2);
       }
   
  @@ -206,7 +202,6 @@
           //"ResourceAdapterWrapper",
           mcfw.setReferencePatterns("ConnectionManagerFactory", Collections.singleton(cmfName));
           //"ManagedConnectionFactoryListener",
  -        mcfw.setReferencePatterns("Kernel", Collections.singleton(Kernel.KERNEL));
           mcfw.setAttribute("SelfName", selfName);
           kernel.loadGBean(selfName, mcfw);
   
  @@ -221,13 +216,11 @@
       }
   
       public static class MockConnectionTrackingCoordinator implements ConnectionTracker
{
  -        public void handleObtained(
  -                ConnectionTrackingInterceptor connectionTrackingInterceptor,
  +        public void handleObtained(ConnectionTrackingInterceptor connectionTrackingInterceptor,
                   ConnectionInfo connectionInfo) {
           }
   
  -        public void handleReleased(
  -                ConnectionTrackingInterceptor connectionTrackingInterceptor,
  +        public void handleReleased(ConnectionTrackingInterceptor connectionTrackingInterceptor,
                   ConnectionInfo connectionInfo) {
           }
   
  
  
  
  1.15      +4 -6      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
  
  Index: ServiceConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ServiceConfigBuilder.java	2 Jun 2004 05:33:02 -0000	1.14
  +++ ServiceConfigBuilder.java	5 Jun 2004 01:40:09 -0000	1.15
  @@ -50,8 +50,6 @@
   import org.apache.xmlbeans.XmlObject;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
    */
   public class ServiceConfigBuilder implements ConfigurationBuilder {
  @@ -80,7 +78,7 @@
       }
   
       public void buildConfiguration(File outfile, Manifest manifest, File module, XmlObject
plan) throws IOException, DeploymentException {
  -        buildConfiguration(outfile, manifest, (InputStream)null, plan);
  +        buildConfiguration(outfile, manifest, (InputStream) null, plan);
       }
   
       public void buildConfiguration(File outfile, Manifest manifest, InputStream ignored,
XmlObject plan) throws IOException, DeploymentException {
  @@ -223,9 +221,9 @@
           infoFactory.addInterface(ConfigurationBuilder.class);
   
           infoFactory.addReference("Repository", Repository.class);
  -        infoFactory.addReference("Kernel", Kernel.class);
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
   
  -        infoFactory.setConstructor(new String[]{"Repository", "Kernel"});
  +        infoFactory.setConstructor(new String[]{"Repository", "kernel"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
  
  
  
  1.11      +31 -34    incubator-geronimo/modules/deployment/src/test-resources/etc/bootstrapped-service.xml
  
  Index: bootstrapped-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/test-resources/etc/bootstrapped-service.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- bootstrapped-service.xml	23 Jan 2004 06:47:06 -0000	1.10
  +++ bootstrapped-service.xml	5 Jun 2004 01:40:09 -0000	1.11
  @@ -93,9 +93,6 @@
           <endpoint name="ConnectionTracker">
               <pattern>geronimo.connector:service=ConnectionTrackingCoordinator</pattern>
           </endpoint>
  -        <endpoint name="Kernel">
  -            <pattern>geronimo.boot:role=Kernel</pattern>
  -        </endpoint>
       </gbean>
   
       <gbean class="org.apache.geronimo.connector.deployment.ConnectorDeployer" objectName="geronimo.deployment:type=connector">
  @@ -130,39 +127,39 @@
           <endpoint name="JettyContainer">
               <pattern>geronimo.web:type=WebContainer,container=Jetty</pattern>
           </endpoint>
  -<!--        <default attribute="MaxConnections" type="int">10</default>-->
  -<!--        <default attribute="MaxIdleTime" type="int">10</default>-->
  +        <!--        <default attribute="MaxConnections" type="int">10</default>-->
  +        <!--        <default attribute="MaxIdleTime" type="int">10</default>-->
           <!--default attribute="Contexts" type="java.lang.String[]"></default-->
       </gbean>
   
  -<!--
  -    <gbean class="org.apache.geronimo.web.deployment.WebDeployer" objectName="geronimo.deployment:type=Web">
  -        <default attribute="Type" type="java.lang.String">Jetty</default>
  -        <default attribute="WebApplicationClass" type="java.lang.String">org.apache.geronimo.web.jetty.JettyWebApplication</default>
  -        <default attribute="Java2ClassLoadingCompliance" type="boolean">false</default>
  -        <default attribute="TransactionManagerNamePattern" type="javax.management.ObjectName">geronimo.transaction:service=TransactionManager</default>
  -        <default attribute="TrackedConnectionAssociatorNamePattern" type="javax.management.ObjectName">geronimo.connector:service=ConnectionTrackingCoordinator</default>
  -        <endpoint name="ParserFactory">
  -            <pattern>geronimo.system:type=ParserFactory</pattern>
  -        </endpoint>
  -    </gbean>
  --->
  -
  -
  -<!--
  -    <gbean class="org.apache.geronimo.deployment.util.ExplicitDeployment" objectName="geronimo.app:name=WebConsole">
  -        <default attribute="ConfigID" type="java.net.URI">org/apache/geronimo/WebConsole</default>
  -        <default attribute="PackageURL" type="java.net.URL">console-web/target/geronimo-web-console.war</default>
  -        <endpoint name="ConfigurationParent">
  -            <pattern>geronimo.config:name="org/apache/geronimo/Bootstrap"</pattern>
  -        </endpoint>
  -        <endpoint name="BatchDeployerFactory">
  -            <pattern>geronimo.system:type=BatchDeployerFactory</pattern>
  -        </endpoint>
  -        <endpoint name="Kernel">
  -            <pattern>geronimo.boot:role=Kernel</pattern>
  -        </endpoint>
  -    </gbean>
  --->
  +    <!--
  +        <gbean class="org.apache.geronimo.web.deployment.WebDeployer" objectName="geronimo.deployment:type=Web">
  +            <default attribute="Type" type="java.lang.String">Jetty</default>
  +            <default attribute="WebApplicationClass" type="java.lang.String">org.apache.geronimo.web.jetty.JettyWebApplication</default>
  +            <default attribute="Java2ClassLoadingCompliance" type="boolean">false</default>
  +            <default attribute="TransactionManagerNamePattern" type="javax.management.ObjectName">geronimo.transaction:service=TransactionManager</default>
  +            <default attribute="TrackedConnectionAssociatorNamePattern" type="javax.management.ObjectName">geronimo.connector:service=ConnectionTrackingCoordinator</default>
  +            <endpoint name="ParserFactory">
  +                <pattern>geronimo.system:type=ParserFactory</pattern>
  +            </endpoint>
  +        </gbean>
  +    -->
  +
  +
  +    <!--
  +        <gbean class="org.apache.geronimo.deployment.util.ExplicitDeployment" objectName="geronimo.app:name=WebConsole">
  +            <default attribute="ConfigID" type="java.net.URI">org/apache/geronimo/WebConsole</default>
  +            <default attribute="PackageURL" type="java.net.URL">console-web/target/geronimo-web-console.war</default>
  +            <endpoint name="ConfigurationParent">
  +                <pattern>geronimo.config:name="org/apache/geronimo/Bootstrap"</pattern>
  +            </endpoint>
  +            <endpoint name="BatchDeployerFactory">
  +                <pattern>geronimo.system:type=BatchDeployerFactory</pattern>
  +            </endpoint>
  +            <endpoint name="Kernel">
  +                <pattern>geronimo.boot:role=Kernel</pattern>
  +            </endpoint>
  +        </gbean>
  +    -->
   
   </gbeans>
  
  
  
  1.5       +3 -3      incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
  
  Index: EARConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EARConfigBuilder.java	3 Jun 2004 07:24:18 -0000	1.4
  +++ EARConfigBuilder.java	5 Jun 2004 01:40:09 -0000	1.5
  @@ -367,7 +367,7 @@
   
       static {
           GBeanInfoFactory infoFactory = new GBeanInfoFactory(EARConfigBuilder.class);
  -        infoFactory.addReference("Kernel", Kernel.class);
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
           infoFactory.addReference("Repository", Repository.class);
           infoFactory.addAttribute("j2eeServer", ObjectName.class, true);
           infoFactory.addReference("EJBConfigBuilder", ModuleBuilder.class);
  @@ -377,7 +377,7 @@
           infoFactory.addInterface(ConfigurationBuilder.class);
   
           infoFactory.setConstructor(new String[]{
  -            "Kernel",
  +            "kernel",
               "Repository",
               "j2eeServer",
               "EJBConfigBuilder",
  
  
  
  1.4       +3 -3      incubator-geronimo/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
  
  Index: JMXConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JMXConnector.java	4 Jun 2004 22:31:56 -0000	1.3
  +++ JMXConnector.java	5 Jun 2004 01:40:09 -0000	1.4
  @@ -132,8 +132,8 @@
           infoFactory.addAttribute("objectName", String.class, false);
           infoFactory.addAttribute("URL", String.class, true);
           infoFactory.addAttribute("ApplicationConfigName", String.class, true);
  -        infoFactory.addReference("Kernel", Kernel.class);
  -        infoFactory.setConstructor(new String[]{"Kernel", "objectName"});
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
  +        infoFactory.setConstructor(new String[]{"kernel", "objectName"});
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
  
  Index: ConfigurationManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConfigurationManagerImpl.java	5 Jun 2004 00:37:16 -0000	1.5
  +++ ConfigurationManagerImpl.java	5 Jun 2004 01:40:09 -0000	1.6
  @@ -210,10 +210,10 @@
   
       static {
           GBeanInfoFactory infoFactory = new GBeanInfoFactory(ConfigurationManagerImpl.class);
  -        infoFactory.addReference("Kernel", Kernel.class);
  +        infoFactory.addAttribute("kernel", Kernel.class, false);
           infoFactory.addReference("Stores", ConfigurationStore.class);
           infoFactory.addInterface(ConfigurationManager.class);
  -        infoFactory.setConstructor(new String[]{"Kernel", "Stores"});
  +        infoFactory.setConstructor(new String[]{"kernel", "Stores"});
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  
  
  
  1.35      +1 -2      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Kernel.java	5 Jun 2004 00:37:16 -0000	1.34
  +++ Kernel.java	5 Jun 2004 01:40:09 -0000	1.35
  @@ -356,7 +356,6 @@
           mbServer.registerMBean(new DependencyService(), DEPENDENCY_SERVICE);
   
           configurationManagerGBean = new GBeanMBean(ConfigurationManagerImpl.GBEAN_INFO);
  -        configurationManagerGBean.setReferencePatterns("Kernel", Collections.singleton(KERNEL));
           configurationManagerGBean.setReferencePatterns("Stores", Collections.singleton(CONFIGURATION_STORE_PATTERN));
           mbServer.registerMBean(configurationManagerGBean, CONFIGURATION_MANAGER_NAME);
           configurationManagerGBean.start();
  
  
  

Mime
View raw message