geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r430508 [1/5] - in /geronimo/trunk: ./ applications/magicGball/magicGball-ear/src/plan/ applications/magicGball/src/plan/ configs/client-corba/src/plan/ configs/client-deployer/src/plan/ configs/client/src/plan/ configs/j2ee-corba/src/plan/...
Date Thu, 10 Aug 2006 19:56:58 GMT
Author: dain
Date: Thu Aug 10 12:56:47 2006
New Revision: 430508

URL: http://svn.apache.org/viewvc?rev=430508&view=rev
Log:
GERONIMO-2277 Remove TransactionContextManager

Added:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectionReleaser.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/ConnectionReleaser.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ConnectorTransactionContext.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/ConnectorTransactionContext.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/GeronimoBootstrapContext.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/GeronimoBootstrapContextGBean.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/GeronimoBootstrapContextGBean.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/TxUtil.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/TxUtil.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectorInstanceContext.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectorInstanceContext.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectorInstanceContextImpl.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectorInstanceContextImpl.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/GeronimoTransactionListener.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/TrackedConnectionAssociator.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/TrackedConnectionAssociator.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/pool/NamedRunnable.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/connector/src/java/org/apache/geronimo/connector/work/pool/NamedRunnable.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoUserTransaction.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoUserTransaction.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLogGBean.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManager.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/ImportedTransactionActiveException.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/manager/ImportedTransactionActiveException.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/MonitorableTransactionManager.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/manager/MonitorableTransactionManager.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerMonitor.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerMonitor.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XAWork.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XAWork.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/GeronimoTransactionManagerTest.java
      - copied unchanged from r430092, geronimo/branches/dain/notcm/modules/transaction/src/test/org/apache/geronimo/transaction/context/GeronimoTransactionManagerTest.java
Removed:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContext.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContextGBean.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/BootstrapContextImpl.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/TransactionContextBeforeAfter.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/interceptor/TransactionContextBeforeAfter.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/ConnectionReleaser.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/DefaultInstanceContext.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/DoubleKeyedHashMap.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/ExtendedTransactionManager.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/ImportedTransactionActiveException.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/InstanceContext.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/TrackedConnectionAssociator.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/XAWork.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/context/TransactionContextManagerTest.java
Modified:
    geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-nosec-plan.xml
    geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-plan.xml
    geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
    geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
    geronimo/trunk/bootstrap
    geronimo/trunk/configs/client-corba/src/plan/plan.xml
    geronimo/trunk/configs/client-deployer/src/plan/plan.xml
    geronimo/trunk/configs/client/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-system/pom.xml
    geronimo/trunk/configs/online-deployer/pom.xml
    geronimo/trunk/configs/openejb/src/plan/plan.xml
    geronimo/trunk/configs/rmi-naming/pom.xml
    geronimo/trunk/configs/rmi-naming/project.xml
    geronimo/trunk/configs/system-database/src/plan/plan.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/maven.xml
    geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/AxisServiceReference.java
    geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java
    geronimo/trunk/modules/axis/src/plans/plan1.xml
    geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
    geronimo/trunk/modules/connector-builder/project.xml
    geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
    geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
    geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
    geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml
    geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml
    geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
    geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/trunk/modules/connector/project.xml
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/AdminObjectSource.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterModuleImpl.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapper.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ConnectionFactorySource.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/TransactionCachingInterceptor.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptor.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/LocalTransactions.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/NoTransactions.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionLog.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/TransactionSupport.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectionmanagerconfig/XATransactions.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/WorkerContext.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/pool/ScheduleWorkExecutor.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/pool/StartWorkExecutor.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/pool/SyncWorkExecutor.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/pool/WorkExecutor.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/AdminObjectWrapperTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/BootstrapContextTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerStressTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ConnectionManagerTestUtils.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/PoolResizeTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionCachingInterceptorTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/TransactionEnlistingInterceptorTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorTest.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultComponentInterceptor.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/connectiontracking/DefaultInterceptor.java
    geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/work/PooledWorkManagerTest.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
    geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/trunk/modules/j2ee-schema/project.xml
    geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
    geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/JVMTest.java
    geronimo/trunk/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/ServerTest.java
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/trunk/modules/jetty/project.xml
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyPOJOWebServiceHolder.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationHandler.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/InstanceContextBeforeAfter.java
    geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfo.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanReference.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyFactory.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Artifact.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/Environment.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/Speed.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanAttributeTest.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/gbean/runtime/GBeanDependencyTest.java
    geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/ConfigTest.java
    geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAConnectionFactory.java
    geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/ResourceAdapter.java
    geronimo/trunk/modules/naming-builder/project.xml
    geronimo/trunk/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/client/JaasLoginCoordinator.java
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyManager.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/JMXProxyMethodInterceptor.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/JMXUtil.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/LocalServer.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
    geronimo/trunk/modules/timer/project.xml
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTaskFactory.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/ThreadPooledTimer.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTask.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTaskFactory.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
    geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/AbstractThreadPooledTimerTest.java
    geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/NontransactionalThreadPooledTimerTest.java
    geronimo/trunk/modules/timer/src/test/org/apache/geronimo/timer/TransactionalThreadPooledTimerTest.java
    geronimo/trunk/modules/tomcat-builder/project.xml
    geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/trunk/modules/tomcat/project.xml
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContext.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/interceptor/InstanceContextBeforeAfter.java
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
    geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/JAASSecurityTest.java
    geronimo/trunk/modules/transaction/pom.xml
    geronimo/trunk/modules/transaction/project.xml
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidImporter.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/log/HOWLLogTest.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/HOWLLogRecoveryTest.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/ProtocolTest.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/TestTransactionManager.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XATransactionTester.java
    geronimo/trunk/modules/transaction/src/test/org/apache/geronimo/transaction/manager/XidImporterTest.java
    geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/trunk/modules/upgrade/src/java/org/apache/geronimo/upgrade/UpgradeGBean.java
    geronimo/trunk/modules/upgrade/src/test-data/ejb_pkgen_1.xml
    geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoCopier.java
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/test/org/apache/geronimo/plugin/packaging/PlanProcessorTest.java
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-nosec-plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-nosec-plan.xml Thu Aug 10 12:56:47 2006
@@ -116,8 +116,8 @@
                 <reference name="ThreadPool">
                     <name>DefaultThreadPool</name>
                 </reference>
