Author: rfeng
Date: Sun Oct 21 00:42:50 2007
New Revision: 586860
URL: http://svn.apache.org/viewvc?rev=586860&view=rev
Log:
Minor cleanup
Modified:
incubator/tuscany/java/sca/modules/policy-transaction/pom.xml
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
incubator/tuscany/java/sca/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
Modified: incubator/tuscany/java/sca/modules/policy-transaction/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-transaction/pom.xml?rev=586860&r1=586859&r2=586860&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-transaction/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-transaction/pom.xml Sun Oct 21
00:42:50 2007
@@ -54,5 +54,23 @@
<version>1.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <!--
+ <dependency>
+ <groupId>jotm</groupId>
+ <artifactId>jotm</artifactId>
+ <version>2.0.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jta</artifactId>
+ <groupId>javax.transaction</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>connector</artifactId>
+ <groupId>javax.resource</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ -->
</dependencies>
</project>
Modified:
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java?rev=586860&r1=586859&r2=586860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
Sun Oct 21 00:42:50 2007
@@ -36,7 +36,6 @@
public class TransactionModuleActivator implements ModuleActivator {
private TransactionManager transactionManager;
private HOWLLog howlLog;
- private XidFactory xidFactory;
private String logFileDir = "target/logs";
private String bufferClassName = "org.objectweb.howl.log.BlockLogBuffer";
@@ -57,8 +56,15 @@
* @see
org.apache.tuscany.sca.core.ModuleActivator#start(org.apache.tuscany.sca.core.ExtensionPointRegistry)
*/
public void start(ExtensionPointRegistry registry) {
+ if (registry != null) {
+ transactionManager =
registry.getExtensionPoint(TransactionManager.class);
+ if (transactionManager != null) {
+ // The transaction manage is provided by the hosting
environment
+ return;
+ }
+ }
try {
- xidFactory = new XidFactoryImpl();
+ XidFactory xidFactory = new XidFactoryImpl();
howlLog =
new HOWLLog(bufferClassName, bufferSizeKBytes,
checksumEnabled, adler32Checksum,
flushSleepTimeMilliseconds, logFileDir,
logFileExt, logFileName, maxBlocksPerFile,
@@ -66,12 +72,12 @@
serverBaseDir);
howlLog.doStart();
- this.transactionManager = new GeronimoTransactionManager(1200,
xidFactory, howlLog);
+ transactionManager = new GeronimoTransactionManager(1200,
xidFactory, howlLog);
} catch (Exception e) {
throw new IllegalStateException(e);
}
if (registry != null) {
- registry.addExtensionPoint(this.transactionManager);
+ registry.addExtensionPoint(transactionManager);
}
}
@@ -80,8 +86,10 @@
*/
public void stop(ExtensionPointRegistry registry) {
try {
- howlLog.doStop();
- if (registry != null) {
+ if (howlLog != null) {
+ howlLog.doStop();
+ }
+ if (registry != null && transactionManager != null) {
registry.removeExtensionPoint(transactionManager);
}
} catch (Exception e) {
@@ -89,10 +97,7 @@
}
}
- public TransactionManager getTransactionManager() {
- if (transactionManager == null) {
- start(null);
- }
+ TransactionManager getTransactionManager() {
return transactionManager;
}
Modified:
incubator/tuscany/java/sca/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java?rev=586860&r1=586859&r2=586860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
Sun Oct 21 00:42:50 2007
@@ -29,7 +29,6 @@
import junit.framework.TestCase;
-import org.apache.geronimo.transaction.GeronimoUserTransaction;
import org.apache.geronimo.transaction.manager.NamedXAResource;
/**
@@ -141,7 +140,7 @@
TransactionModuleActivator activator = new
TransactionModuleActivator();
activator.start(null);
TransactionManager tm = activator.getTransactionManager();
- GeronimoUserTransaction tx = new GeronimoUserTransaction(tm);
+ // GeronimoUserTransaction tx = new GeronimoUserTransaction(tm);
TransactionManagerHelper helper = new TransactionManagerHelper(tm);
// No TX yet
@@ -166,7 +165,7 @@
assertSame(t2, tm.getTransaction());
tm.getTransaction().enlistResource(new MockXAResource("Oracle",
"003"));
- tx.rollback();
+ tm.rollback();
// Skip post
// helper.managedGlobalTransactionPostInvoke(t2);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
