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/12/12 09:45:18 UTC

svn commit: r356219 - in /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound: AbstractConnectionManagerGBean.java GenericConnectionManagerGBean.java

Author: djencks
Date: Mon Dec 12 00:45:14 2005
New Revision: 356219

URL: http://svn.apache.org/viewcvs?rev=356219&view=rev
Log:
GERONIMO-1339 make pool attributes save in config.xml

Modified:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManagerGBean.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/AbstractConnectionManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManagerGBean.java?rev=356219&r1=356218&r2=356219&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManagerGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/AbstractConnectionManagerGBean.java Mon Dec 12 00:45:14 2005
@@ -21,19 +21,27 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
- * 
+ *
  * @version $Revision$
  */
 public class AbstractConnectionManagerGBean {
-    
+
     protected static final GBeanInfo GBEAN_INFO;
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AbstractConnectionManagerGBean.class, AbstractConnectionManager.class, NameFactory.JCA_CONNECTION_MANAGER);
 
         infoBuilder.addInterface(ConnectionManagerContainer.class);
-        //these attributes are persisted via the pooling state.
-        infoBuilder.addInterface(PoolingAttributes.class);
+
+        infoBuilder.addInterface(PoolingAttributes.class,
+                new String[]{"partitionMaxSize",
+                             "partitionMinSize",
+                             "blockingTimeoutMilliseconds",
+                             "idleTimeoutMinutes"},
+                new String[]{"partitionMaxSize",
+                             "partitionMinSize",
+                             "blockingTimeoutMilliseconds",
+                             "idleTimeoutMinutes"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

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=356219&r1=356218&r2=356219&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 Mon Dec 12 00:45:14 2005
@@ -26,7 +26,6 @@
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 
 /**
- *
  * @version $Revision$
  */
 public class GenericConnectionManagerGBean extends GenericConnectionManager implements GBeanLifecycle {
@@ -37,15 +36,15 @@
     }
 
     public GenericConnectionManagerGBean(TransactionSupport transactionSupport,
-                                    PoolingSupport pooling,
-                                    boolean containerManagedSecurity,
-                                    ConnectionTracker connectionTracker,
-                                    TransactionContextManager transactionContextManager,
-                                    String objectName,
-                                    ClassLoader classLoader) {
+                                         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 {
@@ -60,6 +59,7 @@
 
         infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
         infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+
 
         infoBuilder.setConstructor(new String[]{
             "transactionSupport",