-                <reference name="TransactionContextManager">
-                    <name>TransactionContextManager</name>
+                <reference name="TransactionManager">
+                    <name>TransactionManager</name>
                 </reference>
                 <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
                 <attribute name="description">NoSecurity</attribute>

Modified: geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/magicGball-ear/src/plan/magicgball-corba-plan.xml Thu Aug 10 12:56:47 2006
@@ -118,8 +118,8 @@
                 <reference name="ThreadPool">
                     <name>DefaultThreadPool</name>
                 </reference>
-                <reference name="TransactionContextManager">
-                    <name>TransactionContextManager</name>
+                <reference name="TransactionManager">
+                    <name>TransactionManager</name>
                 </reference>
                 <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
                 <attribute name="description">SSLClientPassword</attribute>

Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml Thu Aug 10 12:56:47 2006
@@ -116,8 +116,8 @@
                 <reference name="ThreadPool">
                     <name>DefaultThreadPool</name>
                 </reference>
-                <reference name="TransactionContextManager">
-                    <name>TransactionContextManager</name>
+                <reference name="TransactionManager">
+                    <name>TransactionManager</name>
                 </reference>
                 <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
                 <attribute name="description">NoSecurity</attribute>

Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml Thu Aug 10 12:56:47 2006
@@ -118,8 +118,8 @@
                 <reference name="ThreadPool">
                     <name>DefaultThreadPool</name>
                 </reference>
-                <reference name="TransactionContextManager">
-                    <name>TransactionContextManager</name>
+                <reference name="TransactionManager">
+                    <name>TransactionManager</name>
                 </reference>
                 <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
                 <attribute name="description">SSLClientPassword</attribute>

