You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/11/16 20:50:12 UTC
svn commit: r345097 - in /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound: AbstractConnectionManager.java GenericConnectionManagerGBean.java

Author: djencks
Date: Wed Nov 16 11:50:09 2005
New Revision: 345097

URL: http://svn.apache.org/viewcvs?rev=345097&view=rev
Log:
GERONIMO-1184. Remove kernel interface from AbstractConnectionManager

Modified:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManager.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java

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=345097&r1=345096&r2=345097&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 Nov 16 11:50:09 2005
@@ -25,12 +25,11 @@
 
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
 import org.apache.geronimo.transaction.manager.NamedXAResource;
-import org.apache.geronimo.gbean.GBeanLifecycle;
 
 /**
  * @version $Rev$ $Date$
  */
-public abstract class AbstractConnectionManager implements ConnectionManagerContainer, ConnectionManager, LazyAssociatableConnectionManager, PoolingAttributes, GBeanLifecycle {
+public abstract class AbstractConnectionManager implements ConnectionManagerContainer, ConnectionManager, LazyAssociatableConnectionManager, PoolingAttributes {
     protected final Interceptors interceptors;
 
     //default constructor for use as endpoint

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java?rev=345097&r1=345096&r2=345097&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java Wed Nov 16 11:50:09 2005
@@ -21,6 +21,7 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 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;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 
@@ -28,12 +29,27 @@
  *
  * @version $Revision$
  */
-public class GenericConnectionManagerGBean {
+public class GenericConnectionManagerGBean extends GenericConnectionManager implements GBeanLifecycle {
 
+
+    public GenericConnectionManagerGBean() {
+        super();
+    }
+
+    public GenericConnectionManagerGBean(TransactionSupport transactionSupport,
+                                    PoolingSupport pooling,
+                                    boolean containerManagedSecurity,
+                                    ConnectionTracker connectionTracker,
+                                    TransactionContextManager transactionContextManager,
+                                    String objectName,
+                                    ClassLoader classLoader) {
+        super(transactionSupport, pooling, containerManagedSecurity, connectionTracker, transactionContextManager, objectName, classLoader);
+    }
+    
     public static final GBeanInfo GBEAN_INFO;
 
     static {
-        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(GenericConnectionManager.class, AbstractConnectionManagerGBean.GBEAN_INFO);
+        GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(GenericConnectionManagerGBean.class, AbstractConnectionManagerGBean.GBEAN_INFO);
 
         infoBuilder.addAttribute("transactionSupport", TransactionSupport.class, true);
         infoBuilder.addAttribute("pooling", PoolingSupport.class, true);