Anita, I think this change broke the testsuites. Please take a look at: http://people.apache.org/~prasad/binaries/trunk/20071013/logs-0900/test.log. Maybe something else needs to be updated.
Jarek On 10/13/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > Author: akulshreshtha > Date: Sat Oct 13 04:46:59 2007 > New Revision: 584390 > > URL: http://svn.apache.org/viewvc?rev=584390&view=rev > Log: > GERONIMO-2879 Set j2eeType to JTAResource for Transaction Manager > > Modified: > > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java > > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java > > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java > > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java > > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java > > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java > > Modified: > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java?rev=584390&r1=584389&r2=584390&view=diff > ============================================================================== > --- > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java > (original) > +++ > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java > Sat Oct 13 04:46:59 2007 > @@ -54,7 +54,7 @@ > static { > GBeanInfoBuilder infoFactory = > GBeanInfoBuilder.createStatic(ConnectionTrackingCoordinatorGBean.class, > NameFactory.JCA_CONNECTION_TRACKER); > > - infoFactory.addReference("TransactionManager", > MonitorableTransactionManager.class, NameFactory.TRANSACTION_MANAGER); > + infoFactory.addReference("TransactionManager", > MonitorableTransactionManager.class, NameFactory.JTA_RESOURCE); > infoFactory.addAttribute("lazyConnect", boolean.class, true); > > infoFactory.addInterface(TrackedConnectionAssociator.class); > > Modified: > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java?rev=584390&r1=584389&r2=584390&view=diff > ============================================================================== > --- > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java > (original) > +++ > geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java > Sat Oct 13 04:46:59 2007 > @@ -48,7 +48,7 @@ > infoFactory.addReference("StartPool", Executor.class, > NameFactory.GERONIMO_SERVICE); > infoFactory.addReference("ScheduledPool", Executor.class, > NameFactory.GERONIMO_SERVICE); > > - infoFactory.addReference("TransactionManager", XAWork.class, > NameFactory.TRANSACTION_MANAGER); > + infoFactory.addReference("TransactionManager", XAWork.class, > NameFactory.JTA_RESOURCE); > > infoFactory.setConstructor(new String[]{ > "SyncPool", > > Modified: > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java?rev=584390&r1=584389&r2=584390&view=diff > ============================================================================== > --- > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java > (original) > +++ > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java > Sat Oct 13 04:46:59 2007 > @@ -55,7 +55,7 @@ > > infoFactory.addReference("ManagedConnectionFactoryWrapper", > ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY); > infoFactory.addReference("ThreadPool", Executor.class, > NameFactory.GERONIMO_SERVICE); > - infoFactory.addReference("TransactionManager", > TransactionManager.class, NameFactory.TRANSACTION_MANAGER); > + infoFactory.addReference("TransactionManager", > TransactionManager.class, NameFactory.JTA_RESOURCE); > > infoFactory.addAttribute("kernel", Kernel.class, false); > > > Modified: > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java?rev=584390&r1=584389&r2=584390&view=diff > ============================================================================== > --- > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java > (original) > +++ > geronimo/server/trunk/modules/geronimo-timer/src/main/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java > Sat Oct 13 04:46:59 2007 > @@ -58,7 +58,7 @@ > infoFactory.addInterface(PersistentTimer.class); > > infoFactory.addAttribute("repeatCount", int.class, true); > - infoFactory.addReference("TransactionManager", > TransactionManager.class, NameFactory.TRANSACTION_MANAGER); > + infoFactory.addReference("TransactionManager", > TransactionManager.class, NameFactory.JTA_RESOURCE); > infoFactory.addReference("ManagedConnectionFactoryWrapper", > ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY); > infoFactory.addReference("ThreadPool", Executor.class, > NameFactory.GERONIMO_SERVICE); > infoFactory.addAttribute("kernel", Kernel.class, false); > > Modified: > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java?rev=584390&r1=584389&r2=584390&view=diff > ============================================================================== > --- > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java > (original) > +++ > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/GeronimoTransactionManagerGBean.java > Sat Oct 13 04:46:59 2007 > @@ -48,7 +48,7 @@ > static { > GBeanInfoBuilder infoFactory = > GBeanInfoBuilder.createStatic(GeronimoTransactionManagerGBean.class, > TransactionManagerImplGBean.GBEAN_INFO, > - NameFactory.TRANSACTION_MANAGER); > + NameFactory.JTA_RESOURCE); > GBEAN_INFO = infoFactory.getBeanInfo(); > } > > > Modified: > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java?rev=584390&r1=584389&r2=584390&view=diff > ============================================================================== > --- > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java > (original) > +++ > geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java > Sat Oct 13 04:46:59 2007 > @@ -47,7 +47,7 @@ > public static final GBeanInfo GBEAN_INFO; > > static { > - GBeanInfoBuilder infoBuilder = > GBeanInfoBuilder.createStatic(TransactionManagerImplGBean.class, > NameFactory.TRANSACTION_MANAGER); > + GBeanInfoBuilder infoBuilder = > GBeanInfoBuilder.createStatic(TransactionManagerImplGBean.class, > NameFactory.JTA_RESOURCE); > > infoBuilder.addAttribute("defaultTransactionTimeoutSeconds", > int.class, true); > infoBuilder.addReference("XidFactory", XidFactory.class, > NameFactory.XID_FACTORY); > > >