Modified: geronimo/trunk/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/trunk/bootstrap?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/bootstrap (original)
+++ geronimo/trunk/bootstrap Thu Aug 10 12:56:47 2006
@@ -82,7 +82,7 @@
     (
         cd "$DIRNAME/thirdparty"
         
-        svn co http://svn.codehaus.org/openejb/trunk/openejb2 openejb2
+        svn co http://svn.codehaus.org/openejb/branches/dain-2.2-merge/notcm openejb2
         (
             cd openejb2
             mvn -Dmaven.test.skip=true install

Modified: geronimo/trunk/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-corba/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -68,9 +68,9 @@
             <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
+        <reference name="TransactionManager">
             <module>geronimo/client/${pom.currentVersion}/car</module>
-            <name>TransactionContextManager</name>
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">SSLClientCert</attribute>
@@ -110,9 +110,9 @@
             <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
+        <reference name="TransactionManager">
             <module>geronimo/client/${pom.currentVersion}/car</module>
-            <name>TransactionContextManager</name>
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">SSLClientPassword</attribute>
@@ -152,9 +152,9 @@
             <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
+        <reference name="TransactionManager">
             <module>geronimo/client/${pom.currentVersion}/car</module>
-            <name>TransactionContextManager</name>
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">NoSecurity</attribute>

Modified: geronimo/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-deployer/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -21,7 +21,7 @@
         >
 
     <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="transactionContextManagerObjectName">?name=TransactionContextManager</attribute>
+        <attribute name="transactionManagerObjectName">?name=TransactionManager</attribute>
         <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
         <attribute name="corbaGBeanObjectName">?name=Server</attribute>
         <references name="EJBReferenceBuilder">

Modified: geronimo/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -41,8 +41,10 @@
         <attribute name="poolName">DefaultThreadPool</attribute>
     </gbean>
 
-    <gbean name="ConnectionTracker"
-           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
@@ -55,8 +57,8 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
     </gbean>
 
@@ -64,7 +66,7 @@
         <attribute name="tmId">71,84,77,73,68</attribute>
     </gbean>
 
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
         <!--no transaction log on the client-->
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
         <reference name="XidFactory">
@@ -78,16 +80,6 @@
                 <type>ActivationSpec</type>
             </pattern>
         </references>
-    </gbean>
-
-    <gbean name="TransactionContextManager"
-           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager">
-            <name>TransactionManager</name>
-        </reference>
-        <reference name="XidImporter">
-            <name>TransactionManager</name>
-        </reference>
     </gbean>
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>

Modified: geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -301,8 +301,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">SSLClientCert</attribute>
@@ -342,8 +342,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">SSLClientPassword</attribute>
@@ -384,8 +384,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">SSLIdentityTokenPrincipal</attribute>
@@ -425,8 +425,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">SSLIdentityTokenCert</attribute>
@@ -466,8 +466,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">NoSecurityIdentityTokenPrincipal</attribute>
@@ -503,8 +503,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">NoSecurityIdentityTokenCert</attribute>
@@ -540,8 +540,8 @@
         <reference name="ThreadPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
         <attribute name="description">NoSecurity</attribute>

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -23,7 +23,6 @@
         <!--domain set to wildcard so datasources may be deployed independently on client. -->
         <!--a better solution is to get the domain and server from the parent module -->
         <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
-        <attribute name="transactionContextManagerAbstractName">?name=TransactionContextManager</attribute>
         <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
         <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>
         <attribute name="nonTransactionalTimerAbstractName">?name=NonTransactionalThreadPooledTimer</attribute>

Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/project.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Thu Aug 10 12:56:47 2006
@@ -79,9 +79,6 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-connector</artifactId>
             <version>${geronimo_version}</version>
-            <properties>
-                 <geronimo.dependency>true</geronimo.dependency>
-             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -28,8 +28,10 @@
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
-    <gbean name="ConnectionTracker"
-           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="ConnectorThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -48,12 +50,12 @@
         <reference name="ScheduledPool">
             <name>ConnectorThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
     </gbean>
 
-    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
+    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLogGBean">
         <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
         <attribute name="bufferSizeKBytes">32</attribute>
         <attribute name="checksumEnabled">true</attribute>
@@ -78,7 +80,7 @@
         <attribute name="tmId">71,84,77,73,68</attribute>
     </gbean>
 
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
         <reference name="XidFactory">
             <name>XidFactory</name>
@@ -94,16 +96,6 @@
                 <type>ActivationSpec</type>
             </pattern>
         </references>
-    </gbean>
-
-    <gbean name="TransactionContextManager"
-           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager">
-            <name>TransactionManager</name>
-        </reference>
-        <reference name="XidImporter">
-            <name>TransactionManager</name>
-        </reference>
     </gbean>
 
     <!-- JSR77 Management Objects -->

Modified: geronimo/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/pom.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-system/pom.xml Thu Aug 10 12:56:47 2006
@@ -68,6 +68,7 @@
                         <element>../lib/geronimo-kernel-${pom.version}.jar</element>
                         <element>../lib/geronimo-system-${pom.version}.jar</element>
                         <element>../lib/geronimo-util-${pom.version}.jar</element>
+                        <element>../lib/backport-util-concurrent-${backportUtilVersion}.jar</element>
                         <element>../lib/cglib-nodep-${cglibVersion}.jar</element>
                         <element>../lib/concurrent-${concurrentVersion}.jar</element>
                         <element>../lib/commons-cli-${commonsCliVersion}.jar</element>

Modified: geronimo/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/pom.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/trunk/configs/online-deployer/pom.xml Thu Aug 10 12:56:47 2006
@@ -40,11 +40,11 @@
                 <configuration>
                     <classPath>
                         <element>../lib/geronimo-deployment-${pom.version}.jar</element>
-                        <element>../lib/xpp3-${xpp3Version}.jar</element>
-                        <element>../lib/xstream-${xstreamVersion}.jar</element>
+                        <element>../lib/xpp3-${xpp3_version}.jar</element>
+                        <element>../lib/xstream-${xstream_version}.jar</element>
                         <element>../lib/geronimo-deploy-jsr88-${pom.version}.jar</element>
                         <element>../lib/geronimo-deploy-tool-${pom.version}.jar</element>
-                        <element>../lib/geronimo-j2ee-deployment_1.1_spec-${geronimoSpecJ2eeDeploymentVersion}.jar</element>
+                        <element>../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar</element>
                         <element>../lib/geronimo-common-${pom.version}.jar</element>
                         <element>../lib/geronimo-kernel-${pom.version}.jar</element>
                         <element>../lib/geronimo-system-${pom.version}.jar</element>

Modified: geronimo/trunk/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -28,8 +28,8 @@
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
   <gbean name="StatelessEjbContainer" class="org.openejb.slsb.DefaultStatelessEjbContainerGBean">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="TrackedConnectionAssociator">
       <name>ConnectionTracker</name>
@@ -46,8 +46,8 @@
   </gbean>
 
   <gbean name="StatefulEjbContainer" class="org.openejb.sfsb.DefaultStatefulEjbContainerGBean">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="TrackedConnectionAssociator">
       <name>ConnectionTracker</name>
@@ -58,8 +58,8 @@
   </gbean>
 
   <gbean name="BmpEjbContainer" class="org.openejb.entity.bmp.DefaultBmpEjbContainerGBean">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="TrackedConnectionAssociator">
       <name>ConnectionTracker</name>
@@ -76,8 +76,8 @@
   </gbean>
 
   <gbean name="CmpEjbContainer" class="org.openejb.entity.cmp.DefaultCmpEjbContainerGBean">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="TrackedConnectionAssociator">
       <name>ConnectionTracker</name>
@@ -94,8 +94,8 @@
   </gbean>
 
   <gbean name="MdbEjbContainer" class="org.openejb.mdb.DefaultMdbContainerGBean">
-    <reference name="TransactionContextManager">
-      <name>TransactionContextManager</name>
+    <reference name="TransactionManager">
+      <name>TransactionManager</name>
     </reference>
     <reference name="TrackedConnectionAssociator">
       <name>ConnectionTracker</name>

Modified: geronimo/trunk/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/pom.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/trunk/configs/rmi-naming/pom.xml Thu Aug 10 12:56:47 2006
@@ -133,6 +133,12 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: geronimo/trunk/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/project.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.xml (original)
+++ geronimo/trunk/configs/rmi-naming/project.xml Thu Aug 10 12:56:47 2006
@@ -219,6 +219,9 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-connector</artifactId>
             <version>${geronimo_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -279,6 +282,15 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/system-database/src/plan/plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/system-database/src/plan/plan.xml Thu Aug 10 12:56:47 2006
@@ -61,14 +61,14 @@
 
     <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
         <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+        <reference name="TransactionManager"><name>TransactionManager</name></reference>
         <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
         <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
         <dependency><name>DerbySystem</name></dependency>
     </gbean>
 
     <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+        <reference name="TransactionManager"><name>TransactionManager</name></reference>
         <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
         <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
         <dependency><name>DerbySystem</name></dependency>

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/etc/project.properties?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Thu Aug 10 12:56:47 2006
@@ -62,6 +62,14 @@
 # geronimo.web.container=tomcat
 geronimo.web.container=jetty
 
+
+
+#
+# dain: I have no idea why we need this but someone changed the uddi configs to need this property
+#
+geronimo_groupId=geronimo
+
+
 # Force module tests to run, even if maven thinks they have passed
 #maven.test.force=true
 
@@ -131,6 +139,7 @@
 asn1_version=0.3.2
 axion_version=1.0-M3-dev
 axis_version=1.4
+backport_util_concurrent_version=2.0_01_pd
 castor_version=0.9.5.3
 cglib_version=2.1_3
 commons_beanutils_version=1.6.1

Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/maven.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Thu Aug 10 12:56:47 2006
@@ -287,6 +287,16 @@
     <goal name="m:co" prereqs="m:checkout"/>
     <goal name="m:checkout">
         <ant:exec dir="${basedir}" executable="svn">
+            <ant:arg line="checkout https://svn.codehaus.org/openejb/branches/dain-2.2-merge/notcm openejb"/>
+        </ant:exec>
+    </goal>
+
+    <!--  ===================================  -->
+    <!--  Goals for use by OpenEJB committers  -->
+    <!--  ===================================  -->
+    <goal name="m:cco" prereqs="m:committer-checkout"/>
+    <goal name="m:committer-checkout">
+        <ant:exec dir="${basedir}" executable="svn">
             <ant:arg line="checkout https://svn.codehaus.org/openejb/trunk/openejb2 openejb"/>
         </ant:exec>
     </goal>

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/AxisServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/AxisServiceReference.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/AxisServiceReference.java (original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/AxisServiceReference.java Thu Aug 10 12:56:47 2006
@@ -34,7 +34,7 @@
 import org.apache.geronimo.naming.reference.SimpleReference;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class AxisServiceReference extends SimpleReference implements ClassLoaderAwareReference {
     private static final Class[] SERVICE_CONSTRUCTOR_TYPES = new Class[]{Map.class, Map.class};

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java (original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java Thu Aug 10 12:56:47 2006
@@ -37,7 +37,7 @@
 
 
 /**
- * @version $Revision:$ $Date$
+ * @version $Revision$ $Date$
  */
 public class ServiceImpl implements javax.xml.rpc.Service, Serializable {
     private static final long serialVersionUID = 8657993237680414470L;

Modified: geronimo/trunk/modules/axis/src/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/src/plans/plan1.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/plans/plan1.xml (original)
+++ geronimo/trunk/modules/axis/src/plans/plan1.xml Thu Aug 10 12:56:47 2006
@@ -13,7 +13,6 @@
     <gbean gbeanName="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="j2eeServer">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
-        <attribute name="transactionContextManagerObjectName">geronimo.server:type=TransactionContextManager</attribute>
         <attribute name="connectionTrackerObjectName">geronimo.server:type=ConnectionTracker</attribute>
         <attribute name="transactionalTimerObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
         <attribute name="nonTransactionalTimerObjectName">geronimo.server:type=ThreadPooledTimer,name=NonTransactionalThreadPooledTimer</attribute>

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Thu Aug 10 12:56:47 2006
@@ -98,7 +98,7 @@
     private final Environment defaultServerEnvironment;
     private final AbstractNameQuery corbaGBeanObjectName;
 
-    private final AbstractNameQuery transactionContextManagerObjectName;
+    private final AbstractNameQuery transactionManagerObjectName;
     private final AbstractNameQuery connectionTrackerObjectName;
     private final SingleElementCollection ejbReferenceBuilder;
     private final SingleElementCollection connectorModuleBuilder;
@@ -108,7 +108,7 @@
 
     public AppClientModuleBuilder(Environment defaultClientEnvironment,
             Environment defaultServerEnvironment,
-            AbstractNameQuery transactionContextManagerObjectName,
+            AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
             EJBReferenceBuilder ejbReferenceBuilder,
@@ -117,7 +117,7 @@
             ServiceReferenceBuilder serviceReferenceBuilder) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
-                transactionContextManagerObjectName,
+                transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
                 new SingleElementCollection(ejbReferenceBuilder),
@@ -126,7 +126,7 @@
                 new SingleElementCollection(serviceReferenceBuilder));
     }
 
-    public AppClientModuleBuilder(AbstractNameQuery transactionContextManagerObjectName,
+    public AppClientModuleBuilder(AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
             Collection ejbReferenceBuilder,
@@ -138,7 +138,7 @@
     ) {
         this(defaultClientEnvironment,
                 defaultServerEnvironment,
-                transactionContextManagerObjectName,
+                transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
                 new SingleElementCollection(ejbReferenceBuilder),
@@ -149,7 +149,7 @@
 
     private AppClientModuleBuilder(Environment defaultClientEnvironment,
             Environment defaultServerEnvironment,
-            AbstractNameQuery transactionContextManagerObjectName,
+            AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
             SingleElementCollection ejbReferenceBuilder,
@@ -159,7 +159,7 @@
         this.defaultClientEnvironment = defaultClientEnvironment;
         this.defaultServerEnvironment = defaultServerEnvironment;
         this.corbaGBeanObjectName = corbaGBeanObjectName;
-        this.transactionContextManagerObjectName = transactionContextManagerObjectName;
+        this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.ejbReferenceBuilder = ejbReferenceBuilder;
         this.connectorModuleBuilder = connectorModuleBuilder;
@@ -363,8 +363,7 @@
                     earContext.getConfigurationManager(),
                     null, //no server name needed on client
                     clientBaseName,
-                    null,
-                    transactionContextManagerObjectName,
+                    transactionManagerObjectName,
                     connectionTrackerObjectName,
                     null,
                     null,
@@ -566,7 +565,6 @@
                         appClientContainerGBeanData.setAttribute("defaultPrincipal", defaultPrincipal);
                     }
                     appClientContainerGBeanData.setReferencePattern("JNDIContext", jndiContextName);
-                    appClientContainerGBeanData.setReferencePattern("TransactionContextManager", transactionContextManagerObjectName);
                 } catch (Exception e) {
                     throw new DeploymentException("Unable to initialize AppClientModule GBean", e);
                 }
@@ -708,7 +706,7 @@
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AppClientModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("defaultClientEnvironment", Environment.class, true, true);
         infoBuilder.addAttribute("defaultServerEnvironment", Environment.class, true, true);
-        infoBuilder.addAttribute("transactionContextManagerObjectName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("transactionManagerObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("connectionTrackerObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("corbaGBeanObjectName", AbstractNameQuery.class, true);
         infoBuilder.addReference("EJBReferenceBuilder", EJBReferenceBuilder.class, NameFactory.MODULE_BUILDER);
@@ -718,7 +716,7 @@
 
         infoBuilder.addInterface(ModuleBuilder.class);
 
-        infoBuilder.setConstructor(new String[]{"transactionContextManagerObjectName",
+        infoBuilder.setConstructor(new String[]{"transactionManagerObjectName",
                 "connectionTrackerObjectName",
                 "corbaGBeanObjectName",
                 "EJBReferenceBuilder",

Modified: geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java (original)
+++ geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java Thu Aug 10 12:56:47 2006
@@ -34,8 +34,6 @@
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.deploy.DefaultPrincipal;
 import org.apache.geronimo.security.util.ConfigurationUtil;
-import org.apache.geronimo.transaction.context.TransactionContext;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 
 /**
  * @version $Rev$ $Date$
@@ -52,18 +50,16 @@
     private final Method mainMethod;
     private final ClassLoader classLoader;
     private final Kernel kernel;
-    private final TransactionContextManager transactionContextManager;
 
     public AppClientContainer(String mainClassName,
-                              AbstractName appClientModuleName,
-                              String realmName,
-                              String callbackHandlerClassName,
-                              DefaultPrincipal defaultPrincipal,
-                              AppClientPlugin jndiContext,
-                              TransactionContextManager transactionContextManager,
-                              ClassLoader classLoader,
-                              Kernel kernel
-                              ) throws Exception {
+            AbstractName appClientModuleName,
+            String realmName,
+            String callbackHandlerClassName,
+            DefaultPrincipal defaultPrincipal,
+            AppClientPlugin jndiContext,
+            ClassLoader classLoader,
+            Kernel kernel
+    ) throws Exception {
         this.mainClassName = mainClassName;
         this.appClientModuleName = appClientModuleName;
         if ((realmName == null) != (callbackHandlerClassName == null)) {
@@ -87,7 +83,6 @@
         this.classLoader = classLoader;
         this.kernel = kernel;
         this.jndiContext = jndiContext;
-        this.transactionContextManager = transactionContextManager;
 
         try {
             Class mainClass = classLoader.loadClass(mainClassName);
@@ -112,8 +107,6 @@
         Thread thread = Thread.currentThread();
 
         ClassLoader oldClassLoader = thread.getContextClassLoader();
-        TransactionContext oldTransactionContext = transactionContextManager.getContext();
-        TransactionContext currentTransactionContext = null;
         Subject oldCurrentCaller = ContextManager.getCurrentCaller();
         Subject clientSubject = defaultSubject;
         LoginContext loginContext = null;
@@ -139,7 +132,6 @@
             }
             ContextManager.setCurrentCaller(clientSubject);
             jndiContext.startClient(appClientModuleName, kernel, classLoader);
-            currentTransactionContext = transactionContextManager.newUnspecifiedTransactionContext();
             if (clientSubject == null) {
                 mainMethod.invoke(null, new Object[]{args});
             } else {
@@ -171,10 +163,6 @@
             jndiContext.stopClient(appClientModuleName);
 
             thread.setContextClassLoader(oldClassLoader);
-            transactionContextManager.setContext(oldTransactionContext);
-            if (currentTransactionContext != null) {
-                currentTransactionContext.commit();
-            }
             ContextManager.setCurrentCaller(oldCurrentCaller);
         }
     }
@@ -193,7 +181,6 @@
         infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
 
         infoFactory.addReference("JNDIContext", AppClientPlugin.class, NameFactory.GERONIMO_SERVICE);
-        infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
 
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
         infoFactory.addAttribute("kernel", Kernel.class, false);
@@ -205,7 +192,6 @@
                                                 "callbackHandlerClassName",
                                                 "defaultPrincipal",
                                                 "JNDIContext",
-                                                "TransactionContextManager",
                                                 "classLoader",
                                                 "kernel"
         });

Modified: geronimo/trunk/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/project.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Thu Aug 10 12:56:47 2006
@@ -42,6 +42,13 @@
 
     <dependencies>
         <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
+            <type>test</type>
+        </dependency>
+
+        <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xmlbeans-maven-plugin</artifactId>
             <version>${xmlbeans_maven_plugin_version}</version>

Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- 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 Thu Aug 10 12:56:47 2006
@@ -411,6 +411,9 @@
                 AbstractNameQuery workManagerName = ENCConfigBuilder.getGBeanQuery(NameFactory.JCA_WORK_MANAGER, geronimoResourceAdapter.getResourceadapterInstance().getWorkmanager());
                 resourceAdapterInstanceGBeanData.setReferencePattern("WorkManager", workManagerName);
 
+                // set the xa terminator name which is the same as our transaction manager
+                resourceAdapterInstanceGBeanData.setReferencePattern("XATerminator", earContext.getTransactionManagerObjectName());
+
                 String resourceAdapterName = geronimoResourceAdapter.getResourceadapterInstance().getResourceadapterName();
                 resourceAdapterAbstractName = earContext.getNaming().createChildName(jcaResourceName, resourceAdapterName, NameFactory.JCA_RESOURCE_ADAPTER);
                 resourceAdapterInstanceGBeanData.setAbstractName(resourceAdapterAbstractName);
@@ -719,7 +722,7 @@
             connectionManagerGBean.setAttribute("pooling", pooling);
             connectionManagerGBean.setReferencePattern("ConnectionTracker", earContext.getConnectionTrackerObjectName());
             connectionManagerGBean.setAttribute("containerManagedSecurity", Boolean.valueOf(connectionManager.isSetContainerManagedSecurity()));
-            connectionManagerGBean.setReferencePattern("TransactionContextManager", earContext.getTransactionContextManagerObjectName());
+            connectionManagerGBean.setReferencePattern("TransactionManager", earContext.getTransactionManagerObjectName());
         } catch (Exception e) {
             throw new DeploymentException("Problem setting up ConnectionManager named " + connectionfactoryInstance.getName().trim(), e);
         }

Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml Thu Aug 10 12:56:47 2006
@@ -83,20 +83,9 @@
     </resourceadapter>
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker"
-           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
-
-    <gbean name="TransactionContextManager"
-            class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
- <!--
-         <reference name="TransactionManager">
-             <name>TransactionManager</name>
-         </reference>
-         <reference name="XidImporter">
-             <name>TransactionManager</name>
-         </reference>
- -->
-     </gbean>
-
 </connector>

Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml Thu Aug 10 12:56:47 2006
@@ -109,8 +109,10 @@
     </adminobject>
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker"
-           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -129,35 +131,10 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
-        </reference>
-    </gbean>
-
-<!--
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
-        <attribute name="defaultTransactionTimeoutSeconds">10</attribute>
-        <references name="ResourceManagers">
-            <pattern>
-                <name>JCAManagedConnectionFactory</name>
-            </pattern>
-            <pattern>
-                <name>MessageDrivenBean</name>
-            </pattern>
-        </references>
-    </gbean>
--->
-
-    <gbean name="TransactionContextManager"
-           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-<!--
         <reference name="TransactionManager">
             <name>TransactionManager</name>
         </reference>
-        <reference name="XidImporter">
-            <name>TransactionManager</name>
-        </reference>
--->
     </gbean>
 
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean"/>
 </connector>

Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_localtx/geronimo-ra.xml Thu Aug 10 12:56:47 2006
@@ -109,8 +109,10 @@
     </adminobject>
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker"
-           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -129,35 +131,10 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
-        </reference>
-    </gbean>
-
-<!--
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
-        <attribute name="defaultTransactionTimeoutSeconds">10</attribute>
-        <references name="ResourceManagers">
-            <pattern>
-                <name>JCAManagedConnectionFactory</name>
-            </pattern>
-            <pattern>
-                <name>MessageDrivenBean</name>
-            </pattern>
-        </references>
-    </gbean>
--->
-
-    <gbean name="TransactionContextManager"
-           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-<!--
         <reference name="TransactionManager">
             <name>TransactionManager</name>
         </reference>
-        <reference name="XidImporter">
-            <name>TransactionManager</name>
-        </reference>
--->
     </gbean>
 
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean"/>
 </connector>

Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5_notx/geronimo-ra.xml Thu Aug 10 12:56:47 2006
@@ -107,43 +107,20 @@
     </adminobject>
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
-    <gbean name="ConnectionTracker"
-           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
         <attribute name="syncMaximumPoolSize">10</attribute>
         <attribute name="startMaximumPoolSize">10</attribute>
         <attribute name="scheduledMaximumPoolSize">10</attribute>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
-        </reference>
-    </gbean>
-
-<!--
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
-        <attribute name="defaultTransactionTimeoutSeconds">10</attribute>
-        <references name="ResourceManagers">
-            <pattern>
-                <name>JCAManagedConnectionFactory</name>
-            </pattern>
-            <pattern>
-                <name>MessageDrivenBean</name>
-            </pattern>
-        </references>
-    </gbean>
--->
-
-    <gbean name="TransactionContextManager"
-           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-<!--
         <reference name="TransactionManager">
             <name>TransactionManager</name>
         </reference>
-        <reference name="XidImporter">
-            <name>TransactionManager</name>
-        </reference>
--->
     </gbean>
 
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean"/>
 </connector>

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml Thu Aug 10 12:56:47 2006
@@ -189,6 +189,9 @@
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
     <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -207,22 +210,16 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
     </gbean>
 
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
         <attribute name="defaultTransactionTimeoutSeconds">10</attribute>
         <references name="ResourceManagers">
             <pattern><name>JCAManagedConnectionFactory</name></pattern>
             <pattern><name>MessageDrivenBean</name></pattern>
         </references>
     </gbean>
-
-    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="XidImporter"><name>TransactionManager</name></reference>
-    </gbean>
-
 </application>

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml Thu Aug 10 12:56:47 2006
@@ -108,6 +108,9 @@
 
     <!--normally this is in the j2ee-server-plan.xml.  It is included here so the gbeans can start in unit tests-->
     <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -126,22 +129,16 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="TransactionContextManager">
-            <name>TransactionContextManager</name>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
         </reference>
     </gbean>
 
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
         <attribute name="defaultTransactionTimeoutSeconds">10</attribute>
         <references name="ResourceManagers">
             <pattern><name>JCAManagedConnectionFactory</name></pattern>
             <pattern><name>MessageDrivenBean</name></pattern>
         </references>
     </gbean>
-
-    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="XidImporter"><name>name=TransactionManager</name></reference>
-    </gbean>
-
 </connector>

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Thu Aug 10 12:56:47 2006
@@ -80,6 +80,7 @@
 import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean;
 import org.tranql.sql.jdbc.JDBCUtil;
 
 /**
@@ -155,7 +156,7 @@
 
     private static final AbstractNameQuery connectionTrackerName = new AbstractNameQuery(null, Collections.singletonMap("name", "ConnectionTracker"));
     private AbstractName serverName;
-    private static final AbstractNameQuery transactionContextManagerName = new AbstractNameQuery(null, Collections.singletonMap("name", "TransactionContextManager"));
+    private static final AbstractNameQuery transactionManagerName = new AbstractNameQuery(null, Collections.singletonMap("name", "TransactionManager"));
 
 
     public void testBuildEar() throws Exception {
@@ -163,9 +164,22 @@
         try {
             rarFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear-noger.ear"));
 
-            EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment, null, transactionContextManagerName, connectionTrackerName, null, null, null, new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()), null, null, ejbReferenceBuilder, null,
+            EARConfigBuilder configBuilder = new EARConfigBuilder(defaultEnvironment,
+                    transactionManagerName,
+                    connectionTrackerName,
+                    null,
+                    null,
+                    null,
+                    new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
+                    null,
+                    null,
+                    ejbReferenceBuilder,
+                    null,
                     new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching),
-                    resourceReferenceBuilder, null, serviceReferenceBuilder, kernel.getNaming());
+                    resourceReferenceBuilder,
+                    null,
+                    serviceReferenceBuilder,
+                    kernel.getNaming());
             ConfigurationData configData = null;
             DeploymentContext context = null;
             ArtifactManager artifactManager = new DefaultArtifactManager();
@@ -367,8 +381,7 @@
                         Collections.EMPTY_SET,
                         new AbstractNameQuery(serverName, J2EEServerImpl.GBEAN_INFO.getInterfaces()),
                         module.getModuleName(), //hardcode standalone here.
-                        null,
-                        transactionContextManagerName,
+                        transactionManagerName,
                         connectionTrackerName,
                         null,
                         null,
@@ -564,6 +577,11 @@
         GBeanData serverData = bootstrap.addGBean("geronimo", J2EEServerImpl.GBEAN_INFO);
         serverName = serverData.getAbstractName();
         bootstrap.addGBean(serverData);
+
+
+        // add fake TransactionManager so refs will resolve
+        GBeanData tm = bootstrap.addGBean("TransactionManager", GeronimoTransactionManagerGBean.GBEAN_INFO);
+        tm.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10));
 
         ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, getClass().getClassLoader());
 

Modified: geronimo/trunk/modules/connector/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector/project.xml?rev=430508&r1=430507&r2=430508&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/project.xml (original)
+++ geronimo/trunk/modules/connector/project.xml Thu Aug 10 12:56:47 2006
@@ -42,6 +42,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
+        </dependency>
+
        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>



Mime
View raw message