geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/work GeronimoWorkManager.java
Date Thu, 22 Jan 2004 06:39:24 GMT
djencks     2004/01/21 22:39:24

  Modified:    modules/core/src/java/org/apache/geronimo/connector
                        BootstrapContext.java
               modules/core/src/java/org/apache/geronimo/connector/outbound
                        ConnectionManagerDeployment.java
               modules/core/src/java/org/apache/geronimo/connector/outbound/connectiontracking
                        ConnectionTrackingCoordinator.java
               modules/core/src/java/org/apache/geronimo/connector/outbound/security
                        PasswordCredentialRealm.java
               modules/core/src/java/org/apache/geronimo/connector/work
                        GeronimoWorkManager.java
  Log:
  geronimombean removal
  
  Revision  Changes    Path
  1.4       +3 -16     incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/BootstrapContext.java
  
  Index: BootstrapContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/BootstrapContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BootstrapContext.java	20 Jan 2004 06:13:38 -0000	1.3
  +++ BootstrapContext.java	22 Jan 2004 06:39:24 -0000	1.4
  @@ -57,18 +57,15 @@
   
   import java.util.Timer;
   
  -import javax.management.ObjectName;
   import javax.resource.spi.UnavailableException;
   import javax.resource.spi.XATerminator;
   import javax.resource.spi.work.WorkManager;
   
  -import org.apache.geronimo.kernel.service.GeronimoMBeanEndpoint;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
  +import org.apache.geronimo.gbean.GEndpointInfo;
  +import org.apache.geronimo.gbean.GOperationInfo;
   
   /**
    * @version $Revision$ $Date$
  @@ -140,15 +137,5 @@
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
       }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo rc = new GeronimoMBeanInfo();
  -        rc.setTargetClass(BootstrapContext.class);
  -        rc.addOperationsDeclaredIn(javax.resource.spi.BootstrapContext.class);
  -        rc.addEndpoint(new GeronimoMBeanEndpoint("WorkManager",WorkManager.class, new ObjectName("geronimo.jca:role=WorkManager"),
true));
  -        rc.addEndpoint(new GeronimoMBeanEndpoint("XATerminator",XATerminator.class, new
ObjectName("geronimo.transaction:role=TransactionManager"), true));
  -        return rc;
  -    }
  -
   
   }
  
  
  
  1.15      +2 -33     incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java
  
  Index: ConnectionManagerDeployment.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ConnectionManagerDeployment.java	22 Jan 2004 02:46:27 -0000	1.14
  +++ ConnectionManagerDeployment.java	22 Jan 2004 06:39:24 -0000	1.15
  @@ -56,7 +56,6 @@
   
   package org.apache.geronimo.connector.outbound;
   
  -import javax.management.MBeanOperationInfo;
   import javax.management.MBeanServer;
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
  @@ -66,20 +65,15 @@
   import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
   import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBean;
  +import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.GEndpointInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
  -import org.apache.geronimo.gbean.GBeanContext;
   import org.apache.geronimo.kernel.KernelMBean;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
   import org.apache.geronimo.kernel.service.GeronimoMBeanContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanEndpoint;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
  -import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
  -import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
   import org.apache.geronimo.security.bridge.RealmBridge;
   
   /**
  @@ -398,31 +392,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -        GeronimoMBeanInfo mBeanInfo = new GeronimoMBeanInfo();
  -
  -        mBeanInfo.setTargetClass(ConnectionManagerDeployment.class);
  -        mBeanInfo.addEndpoint(new GeronimoMBeanEndpoint("ConnectionTracker", ConnectionTracker.class,
ObjectName.getInstance("geronimo.connector:role=ConnectionTrackingCoordinator"), true));
  -        mBeanInfo.addEndpoint(new GeronimoMBeanEndpoint("RealmBridge", RealmBridge.class,
ObjectName.getInstance("geronimo.connector:role=SecurityDomain"), false));
  -
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("BlockingTimeout", true, true,
"Milliseconds to wait for a connection to be returned"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Name", true, true, "Name
to use to identify this guy (needs refactoring of naming conventions)"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("MaxSize", true, true, "Maximum
number of ManagedConnections to create in each pool"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseConnectionRequestInfo",
true, true, "Select pool using app-supplied ConnectionRequestInfo"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseTransactions", true, true,
"Use local or xa transactions vs. no transactions"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseLocalTransactions", true,
true, "Use local rather than xa transactions"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseTransactionCaching", true,
true, "Always use the same connection in a transaction"));
  -        mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseSubject", true, true,
"Select pool using SecurityDomain supplied subject"));
  -
  -        mBeanInfo.addOperationInfo(new GeronimoOperationInfo("getStack"));
  -
  -        mBeanInfo.addOperationInfo(new GeronimoOperationInfo("createConnectionFactory",
  -                new GeronimoParameterInfo[]{new GeronimoParameterInfo("ManagedConnectionFactory",
ManagedConnectionFactory.class, "ManagedConnectionFactory that will create the ConnectionFactory")},
  -                MBeanOperationInfo.ACTION,
  -                "PRIVATE OPERATION. Have the supplied ManagedConnectionFactory create a
connection factory"));
  -        return mBeanInfo;
       }
   
   }
  
  
  
  1.5       +3 -12     incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
  
  Index: ConnectionTrackingCoordinator.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConnectionTrackingCoordinator.java	19 Jan 2004 06:29:08 -0000	1.4
  +++ ConnectionTrackingCoordinator.java	22 Jan 2004 06:39:24 -0000	1.5
  @@ -63,14 +63,12 @@
   
   import javax.resource.ResourceException;
   
  -import org.apache.geronimo.connector.outbound.ConnectorComponentContext;
  -import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
   import org.apache.geronimo.connector.outbound.ConnectionInfo;
  +import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
  +import org.apache.geronimo.connector.outbound.ConnectorComponentContext;
   import org.apache.geronimo.connector.outbound.ConnectorTransactionContext;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
   
   /**
  @@ -198,11 +196,4 @@
           return GBEAN_INFO;
       }
   
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(ConnectionTrackingCoordinator.class.getName());
  -        mbeanInfo.addOperationsDeclaredIn(TrackedConnectionAssociator.class );
  -        mbeanInfo.addOperationsDeclaredIn(ConnectionTracker.class);
  -        return mbeanInfo;
  -    }
   }
  
  
  
  1.4       +1 -9      incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java
  
  Index: PasswordCredentialRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PasswordCredentialRealm.java	21 Jan 2004 22:21:26 -0000	1.3
  +++ PasswordCredentialRealm.java	22 Jan 2004 06:39:24 -0000	1.4
  @@ -65,8 +65,6 @@
   
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
   import org.apache.geronimo.security.AbstractSecurityRealm;
   import org.apache.geronimo.security.GeronimoSecurityException;
   import org.apache.geronimo.security.SecurityRealm;
  @@ -142,10 +140,4 @@
           return GBEAN_INFO;
       }
   
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() {
  -        GeronimoMBeanInfo mbeanInfo = new GeronimoMBeanInfo();
  -        mbeanInfo.setTargetClass(PasswordCredentialRealm.class);
  -        mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Realm", true, true, "Name
of this realm"));
  -        return mbeanInfo;
  -    }
   }
  
  
  
  1.7       +3 -27     incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
  
  Index: GeronimoWorkManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GeronimoWorkManager.java	20 Jan 2004 06:13:38 -0000	1.6
  +++ GeronimoWorkManager.java	22 Jan 2004 06:39:24 -0000	1.7
  @@ -66,13 +66,11 @@
   import org.apache.geronimo.connector.work.pool.StartWorkExecutorPool;
   import org.apache.geronimo.connector.work.pool.SyncWorkExecutorPool;
   import org.apache.geronimo.connector.work.pool.WorkExecutorPool;
  -import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
  -import org.apache.geronimo.kernel.service.GeronimoAttributeInfo;
  +import org.apache.geronimo.gbean.GAttributeInfo;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.gbean.GAttributeInfo;
  -import org.apache.geronimo.gbean.GOperationInfo;
   import org.apache.geronimo.gbean.GConstructorInfo;
  +import org.apache.geronimo.gbean.GOperationInfo;
   
   /**
    * WorkManager implementation which uses under the cover three WorkExecutorPool
  @@ -286,28 +284,6 @@
   
       public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
  -    }
  -
  -    /**
  -     * Provides the GeronimoMBean description for this class
  -     * @return
  -     */
  -    public static GeronimoMBeanInfo getGeronimoMBeanInfo() throws Exception {
  -
  -        GeronimoMBeanInfo rc = new GeronimoMBeanInfo();
  -        rc.setTargetClass(GeronimoWorkManager.class);
  -        rc.addOperationsDeclaredIn(WorkManager.class);
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("SyncThreadCount", true, false, "Actual
size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("SyncMinimumPoolSize", true, true,
"Minimum size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("SyncMaximumPoolSize", true, true,
"Maximum size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("StartThreadCount", true, false,
"Actual size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("StartMinimumPoolSize", true, true,
"Minimum size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("StartMaximumPoolSize", true, true,
"Maximum size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("ScheduledThreadCount", true, false,
"Actual size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("ScheduledMinimumPoolSize", true,
true, "Minimum size of sync thread pool"));
  -        rc.addAttributeInfo(new GeronimoAttributeInfo("ScheduledMaximumPoolSize", true,
true, "Maximum size of sync thread pool"));
  -        return rc;
  -
       }
   
   }
  
  
  

Mime
View raw message