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/18 11:45:29 UTC
tomee git commit: TOMEE-1875 ConfigurationFactory config not
respected by tomee
Repository: tomee
Updated Branches:
refs/heads/master f5494e617 -> ed37f9ee3
TOMEE-1875 ConfigurationFactory config not respected by tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ed37f9ee
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ed37f9ee
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ed37f9ee
Branch: refs/heads/master
Commit: ed37f9ee3995812ae91a19cf36a85d534787cefa
Parents: f5494e6
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Jul 18 13:45:14 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Jul 18 13:45:14 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ed37f9ee/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index bb335ee..fb384d7 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -74,6 +74,7 @@ import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.InjectionBuilder;
import org.apache.openejb.assembler.classic.JndiEncBuilder;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
+import org.apache.openejb.assembler.classic.OpenEjbConfigurationFactory;
import org.apache.openejb.assembler.classic.PersistenceUnitInfo;
import org.apache.openejb.assembler.classic.ReloadableEntityManagerFactory;
import org.apache.openejb.assembler.classic.ResourceInfo;
@@ -322,7 +323,13 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
SystemInstance.get().addObserver(new ClusterObserver(clusters));
- configurationFactory = new ConfigurationFactory();
+ final OpenEjbConfigurationFactory component = SystemInstance.get().getComponent(OpenEjbConfigurationFactory.class);
+ ConfigurationFactory configurationFactory = ConfigurationFactory.class.isInstance(component) ?
+ ConfigurationFactory.class.cast(component) : SystemInstance.get().getComponent(ConfigurationFactory.class);
+ if (configurationFactory == null) {
+ configurationFactory = new ConfigurationFactory();
+ }
+ this.configurationFactory = configurationFactory;
deploymentLoader = new DeploymentLoader();
servletContextHandler = new ServletContextHandler();