You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by st...@apache.org on 2014/03/03 20:24:04 UTC
[1/2] git commit: BATCHEE-19 add support for IBM WebSphere
TransactionManager
Repository: incubator-batchee
Updated Branches:
refs/heads/master 1e5e7dd82 -> 18835b84b
BATCHEE-19 add support for IBM WebSphere TransactionManager
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/3fafdc23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/3fafdc23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/3fafdc23
Branch: refs/heads/master
Commit: 3fafdc2307fe0c619d30d5c5a58293f73a8f31b1
Parents: 1e5e7dd
Author: Mark Struberg <st...@yahoo.de>
Authored: Mon Mar 3 11:52:25 2014 +0100
Committer: Mark Struberg <st...@yahoo.de>
Committed: Mon Mar 3 20:00:02 2014 +0100
----------------------------------------------------------------------
.../services/transaction/JTAUserTransactionAdapter.java | 7 +++++--
pom.xml | 9 +++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/3fafdc23/jbatch/src/main/java/org/apache/batchee/container/services/transaction/JTAUserTransactionAdapter.java
----------------------------------------------------------------------
diff --git a/jbatch/src/main/java/org/apache/batchee/container/services/transaction/JTAUserTransactionAdapter.java b/jbatch/src/main/java/org/apache/batchee/container/services/transaction/JTAUserTransactionAdapter.java
index 8073971..4a1ac0b 100755
--- a/jbatch/src/main/java/org/apache/batchee/container/services/transaction/JTAUserTransactionAdapter.java
+++ b/jbatch/src/main/java/org/apache/batchee/container/services/transaction/JTAUserTransactionAdapter.java
@@ -43,8 +43,8 @@ public class JTAUserTransactionAdapter implements TransactionManagerAdapter {
"com.arjuna.jta.JTA_TransactionManager.transactionManager", // hp
"com.bluestone.jta.SaTransactionManagerFactory.SaGetTransactionManager",
"com.sun.jts.jta.TransactionManagerImpl.getTransactionManagerImpl",
- "com.inprise.visitransact.jta.TransactionManagerImpl."
- + "getTransactionManagerImpl", // borland
+ "com.inprise.visitransact.jta.TransactionManagerImpl.getTransactionManagerImpl", // borland
+ "com.ibm.tx.jta.TransactionManagerFactory.getTransactionManager" // IBM WebSphere 8
};
protected TransactionManager mgr = null;
@@ -67,6 +67,9 @@ public class JTAUserTransactionAdapter implements TransactionManagerAdapter {
try {
mgr = TransactionManager.class.cast(
Thread.currentThread().getContextClassLoader().loadClass(clazz).getMethod(methodName).invoke(null));
+ if (mgr != null) {
+ break;
+ }
} catch (final Throwable e) {
// no-op
}
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/3fafdc23/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1336441..6d50e88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-batchee.git;a=summary</url>
</scm>
+
<properties>
<atinject.version>1.0</atinject.version>
<batch-api.version>1.0</batch-api.version>
@@ -463,6 +464,14 @@
</repositories>
<pluginRepositories>
<pluginRepository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/content/groups/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </pluginRepository>
+
+ <!-- WTF? surely not! -->
+ <pluginRepository>
<id>sonatype-public-repository</id>
<url>https://oss.sonatype.org/content/groups/public</url>
</pluginRepository>
[2/2] git commit: BATCHEE-18 fix checkstyle
Posted by st...@apache.org.
BATCHEE-18 fix checkstyle
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/18835b84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/18835b84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/18835b84
Branch: refs/heads/master
Commit: 18835b84baabcc77800acc205a231d26132fe414
Parents: 3fafdc2
Author: Mark Struberg <st...@yahoo.de>
Authored: Mon Mar 3 20:07:30 2014 +0100
Committer: Mark Struberg <st...@yahoo.de>
Committed: Mon Mar 3 20:07:30 2014 +0100
----------------------------------------------------------------------
.../org/apache/batchee/extras/async/AsynchronousItemProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/18835b84/extensions/extras/src/main/java/org/apache/batchee/extras/async/AsynchronousItemProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/extras/src/main/java/org/apache/batchee/extras/async/AsynchronousItemProcessor.java b/extensions/extras/src/main/java/org/apache/batchee/extras/async/AsynchronousItemProcessor.java
index aae2d87..257a13a 100644
--- a/extensions/extras/src/main/java/org/apache/batchee/extras/async/AsynchronousItemProcessor.java
+++ b/extensions/extras/src/main/java/org/apache/batchee/extras/async/AsynchronousItemProcessor.java
@@ -77,7 +77,7 @@ public class AsynchronousItemProcessor<T> implements ItemProcessor {
}
public static class DaemonThreadFactory implements ThreadFactory {
- private static final AtomicInteger ids = new AtomicInteger(0);
+ private static AtomicInteger ids = new AtomicInteger(0);
private final ThreadGroup group;