Repository: tomee Updated Branches: refs/heads/master 25469731e -> de4bd5dbc
Fix merge issue Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/de4bd5db Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/de4bd5db Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/de4bd5db Branch: refs/heads/master Commit: de4bd5dbcdf63789591fe80a7bf746ffd633c900 Parents: 2546973 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Wed Apr 15 18:03:45 2015 +0100 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Wed Apr 15 18:03:45 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/openejb/assembler/classic/Assembler.java | 4 ++++ .../main/java/org/apache/openejb/config/DeploymentLoader.java | 1 + 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/de4bd5db/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 2ddef7b..156e6c0 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 @@ -81,6 +81,7 @@ import org.apache.openejb.core.ivm.IntraVmProxy; import org.apache.openejb.core.ivm.naming.ContextualJndiReference; import org.apache.openejb.core.ivm.naming.IvmContext; import org.apache.openejb.core.ivm.naming.IvmJndiFactory; +import org.apache.openejb.core.ivm.naming.JndiUrlReference; import org.apache.openejb.core.ivm.naming.LazyObjectReference; import org.apache.openejb.core.ivm.naming.Reference; import org.apache.openejb.core.security.SecurityContextHandler; @@ -135,6 +136,7 @@ import org.apache.openejb.util.classloader.ClassLoaderAwareHandler; import org.apache.openejb.util.classloader.URLClassLoaderFirst; import org.apache.openejb.util.proxy.ProxyFactory; import org.apache.openejb.util.proxy.ProxyManager; +import org.apache.webbeans.component.ResourceBean; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.inject.OWBInjector; import org.apache.webbeans.logger.JULLoggerFactory; @@ -157,6 +159,8 @@ import org.apache.xbean.recipe.UnsetPropertiesRecipe; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.annotation.Resource; +import javax.ejb.EJB; import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; http://git-wip-us.apache.org/repos/asf/tomee/blob/de4bd5db/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java index c90cf2c..5ff4034 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java @@ -26,6 +26,7 @@ import org.apache.openejb.cdi.CompositeBeans; import org.apache.openejb.classloader.ClassLoaderConfigurer; import org.apache.openejb.classloader.WebAppEnricher; import org.apache.openejb.config.event.BeforeDeploymentEvent; +import org.apache.openejb.config.sys.Resources; import org.apache.openejb.core.EmptyResourcesClassLoader; import org.apache.openejb.core.ParentClassLoaderFinder; import org.apache.openejb.jee.Application;