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/connector/src/java/org/apache/geronimo/connector/work/pool AbstractWorkExecutorPool.java ScheduleWorkExecutorPool.java StartWorkExecutorPool.java SyncWorkExecutorPool.java TimedOutPooledExecutor.java
Date Sun, 30 May 2004 19:03:36 GMT
djencks     2004/05/30 12:03:36

  Modified:    modules/connector/src/java/org/apache/geronimo/connector
                        BootstrapContext.java
                        ConnectorMethodInterceptor.java
                        ResourceAdapterWrapper.java
               modules/connector/src/java/org/apache/geronimo/connector/deployment
                        AbstractRARConfigBuilder.java RARConfiguration.java
                        RARConfigurer.java
               modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean
                        ConfigPropertySettings.java
                        ConnectionDefinitionInstance.java
                        ResourceAdapterDConfigRoot.java
                        ResourceAdapter_1_0DConfigRoot.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound
                        ConnectionTrackingInterceptor.java
                        GenericConnectionManager.java
                        GeronimoConnectionEventListener.java
                        ManagedConnectionFactoryWrapper.java
                        MultiPoolConnectionInterceptor.java
                        SubjectInterceptor.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig
                        LocalTransactions.java TransactionLog.java
                        XATransactions.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking
                        ConnectionTracker.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound/security
                        PasswordCredentialLoginModule.java
                        PasswordCredentialRealm.java
               modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog
                        JDBCLog.java LogXAResource.java
               modules/connector/src/java/org/apache/geronimo/connector/work
                        WorkerContext.java
               modules/connector/src/java/org/apache/geronimo/connector/work/pool
                        AbstractWorkExecutorPool.java
                        ScheduleWorkExecutorPool.java
                        StartWorkExecutorPool.java
                        SyncWorkExecutorPool.java
                        TimedOutPooledExecutor.java
  Log:
  optimize imports
  
  Revision  Changes    Path
  1.5       +3 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java
  
  Index: BootstrapContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BootstrapContext.java	10 Mar 2004 09:58:31 -0000	1.4
  +++ BootstrapContext.java	30 May 2004 19:03:36 -0000	1.5
  @@ -18,6 +18,7 @@
   package org.apache.geronimo.connector;
   
   import java.util.Timer;
  +
   import javax.resource.spi.UnavailableException;
   import javax.resource.spi.XATerminator;
   import javax.resource.spi.work.WorkManager;
  @@ -25,8 +26,8 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.gbean.GReferenceInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
  +import org.apache.geronimo.gbean.GReferenceInfo;
   
   /**
    * @version $Revision$ $Date$
  
  
  
  1.2       +4 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java
  
  Index: ConnectorMethodInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ConnectorMethodInterceptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectorMethodInterceptor.java	9 Mar 2004 20:15:43 -0000	1.1
  +++ ConnectorMethodInterceptor.java	30 May 2004 19:03:36 -0000	1.2
  @@ -17,10 +17,10 @@
   
   package org.apache.geronimo.connector;
   
  -import java.lang.reflect.Method;
  -import java.io.Serializable;
  -import java.io.ObjectStreamException;
   import java.io.InvalidObjectException;
  +import java.io.ObjectStreamException;
  +import java.io.Serializable;
  +import java.lang.reflect.Method;
   
   import javax.management.ObjectName;
   
  
  
  
  1.7       +2 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
  
  Index: ResourceAdapterWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourceAdapterWrapper.java	7 Apr 2004 06:54:57 -0000	1.6
  +++ ResourceAdapterWrapper.java	30 May 2004 19:03:36 -0000	1.7
  @@ -19,7 +19,6 @@
   
   import javax.resource.ResourceException;
   import javax.resource.spi.ActivationSpec;
  -import javax.resource.spi.ManagedConnectionFactory;
   import javax.resource.spi.ResourceAdapter;
   import javax.resource.spi.ResourceAdapterAssociation;
   import javax.resource.spi.endpoint.MessageEndpointFactory;
  @@ -32,8 +31,8 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
  -import org.apache.geronimo.gbean.GReferenceInfo;
   import org.apache.geronimo.gbean.GOperationInfo;
  +import org.apache.geronimo.gbean.GReferenceInfo;
   import org.apache.geronimo.gbean.WaitingException;
   
   /**
  
  
  
  1.17      +15 -15    incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigBuilder.java
  
  Index: AbstractRARConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigBuilder.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractRARConfigBuilder.java	6 May 2004 03:58:22 -0000	1.16
  +++ AbstractRARConfigBuilder.java	30 May 2004 19:03:36 -0000	1.17
  @@ -28,16 +28,26 @@
   import java.net.URI;
   import java.net.URISyntaxException;
   import java.net.URL;
  +import java.util.Collections;
   import java.util.jar.JarEntry;
   import java.util.jar.JarInputStream;
   import java.util.jar.JarOutputStream;
   import java.util.jar.Manifest;
  -import java.util.Collections;
   
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   
   import org.apache.geronimo.common.xml.XmlBeansUtil;
  +import org.apache.geronimo.connector.outbound.GenericConnectionManager;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionLog;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
   import org.apache.geronimo.deployment.ConfigurationBuilder;
   import org.apache.geronimo.deployment.DeploymentContext;
   import org.apache.geronimo.deployment.DeploymentException;
  @@ -51,22 +61,12 @@
   import org.apache.geronimo.gbean.jmx.GBeanMBean;
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.repository.Repository;
  +import org.apache.geronimo.xbeans.geronimo.GerConnectiondefinitionInstanceType;
  +import org.apache.geronimo.xbeans.geronimo.GerConnectionmanagerType;
   import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
   import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
  -import org.apache.geronimo.xbeans.geronimo.GerGbeanType;
   import org.apache.geronimo.xbeans.geronimo.GerDependencyType;
  -import org.apache.geronimo.xbeans.geronimo.GerConnectiondefinitionInstanceType;
  -import org.apache.geronimo.xbeans.geronimo.GerConnectionmanagerType;
  -import org.apache.geronimo.connector.outbound.GenericConnectionManager;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionLog;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
  +import org.apache.geronimo.xbeans.geronimo.GerGbeanType;
   import org.apache.xmlbeans.SchemaType;
   import org.apache.xmlbeans.SchemaTypeLoader;
   import org.apache.xmlbeans.XmlBeans;
  
  
  
  1.7       +2 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfiguration.java
  
  Index: RARConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfiguration.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RARConfiguration.java	10 Mar 2004 09:58:31 -0000	1.6
  +++ RARConfiguration.java	30 May 2004 19:03:36 -0000	1.7
  @@ -18,11 +18,9 @@
   package org.apache.geronimo.connector.deployment;
   
   import javax.enterprise.deploy.model.DeployableObject;
  -import javax.enterprise.deploy.spi.DConfigBeanRoot;
   
  -import org.apache.geronimo.deployment.plugin.DeploymentConfigurationSupport;
   import org.apache.geronimo.deployment.plugin.DConfigBeanRootSupport;
  -import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapterDConfigRoot;
  +import org.apache.geronimo.deployment.plugin.DeploymentConfigurationSupport;
   
   /**
    *
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
  
  Index: RARConfigurer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RARConfigurer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RARConfigurer.java	10 Mar 2004 09:58:31 -0000	1.5
  +++ RARConfigurer.java	30 May 2004 19:03:36 -0000	1.6
  @@ -21,11 +21,11 @@
   import javax.enterprise.deploy.shared.ModuleType;
   import javax.enterprise.deploy.spi.DeploymentConfiguration;
   
  +import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapterDConfigRoot;
  +import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapter_1_0DConfigRoot;
   import org.apache.geronimo.deployment.ModuleConfigurer;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  -import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapterDConfigRoot;
  -import org.apache.geronimo.connector.deployment.dconfigbean.ResourceAdapter_1_0DConfigRoot;
   
   /**
    *
  
  
  
  1.7       +5 -5      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettings.java
  
  Index: ConfigPropertySettings.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettings.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ConfigPropertySettings.java	10 Mar 2004 09:58:31 -0000	1.6
  +++ ConfigPropertySettings.java	30 May 2004 19:03:36 -0000	1.7
  @@ -17,14 +17,14 @@
   
   package org.apache.geronimo.connector.deployment.dconfigbean;
   
  +import javax.enterprise.deploy.model.DDBean;
  +import javax.enterprise.deploy.model.XpathEvent;
  +import javax.enterprise.deploy.model.XpathListener;
  +
   import org.apache.geronimo.deployment.plugin.XmlBeanSupport;
   import org.apache.geronimo.xbeans.geronimo.GerConfigPropertySettingType;
   import org.apache.xmlbeans.SchemaTypeLoader;
   import org.apache.xmlbeans.XmlBeans;
  -
  -import javax.enterprise.deploy.model.DDBean;
  -import javax.enterprise.deploy.model.XpathListener;
  -import javax.enterprise.deploy.model.XpathEvent;
   
   /**
    * @version $Revision 1.0$  $Date$
  
  
  
  1.10      +1 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java
  
  Index: ConnectionDefinitionInstance.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ConnectionDefinitionInstance.java	6 May 2004 03:58:22 -0000	1.9
  +++ ConnectionDefinitionInstance.java	30 May 2004 19:03:36 -0000	1.10
  @@ -17,8 +17,6 @@
   
   package org.apache.geronimo.connector.deployment.dconfigbean;
   
  -import java.math.BigInteger;
  -
   import javax.enterprise.deploy.model.DDBean;
   import javax.enterprise.deploy.model.XpathListener;
   
  
  
  
  1.9       +3 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java
  
  Index: ResourceAdapterDConfigRoot.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ResourceAdapterDConfigRoot.java	10 Mar 2004 09:58:31 -0000	1.8
  +++ ResourceAdapterDConfigRoot.java	30 May 2004 19:03:36 -0000	1.9
  @@ -17,11 +17,11 @@
   
   package org.apache.geronimo.connector.deployment.dconfigbean;
   
  -import java.io.InputStream;
   import java.io.IOException;
  +import java.io.InputStream;
   
  -import javax.enterprise.deploy.model.DDBeanRoot;
   import javax.enterprise.deploy.model.DDBean;
  +import javax.enterprise.deploy.model.DDBeanRoot;
   import javax.enterprise.deploy.spi.DConfigBean;
   import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
   
  
  
  
  1.6       +1 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java
  
  Index: ResourceAdapter_1_0DConfigRoot.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourceAdapter_1_0DConfigRoot.java	10 Mar 2004 09:58:31 -0000	1.5
  +++ ResourceAdapter_1_0DConfigRoot.java	30 May 2004 19:03:36 -0000	1.6
  @@ -31,7 +31,6 @@
   import org.apache.geronimo.xbeans.geronimo.GerVersionType;
   import org.apache.xmlbeans.SchemaTypeLoader;
   import org.apache.xmlbeans.XmlException;
  -import org.apache.xmlbeans.XmlBeans;
   
   /**
    *
  
  
  
  1.10      +1 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionTrackingInterceptor.java
  
  Index: ConnectionTrackingInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionTrackingInterceptor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ConnectionTrackingInterceptor.java	24 May 2004 19:10:34 -0000	1.9
  +++ ConnectionTrackingInterceptor.java	30 May 2004 19:03:36 -0000	1.10
  @@ -19,7 +19,6 @@
   
   import java.util.Collection;
   import java.util.Iterator;
  -import java.util.Set;
   
   import javax.resource.ResourceException;
   import javax.resource.spi.DissociatableManagedConnection;
  
  
  
  1.3       +2 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
  
  Index: GenericConnectionManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GenericConnectionManager.java	24 May 2004 19:10:34 -0000	1.2
  +++ GenericConnectionManager.java	30 May 2004 19:03:36 -0000	1.3
  @@ -18,10 +18,8 @@
   package org.apache.geronimo.connector.outbound;
   
   import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PartitionedPool;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
   import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
  -import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
  +import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
   import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
  
  
  
  1.4       +1 -0      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java
  
  Index: GeronimoConnectionEventListener.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GeronimoConnectionEventListener.java	10 Mar 2004 09:58:32 -0000	1.3
  +++ GeronimoConnectionEventListener.java	30 May 2004 19:03:36 -0000	1.4
  @@ -19,6 +19,7 @@
   
   import java.util.ArrayList;
   import java.util.List;
  +
   import javax.resource.spi.ConnectionEvent;
   import javax.resource.spi.ConnectionEventListener;
   
  
  
  
  1.9       +4 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
  
  Index: ManagedConnectionFactoryWrapper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ManagedConnectionFactoryWrapper.java	7 Apr 2004 06:54:57 -0000	1.8
  +++ ManagedConnectionFactoryWrapper.java	30 May 2004 19:03:36 -0000	1.9
  @@ -17,17 +17,17 @@
   
   package org.apache.geronimo.connector.outbound;
   
  +import javax.management.ObjectName;
   import javax.naming.NamingException;
   import javax.resource.spi.ManagedConnectionFactory;
   import javax.resource.spi.ResourceAdapterAssociation;
  -import javax.management.ObjectName;
   
   import net.sf.cglib.proxy.Callback;
   import net.sf.cglib.proxy.Enhancer;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.geronimo.connector.ResourceAdapterWrapper;
   import org.apache.geronimo.connector.ConnectorMethodInterceptor;
  +import org.apache.geronimo.connector.ResourceAdapterWrapper;
   import org.apache.geronimo.connector.outbound.security.ManagedConnectionFactoryListener;
   import org.apache.geronimo.gbean.DynamicGBean;
   import org.apache.geronimo.gbean.DynamicGBeanDelegate;
  @@ -37,8 +37,8 @@
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.gbean.GConstructorInfo;
   import org.apache.geronimo.gbean.WaitingException;
  -import org.apache.geronimo.naming.geronimo.GeronimoContextManager;
   import org.apache.geronimo.kernel.KernelMBean;
  +import org.apache.geronimo.naming.geronimo.GeronimoContextManager;
   
   /**
    *
  
  
  
  1.5       +2 -1      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java
  
  Index: MultiPoolConnectionInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MultiPoolConnectionInterceptor.java	6 May 2004 03:58:22 -0000	1.4
  +++ MultiPoolConnectionInterceptor.java	30 May 2004 19:03:36 -0000	1.5
  @@ -21,6 +21,7 @@
   
   import java.util.HashMap;
   import java.util.Map;
  +
   import javax.resource.ResourceException;
   import javax.resource.spi.ConnectionRequestInfo;
   import javax.security.auth.Subject;
  
  
  
  1.6       +2 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java
  
  Index: SubjectInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SubjectInterceptor.java	24 May 2004 19:10:34 -0000	1.5
  +++ SubjectInterceptor.java	30 May 2004 19:03:36 -0000	1.6
  @@ -22,8 +22,8 @@
   import javax.security.auth.Subject;
   import javax.security.auth.login.LoginException;
   
  -import org.apache.geronimo.security.bridge.RealmBridge;
   import org.apache.geronimo.security.ContextManager;
  +import org.apache.geronimo.security.bridge.RealmBridge;
   
   /**
    * SubjectInterceptor.java
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java
  
  Index: LocalTransactions.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalTransactions.java	6 May 2004 03:58:22 -0000	1.1
  +++ LocalTransactions.java	30 May 2004 19:03:36 -0000	1.2
  @@ -19,8 +19,8 @@
   
   import org.apache.geronimo.connector.outbound.ConnectionInterceptor;
   import org.apache.geronimo.connector.outbound.LocalXAResourceInsertionInterceptor;
  -import org.apache.geronimo.connector.outbound.TransactionEnlistingInterceptor;
   import org.apache.geronimo.connector.outbound.TransactionCachingInterceptor;
  +import org.apache.geronimo.connector.outbound.TransactionEnlistingInterceptor;
   
   /**
    *
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java
  
  Index: TransactionLog.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransactionLog.java	6 May 2004 03:58:22 -0000	1.1
  +++ TransactionLog.java	30 May 2004 19:03:36 -0000	1.2
  @@ -18,8 +18,8 @@
   package org.apache.geronimo.connector.outbound.connectionmanagerconfig;
   
   import org.apache.geronimo.connector.outbound.ConnectionInterceptor;
  -import org.apache.geronimo.connector.outbound.TransactionEnlistingInterceptor;
   import org.apache.geronimo.connector.outbound.TransactionCachingInterceptor;
  +import org.apache.geronimo.connector.outbound.TransactionEnlistingInterceptor;
   import org.apache.geronimo.connector.outbound.transactionlog.LogXAResourceInsertionInterceptor;
   
   /**
  
  
  
  1.3       +4 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java
  
  Index: XATransactions.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XATransactions.java	24 May 2004 19:10:34 -0000	1.2
  +++ XATransactions.java	30 May 2004 19:03:36 -0000	1.3
  @@ -18,10 +18,10 @@
   package org.apache.geronimo.connector.outbound.connectionmanagerconfig;
   
   import org.apache.geronimo.connector.outbound.ConnectionInterceptor;
  -import org.apache.geronimo.connector.outbound.XAResourceInsertionInterceptor;
  -import org.apache.geronimo.connector.outbound.TransactionEnlistingInterceptor;
  -import org.apache.geronimo.connector.outbound.TransactionCachingInterceptor;
   import org.apache.geronimo.connector.outbound.ThreadLocalCachingConnectionInterceptor;
  +import org.apache.geronimo.connector.outbound.TransactionCachingInterceptor;
  +import org.apache.geronimo.connector.outbound.TransactionEnlistingInterceptor;
  +import org.apache.geronimo.connector.outbound.XAResourceInsertionInterceptor;
   
   /**
    *
  
  
  
  1.6       +1 -2      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java
  
  Index: ConnectionTracker.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTracker.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConnectionTracker.java	24 May 2004 19:10:34 -0000	1.5
  +++ ConnectionTracker.java	30 May 2004 19:03:36 -0000	1.6
  @@ -19,7 +19,6 @@
   
   import org.apache.geronimo.connector.outbound.ConnectionInfo;
   import org.apache.geronimo.connector.outbound.ConnectionTrackingInterceptor;
  -import org.apache.geronimo.transaction.TransactionContext;
   
   /**
    *
  
  
  
  1.4       +2 -1      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModule.java
  
  Index: PasswordCredentialLoginModule.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModule.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PasswordCredentialLoginModule.java	10 Mar 2004 09:58:33 -0000	1.3
  +++ PasswordCredentialLoginModule.java	30 May 2004 19:03:36 -0000	1.4
  @@ -19,6 +19,7 @@
   
   import java.io.IOException;
   import java.util.Map;
  +
   import javax.resource.spi.security.PasswordCredential;
   import javax.security.auth.Subject;
   import javax.security.auth.callback.Callback;
  
  
  
  1.7       +2 -1      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java
  
  Index: PasswordCredentialRealm.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialRealm.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PasswordCredentialRealm.java	10 Mar 2004 19:21:17 -0000	1.6
  +++ PasswordCredentialRealm.java	30 May 2004 19:03:36 -0000	1.7
  @@ -20,6 +20,7 @@
   import java.util.HashMap;
   import java.util.Map;
   import java.util.Set;
  +
   import javax.resource.spi.ManagedConnectionFactory;
   import javax.security.auth.login.AppConfigurationEntry;
   
  
  
  
  1.2       +4 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java
  
  Index: JDBCLog.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/JDBCLog.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JDBCLog.java	6 May 2004 03:58:23 -0000	1.1
  +++ JDBCLog.java	30 May 2004 19:03:36 -0000	1.2
  @@ -27,15 +27,15 @@
   import javax.sql.DataSource;
   import javax.transaction.xa.Xid;
   
  -import org.apache.geronimo.gbean.GBeanInfo;
  -import org.apache.geronimo.gbean.GBeanInfoFactory;
  +import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
   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.WaitingException;
   import org.apache.geronimo.transaction.manager.LogException;
   import org.apache.geronimo.transaction.manager.TransactionLog;
   import org.apache.geronimo.transaction.manager.XidImpl;
  -import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
   
   /**
    *
  
  
  
  1.2       +4 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java
  
  Index: LogXAResource.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LogXAResource.java	6 May 2004 03:58:23 -0000	1.1
  +++ LogXAResource.java	30 May 2004 19:03:36 -0000	1.2
  @@ -17,11 +17,11 @@
   
   package org.apache.geronimo.connector.outbound.transactionlog;
   
  -import javax.transaction.xa.XAResource;
  -import javax.transaction.xa.Xid;
  -import javax.transaction.xa.XAException;
   import javax.resource.ResourceException;
   import javax.resource.spi.LocalTransaction;
  +import javax.transaction.xa.XAException;
  +import javax.transaction.xa.XAResource;
  +import javax.transaction.xa.Xid;
   
   /**
    *
  
  
  
  1.6       +2 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
  
  Index: WorkerContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WorkerContext.java	8 Apr 2004 20:35:32 -0000	1.5
  +++ WorkerContext.java	30 May 2004 19:03:36 -0000	1.6
  @@ -26,11 +26,10 @@
   import javax.resource.spi.work.WorkListener;
   import javax.resource.spi.work.WorkRejectedException;
   
  +import EDU.oswego.cs.dl.util.concurrent.Latch;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.transaction.XAWork;
  -
  -import EDU.oswego.cs.dl.util.concurrent.Latch;
   
   /**
    * Work wrapper providing an execution context to a Work instance.
  
  
  
  1.4       +2 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/AbstractWorkExecutorPool.java
  
  Index: AbstractWorkExecutorPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/AbstractWorkExecutorPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractWorkExecutorPool.java	10 Mar 2004 09:58:33 -0000	1.3
  +++ AbstractWorkExecutorPool.java	30 May 2004 19:03:36 -0000	1.4
  @@ -20,9 +20,8 @@
   import javax.resource.spi.work.WorkCompletedException;
   import javax.resource.spi.work.WorkException;
   
  -import org.apache.geronimo.connector.work.WorkerContext;
  -
   import EDU.oswego.cs.dl.util.concurrent.Channel;
  +import org.apache.geronimo.connector.work.WorkerContext;
   
   /**
    * Based class for WorkExecutorPool. Sub-classes define the synchronization
  
  
  
  1.4       +2 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutorPool.java
  
  Index: ScheduleWorkExecutorPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutorPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ScheduleWorkExecutorPool.java	10 Mar 2004 09:58:33 -0000	1.3
  +++ ScheduleWorkExecutorPool.java	30 May 2004 19:03:36 -0000	1.4
  @@ -19,9 +19,8 @@
   
   import javax.resource.spi.work.WorkException;
   
  -import org.apache.geronimo.connector.work.WorkerContext;
  -
   import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
  +import org.apache.geronimo.connector.work.WorkerContext;
   
   /**
    * WorkExecutorPool handling the submitted Work instances asynchronously.
  
  
  
  1.4       +2 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/StartWorkExecutorPool.java
  
  Index: StartWorkExecutorPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/StartWorkExecutorPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StartWorkExecutorPool.java	10 Mar 2004 09:58:33 -0000	1.3
  +++ StartWorkExecutorPool.java	30 May 2004 19:03:36 -0000	1.4
  @@ -19,10 +19,9 @@
   
   import javax.resource.spi.work.WorkException;
   
  -import org.apache.geronimo.connector.work.WorkerContext;
  -
   import EDU.oswego.cs.dl.util.concurrent.Latch;
   import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
  +import org.apache.geronimo.connector.work.WorkerContext;
   
   /**
    * WorkExecutorPool handling the submitted Work instances synchronously
  
  
  
  1.4       +2 -3      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutorPool.java
  
  Index: SyncWorkExecutorPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutorPool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SyncWorkExecutorPool.java	10 Mar 2004 09:58:33 -0000	1.3
  +++ SyncWorkExecutorPool.java	30 May 2004 19:03:36 -0000	1.4
  @@ -19,9 +19,8 @@
   
   import javax.resource.spi.work.WorkException;
   
  -import org.apache.geronimo.connector.work.WorkerContext;
  -
   import EDU.oswego.cs.dl.util.concurrent.Latch;
  +import org.apache.geronimo.connector.work.WorkerContext;
   
   /**
    * WorkExecutorPool handling the submitted Work instances synchronously.
  
  
  
  1.4       +3 -4      incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/TimedOutPooledExecutor.java
  
  Index: TimedOutPooledExecutor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/pool/TimedOutPooledExecutor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TimedOutPooledExecutor.java	10 Mar 2004 09:58:33 -0000	1.3
  +++ TimedOutPooledExecutor.java	30 May 2004 19:03:36 -0000	1.4
  @@ -17,10 +17,9 @@
   
   package org.apache.geronimo.connector.work.pool;
   
  -import org.apache.geronimo.connector.work.WorkerContext;
  -
   import EDU.oswego.cs.dl.util.concurrent.Channel;
   import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
  +import org.apache.geronimo.connector.work.WorkerContext;
   
   /**
    * PooledExecutor enforcing a timed out "blocked execution policy". The works
  
  
  

Mime
View raw message