You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/07/20 13:38:25 UTC
tomee git commit: tests fix after previous commit
Repository: tomee
Updated Branches:
refs/heads/master 0d684b1bd -> f690cf89d
tests fix after previous commit
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f690cf89
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f690cf89
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f690cf89
Branch: refs/heads/master
Commit: f690cf89dbffda03568a61ad93a75411e78b2641
Parents: 0d684b1
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Jul 20 15:38:16 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Jul 20 15:38:16 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/assembler/classic/Assembler.java | 1 -
.../java/org/apache/openejb/resource/jdbc/DataSourceFactory.java | 1 +
.../apache/openejb/resource/jdbc/FlushableDataSourceHandler.java | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f690cf89/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 44bb9dd..1113442 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -197,7 +197,6 @@ import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.XATerminator;
import javax.resource.spi.work.WorkManager;
import javax.servlet.ServletContext;
-import javax.sql.CommonDataSource;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
http://git-wip-us.apache.org/repos/asf/tomee/blob/f690cf89/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
index 9ff5321..be23efa 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
@@ -269,6 +269,7 @@ public class DataSourceFactory {
final Map<String, Object> recipeProps = new HashMap<>(objectRecipe == null ? new HashMap<String, Object>() : objectRecipe.getProperties());
recipeProps.remove("properties");
+ recipeProps.put("OpenEJBResourceClasspath", String.valueOf(useAlternativeDriver));
flushConfig = new FlushableDataSourceHandler.FlushConfig(recipeProps);
flushableDataSourceHandler = new FlushableDataSourceHandler(ds, flushConfig, resettableDataSourceHandler);
http://git-wip-us.apache.org/repos/asf/tomee/blob/f690cf89/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/FlushableDataSourceHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/FlushableDataSourceHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/FlushableDataSourceHandler.java
index 811180e..876f18b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/FlushableDataSourceHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/FlushableDataSourceHandler.java
@@ -36,7 +36,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class FlushableDataSourceHandler implements DelegatableHandler {
private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, FlushableDataSourceHandler.class);
public static final String[] FACTORY_ARGS = new String[]{
- "ServiceId", "JtaManaged", "JdbcDriver", "Definition", "MaxWaitTime", "TimeBetweenEvictionRuns", "MinEvictableIdleTime"
+ "ServiceId", "JtaManaged", "JdbcDriver", "Definition", "MaxWaitTime", "TimeBetweenEvictionRuns", "MinEvictableIdleTime", "OpenEJBResourceClasspath"
};
private final FlushConfig config;