geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r157688 - geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound
Date Wed, 16 Mar 2005 05:12:17 GMT
Author: djencks
Date: Tue Mar 15 21:12:15 2005
New Revision: 157688

URL: http://svn.apache.org/viewcvs?view=rev&rev=157688
Log:
Fix annoying class name

Added:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java
      - copied, changed from r157501, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerFactory.java
Removed:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerFactory.java
Modified:
    geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.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/ManagedConnectionFactoryWrapper.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java

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?view=diff&r1=157687&r2=157688
==============================================================================
--- 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
Tue Mar 15 21:12:15 2005
@@ -758,7 +758,7 @@
             if (resourceAdapterObjectName != null) {
                 managedConnectionFactoryInstanceGBeanData.setReferencePattern("ResourceAdapterWrapper",
resourceAdapterObjectName);
             }
-            managedConnectionFactoryInstanceGBeanData.setReferencePattern("ConnectionManagerFactory",
connectionManagerObjectName);
+            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());

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?view=diff&r1=157687&r2=157688
==============================================================================
--- 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
Tue Mar 15 21:12:15 2005
@@ -32,7 +32,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public abstract class AbstractConnectionManager implements ConnectionManagerFactory, ConnectionManager,
LazyAssociatableConnectionManager, PoolingAttributes {
+public abstract class AbstractConnectionManager implements ConnectionManagerContainer, ConnectionManager,
LazyAssociatableConnectionManager, PoolingAttributes {
     protected final Interceptors interceptors;
 
     //default constructor for use as endpoint
@@ -81,7 +81,7 @@
     }
 
 
-    public ConnectionManagerFactory.ReturnableXAResource getRecoveryXAResource(ManagedConnectionFactory
managedConnectionFactory) throws ResourceException {
+    public ConnectionManagerContainer.ReturnableXAResource getRecoveryXAResource(ManagedConnectionFactory
managedConnectionFactory) throws ResourceException {
         ManagedConnectionInfo mci = new ManagedConnectionInfo(managedConnectionFactory, null);
         NamedXAResource namedXAResource = (NamedXAResource) mci.getXAResource();
         if (namedXAResource == null) {
@@ -90,7 +90,7 @@
         }
         ConnectionInfo recoveryConnectionInfo = new ConnectionInfo(mci);
         getRecoveryStack().getConnection(recoveryConnectionInfo);
-        return new ConnectionManagerFactory.ReturnableXAResource(namedXAResource, getRecoveryStack(),
recoveryConnectionInfo);
+        return new ConnectionManagerContainer.ReturnableXAResource(namedXAResource, getRecoveryStack(),
recoveryConnectionInfo);
     }
 
     //statistics
@@ -166,7 +166,7 @@
     static {
         GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(AbstractConnectionManager.class,
NameFactory.JCA_CONNECTION_MANAGER);
 
-        infoBuilder.addInterface(ConnectionManagerFactory.class);
+        infoBuilder.addInterface(ConnectionManagerContainer.class);
         //these attributes are persisted via the pooling state.
         infoBuilder.addInterface(PoolingAttributes.class);
 

Copied: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java
(from r157501, geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerFactory.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java?view=diff&rev=157688&p1=geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerFactory.java&r1=157501&p2=geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java&r2=157688
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerFactory.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerContainer.java
Tue Mar 15 21:12:15 2005
@@ -26,11 +26,11 @@
 import org.apache.geronimo.transaction.manager.NamedXAResource;
 
 /**
- * ConnectionManagerFactory
+ * ConnectionManagerContainer
  *
  * @version $Rev$ $Date$
  */
-public interface ConnectionManagerFactory {
+public interface ConnectionManagerContainer {
 
     Object createConnectionFactory(ManagedConnectionFactory mcf) throws ResourceException;
 

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?view=diff&r1=157687&r2=157688
==============================================================================
--- 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
Tue Mar 15 21:12:15 2005
@@ -61,7 +61,7 @@
     private String globalJNDIName;
 
     private ResourceAdapterWrapper resourceAdapterWrapper;
-    private ConnectionManagerFactory connectionManagerFactory;
+    private ConnectionManagerContainer connectionManagerContainer;
     private ManagedConnectionFactoryListener managedConnectionFactoryListener;
 
     private ManagedConnectionFactory managedConnectionFactory;
@@ -100,7 +100,7 @@
                                            String connectionImplClass,
                                            String globalJNDIName,
                                            ResourceAdapterWrapper resourceAdapterWrapper,
-                                           ConnectionManagerFactory connectionManagerFactory,
+                                           ConnectionManagerContainer connectionManagerContainer,
                                            ManagedConnectionFactoryListener managedConnectionFactoryListener,
                                            Kernel kernel,
                                            String objectName,
@@ -130,7 +130,7 @@
 
         this.globalJNDIName = globalJNDIName;
         this.resourceAdapterWrapper = resourceAdapterWrapper;
-        this.connectionManagerFactory = connectionManagerFactory;
+        this.connectionManagerContainer = connectionManagerContainer;
 
         //set up that must be done before start
         Class clazz = cl.loadClass(managedConnectionFactoryClass);
@@ -179,12 +179,12 @@
         this.resourceAdapterWrapper = resourceAdapterWrapper;
     }
 
-    public ConnectionManagerFactory getConnectionManagerFactory() {
-        return connectionManagerFactory;
+    public ConnectionManagerContainer getConnectionManagerFactory() {
+        return connectionManagerContainer;
     }
 
-    public void setConnectionManagerFactory(ConnectionManagerFactory connectionManagerFactory)
{
-        this.connectionManagerFactory = connectionManagerFactory;
+    public void setConnectionManagerFactory(ConnectionManagerContainer connectionManagerContainer)
{
+        this.connectionManagerContainer = connectionManagerContainer;
     }
 
     public void doStart() throws Exception {
@@ -203,7 +203,7 @@
         }
 
         //create a new ConnectionFactory
-        connectionFactory = connectionManagerFactory.createConnectionFactory(managedConnectionFactory);
+        connectionFactory = connectionManagerContainer.createConnectionFactory(managedConnectionFactory);
 
         //build proxy
         if (isProxyable) {
@@ -278,14 +278,14 @@
     //ResourceManager implementation
     public NamedXAResource getRecoveryXAResources() throws SystemException {
         try {
-            return connectionManagerFactory.getRecoveryXAResource(managedConnectionFactory);
+            return connectionManagerContainer.getRecoveryXAResource(managedConnectionFactory);
         } catch (ResourceException e) {
             throw (SystemException) new SystemException("Could not obtain recovery XAResource
for managedConnectionFactory " + objectName).initCause(e);
         }
     }
 
     public void returnResource(NamedXAResource xaResource) {
-        ((ConnectionManagerFactory.ReturnableXAResource) xaResource).returnConnection();
+        ((ConnectionManagerContainer.ReturnableXAResource) xaResource).returnConnection();
     }
 
     public static final GBeanInfo GBEAN_INFO;
@@ -310,7 +310,7 @@
         infoFactory.addInterface(ResourceManager.class);
 
         infoFactory.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class,
NameFactory.RESOURCE_ADAPTER);
-        infoFactory.addReference("ConnectionManagerFactory", ConnectionManagerFactory.class,
NameFactory.JCA_CONNECTION_MANAGER);
+        infoFactory.addReference("ConnectionManagerContainer", ConnectionManagerContainer.class,
NameFactory.JCA_CONNECTION_MANAGER);
         infoFactory.addReference("ManagedConnectionFactoryListener", ManagedConnectionFactoryListener.class,
NameFactory.SECURITY_REALM);
 
         infoFactory.setConstructor(new String[]{
@@ -322,7 +322,7 @@
             "connectionImplClass",
             "globalJNDIName",
             "ResourceAdapterWrapper",
-            "ConnectionManagerFactory",
+            "ConnectionManagerContainer",
             "ManagedConnectionFactoryListener",
             "kernel",
             "objectName",

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?view=diff&r1=157687&r2=157688
==============================================================================
--- 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
Tue Mar 15 21:12:15 2005
@@ -149,7 +149,7 @@
         GBeanData ctc = new GBeanData(ctcName, MockConnectionTrackingCoordinator.getGBeanInfo());
         kernel.loadGBean(ctc, cl);
 
-        cmfName = ObjectName.getInstance("test:role=ConnectionManagerFactory");
+        cmfName = ObjectName.getInstance("test:role=ConnectionManagerContainer");
         GBeanData cmf = new GBeanData(cmfName, GenericConnectionManager.getGBeanInfo());
         cmf.setAttribute("transactionSupport", NoTransactions.INSTANCE);
         cmf.setAttribute("pooling", new NoPool());
@@ -169,7 +169,7 @@
         mcfw.setAttribute("connectionImplClass", MockConnection.class.getName());
         mcfw.setAttribute("globalJNDIName", GLOBAL_NAME);
         //"ResourceAdapterWrapper",
-        mcfw.setReferencePatterns("ConnectionManagerFactory", Collections.singleton(cmfName));
+        mcfw.setReferencePatterns("ConnectionManagerContainer", Collections.singleton(cmfName));
         //"ManagedConnectionFactoryListener",
         kernel.loadGBean(mcfw, cl);
 



Mime
View raw message