geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1050995 - in /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src: main/java/org/apache/geronimo/connector/wrapper/ main/java/org/apache/geronimo/connector/wrapper/outbound/ main/java/org/apache/geronimo/connector/wrappe...
Date Mon, 20 Dec 2010 06:19:07 GMT
Author: xuhaihong
Date: Mon Dec 20 06:19:06 2010
New Revision: 1050995

URL: http://svn.apache.org/viewvc?rev=1050995&view=rev
Log:
No function change, just remove many unused import declarations

Modified:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
Mon Dec 20 06:19:06 2010
@@ -17,12 +17,11 @@
 
 package org.apache.geronimo.connector.wrapper;
 
-import org.apache.geronimo.bval.ValidatorFactoryGBean; 
+import org.apache.geronimo.bval.ValidatorFactoryGBean;
 import org.apache.geronimo.connector.ActivationSpecWrapper;
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
-import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -31,7 +30,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
- * 
+ *
  * @version $Revision$
  */
 
@@ -43,7 +42,7 @@ public class ActivationSpecWrapperGBean 
     public ActivationSpecWrapperGBean(@ParamAttribute(name="activationSpecClass")final String
activationSpecClass,
                                       @ParamAttribute(name="containerId")final String containerId,
                                       @ParamReference(name="ResourceAdapaterWrapper", namingType
= NameFactory.RESOURCE_ADAPTER)final ResourceAdapterWrapper resourceAdapterWrapper,
-                                      @ParamSpecial(type = SpecialAttributeType.classLoader)final
ClassLoader cl, 
+                                      @ParamSpecial(type = SpecialAttributeType.classLoader)final
ClassLoader cl,
                                       @ParamReference(name = "ValidatorFactory", namingType
= NameFactory.VALIDATOR_FACTORY) ValidatorFactoryGBean validatorFactory) throws IllegalAccessException,
InstantiationException, ClassNotFoundException {
         super(activationSpecClass, containerId, resourceAdapterWrapper, cl, validatorFactory
!= null ? validatorFactory.getFactory() : null);
         delegate = new DynamicGBeanDelegate();

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java
Mon Dec 20 06:19:06 2010
@@ -20,15 +20,8 @@ package org.apache.geronimo.connector.wr
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
-import javax.resource.spi.ResourceAdapterAssociation;
-import javax.validation.ConstraintViolation; 
-import javax.validation.ConstraintViolationException; 
-import javax.validation.Validator; 
-import javax.validation.ValidatorFactory; 
-
-import org.apache.geronimo.bval.ValidatorFactoryGBean; 
+import org.apache.geronimo.bval.ValidatorFactoryGBean;
 import org.apache.geronimo.connector.AdminObjectWrapper;
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
 import org.apache.geronimo.gbean.AbstractName;
@@ -77,11 +70,11 @@ public class AdminObjectWrapperGBean ext
             @ParamAttribute(name="adminObjectClass") String adminObjectClass,
             @ParamReference(name="ResourceAdapterWrapper", namingType = NameFactory.JCA_RESOURCE_ADAPTER)
ResourceAdapterWrapper resourceAdapterWrapper,
             @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
-            @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName abstractName,

-            @ParamSpecial(type = SpecialAttributeType.objectName) String objectName, 
-            @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader cl, 
+            @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName abstractName,
+            @ParamSpecial(type = SpecialAttributeType.objectName) String objectName,
+            @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader cl,
             @ParamReference(name = "ValidatorFactory", namingType = NameFactory.VALIDATOR_FACTORY)
ValidatorFactoryGBean validatorFactory) throws IllegalAccessException, InstantiationException,
ClassNotFoundException {
-        super(adminObjectInterface, adminObjectClass, resourceAdapterWrapper, cl, validatorFactory
== null ? null : validatorFactory.getFactory()); 
+        super(adminObjectInterface, adminObjectClass, resourceAdapterWrapper, cl, validatorFactory
== null ? null : validatorFactory.getFactory());
         this.kernel = kernel;
         this.abstractName = abstractName;
         this.objectName = objectName;

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java
Mon Dec 20 06:19:06 2010
@@ -20,10 +20,11 @@ package org.apache.geronimo.connector.wr
 import java.util.Map;
 
 import javax.resource.spi.XATerminator;
-import javax.resource.spi.work.WorkManager;
 import javax.transaction.TransactionSynchronizationRegistry;
 
-import org.apache.geronimo.bval.ValidatorFactoryGBean; 
+import org.apache.geronimo.bval.ValidatorFactoryGBean;
+import org.apache.geronimo.connector.GeronimoBootstrapContext;
+import org.apache.geronimo.connector.ResourceAdapterWrapper;
 import org.apache.geronimo.connector.work.GeronimoWorkManager;
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
@@ -36,11 +37,9 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
 import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
-import org.apache.geronimo.connector.ResourceAdapterWrapper;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
 
 /**
- * 
+ *
  * @version $Revision$
  */
 
@@ -63,7 +62,7 @@ public class ResourceAdapterWrapperGBean
             @ParamReference(name="TransactionManager", namingType = NameFactory.JTA_RESOURCE)RecoverableTransactionManager
transactionManager,
             @ParamReference(name="TransactionSynchronizationRegistry", namingType = NameFactory.JTA_RESOURCE)
TransactionSynchronizationRegistry transactionSynchronizationRegistry,
             @ParamSpecial(type= SpecialAttributeType.classLoader )ClassLoader cl,
-            @ParamSpecial(type= SpecialAttributeType.objectName )String objectName, 
+            @ParamSpecial(type= SpecialAttributeType.objectName )String objectName,
             @ParamReference(name = "ValidatorFactory", namingType = NameFactory.VALIDATOR_FACTORY)
ValidatorFactoryGBean validatorFactory) throws InstantiationException, IllegalAccessException,
ClassNotFoundException {
         super(objectName, resourceAdapterClass, messageListenerToActivationSpecMap, new GeronimoBootstrapContext(workManager,
xaTerminator, transactionSynchronizationRegistry), transactionManager, cl, validatorFactory
!= null ? validatorFactory.getFactory() : null);
         delegate = new DynamicGBeanDelegate();
@@ -93,7 +92,7 @@ public class ResourceAdapterWrapperGBean
     }
 
     public boolean isStatisticsProvider() {
-        return false;                 
+        return false;
     }
 
     public boolean isEventProvider() {

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
Mon Dec 20 06:19:06 2010
@@ -50,7 +50,6 @@ import org.apache.geronimo.naming.Resour
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 
 /**
  * @version $Revision$
@@ -77,9 +76,9 @@ public class GenericConnectionManagerGBe
         super(transactionSupport, pooling, getSubjectSource(containerManagedSecurity), connectionTracker,
transactionManager, managedConnectionFactoryWrapper.getManagedConnectionFactory(), objectName,
classLoader);
         this.kernel = kernel;
         this.abstractName = abstractName;
-        
+
         doRecovery();
-        
+
     }
 
     public GenericConnectionManagerGBean() {
@@ -142,5 +141,5 @@ public class GenericConnectionManagerGBe
     public Object $getResource() throws ResourceException {
         return createConnectionFactory();
     }
-    
+
 }

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
Mon Dec 20 06:19:06 2010
@@ -20,6 +20,7 @@ import java.util.Hashtable;
 
 import javax.management.ObjectName;
 import javax.resource.ResourceException;
+
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.OsgiService;
 import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -30,7 +31,6 @@ import org.apache.geronimo.j2ee.manageme
 import org.apache.geronimo.kernel.ObjectNameUtil;
 import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-import org.apache.geronimo.naming.ResourceSource;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceException;
 import org.osgi.framework.ServiceFactory;

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java
Mon Dec 20 06:19:06 2010
@@ -23,26 +23,22 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.resource.ResourceException;
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.resource.spi.ResourceAdapterAssociation;
-import javax.validation.ConstraintViolation; 
-import javax.validation.ConstraintViolationException; 
-import javax.validation.Validator; 
-import javax.validation.ValidatorFactory; 
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.geronimo.bval.ValidatorFactoryGBean; 
+import org.apache.geronimo.bval.ValidatorFactoryGBean;
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
-import org.apache.geronimo.connector.outbound.ConnectionManagerContainer;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.DynamicGBean;
 import org.apache.geronimo.gbean.DynamicGBeanDelegate;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.naming.ResourceSource;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -71,7 +67,7 @@ public class ManagedConnectionFactoryWra
     private final AbstractName abstractName;
     private final String objectName;
     private final ClassLoader classLoader;
-    private final ValidatorFactory validatorFactory; 
+    private final ValidatorFactory validatorFactory;
 
     //default constructor for enhancement proxy endpoint
     public ManagedConnectionFactoryWrapper() {
@@ -87,7 +83,7 @@ public class ManagedConnectionFactoryWra
         classLoader = null;
         resourceAdapterWrapper = null;
         jndiName = null;
-        validatorFactory = null; 
+        validatorFactory = null;
     }
 
     public ManagedConnectionFactoryWrapper(String managedConnectionFactoryClass,
@@ -101,7 +97,7 @@ public class ManagedConnectionFactoryWra
                                            Kernel kernel,
                                            AbstractName abstractName,
                                            String objectName,
-                                           ClassLoader cl, 
+                                           ClassLoader cl,
                                            ValidatorFactoryGBean validatorFactory) throws
InstantiationException, IllegalAccessException, ClassNotFoundException {
         this.managedConnectionFactoryClass = managedConnectionFactoryClass;
         this.connectionFactoryInterface = connectionFactoryInterface;
@@ -110,7 +106,7 @@ public class ManagedConnectionFactoryWra
         this.connectionInterface = connectionInterface;
         this.connectionImplClass = connectionImplClass;
         this.jndiName = jndiName;
-        this.validatorFactory = validatorFactory != null ? validatorFactory.getFactory()
: null; 
+        this.validatorFactory = validatorFactory != null ? validatorFactory.getFactory()
: null;
 
         for (String interfaceName: implementedInterfaces) {
             allImplementedInterfaces.add(cl.loadClass(interfaceName));
@@ -132,7 +128,7 @@ public class ManagedConnectionFactoryWra
     public String getJndiName() {
         return jndiName;
     }
-    
+
     public String getManagedConnectionFactoryClass() {
         return managedConnectionFactoryClass;
     }
@@ -162,14 +158,14 @@ public class ManagedConnectionFactoryWra
     }
 
     public void doStart() throws Exception {
-        // if we have a validator factory at this point, then validate 
-        // the resource adaptor instance 
+        // if we have a validator factory at this point, then validate
+        // the resource adaptor instance
         if (validatorFactory != null) {
-            Validator validator = validatorFactory.getValidator(); 
-            
+            Validator validator = validatorFactory.getValidator();
+
             Set generalSet = validator.validate(managedConnectionFactory);
             if (!generalSet.isEmpty()) {
-                throw new ConstraintViolationException("Constraint violation for ManagedConnectionFactory
" + managedConnectionFactoryClass, generalSet); 
+                throw new ConstraintViolationException("Constraint violation for ManagedConnectionFactory
" + managedConnectionFactoryClass, generalSet);
             }
         }
         //register with resource adapter

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
Mon Dec 20 06:19:06 2010
@@ -18,7 +18,6 @@ package org.apache.geronimo.connector.wr
 
 import org.apache.geronimo.bval.ValidatorFactoryGBean;
 import org.apache.geronimo.connector.ResourceAdapterWrapper;
-import org.apache.geronimo.connector.outbound.ConnectionManagerContainer;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -63,7 +62,7 @@ public class ManagedConnectionFactoryWra
             "kernel",
             "abstractName",
             "objectName",
-            "classLoader", 
+            "classLoader",
             "ValidatorFactory"
             });
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
Mon Dec 20 06:19:06 2010
@@ -17,21 +17,17 @@
 
 package org.apache.geronimo.connector.wrapper.outbound.connectiontracking;
 
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.transaction.manager.MonitorableTransactionManager;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
-import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
-import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
 
 /**
- * 
+ *
  * @version $Revision$
  */
 @GBean(j2eeType = NameFactory.JCA_CONNECTION_TRACKER)

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java
Mon Dec 20 06:19:06 2010
@@ -25,12 +25,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 import junit.framework.TestCase;
+
 import org.apache.geronimo.connector.mock.MockAdminObject;
 import org.apache.geronimo.connector.mock.MockAdminObjectImpl;
-import org.apache.geronimo.connector.wrapper.AdminObjectWrapperGBean;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
Mon Dec 20 06:19:06 2010
@@ -22,33 +22,30 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.resource.cci.Connection;
 import javax.resource.cci.ConnectionFactory;
 
 import junit.framework.TestCase;
+
 import org.apache.geronimo.connector.mock.ConnectionFactoryExtension;
 import org.apache.geronimo.connector.mock.MockConnection;
 import org.apache.geronimo.connector.mock.MockConnectionFactory;
 import org.apache.geronimo.connector.mock.MockManagedConnectionFactory;
+import org.apache.geronimo.connector.outbound.ConnectionInfo;
+import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
+import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
-import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
-import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
-import org.apache.geronimo.connector.outbound.ConnectionInfo;
-import org.apache.geronimo.connector.outbound.ConnectionReturnAction;
-import org.apache.geronimo.connector.wrapper.outbound.GenericConnectionManagerGBean;
-import org.apache.geronimo.connector.wrapper.outbound.ManagedConnectionFactoryWrapperGBean;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
-import org.apache.geronimo.kernel.basic.BasicKernel;
 import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.osgi.framework.BundleContext;

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java?rev=1050995&r1=1050994&r2=1050995&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
Mon Dec 20 06:19:06 2010
@@ -21,9 +21,8 @@
 package org.apache.geronimo.connector.wrapper.outbound.security;
 
 import junit.framework.TestCase;
+
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoFactory;
 
 /**
  * @version $Rev$ $Date$



Mime
View raw message