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/03/16 09:10:43 UTC
tomee git commit: TOMEE-1737 no default EE resources outside of
default tomee distribution
Repository: tomee
Updated Branches:
refs/heads/master 97b3ea49e -> 7a00b1bf3
TOMEE-1737 no default EE resources outside of default tomee distribution
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7a00b1bf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7a00b1bf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7a00b1bf
Branch: refs/heads/master
Commit: 7a00b1bf3910ff606dbc4d572915ce26f2761d91
Parents: 97b3ea4
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Mar 16 09:10:26 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Mar 16 09:10:26 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/assembler/classic/Assembler.java | 8 ++++++++
.../java/org/apache/openejb/config/AnnotationDeployer.java | 2 +-
.../resources/META-INF/org.apache.openejb/service-jar.xml | 3 +++
.../activemq/JMS2AMQDefaultConnectionFactoryTest.java | 2 ++
.../src/main/java/org/apache/tomee/installer/Installer.java | 4 ++++
5 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7a00b1bf/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 3fd3d26..e032229 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
@@ -2712,6 +2712,14 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
// handled below
}
+ if (Reference.class.isInstance(resourceAdapter)) {
+ try {
+ resourceAdapter = Reference.class.cast(resourceAdapter).getContent();
+ } catch (final NamingException e) {
+ // no-op: will fail after
+ }
+ }
+
if (resourceAdapter == null) {
throw new OpenEJBException("No existing resource adapter defined with id '" + id + "'.");
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/7a00b1bf/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index 1d035ba..7be6359 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -360,7 +360,7 @@ public class AnnotationDeployer implements DynamicDeployer {
public AnnotationDeployer() {
discoverAnnotatedBeans = new DiscoverAnnotatedBeans();
processAnnotatedBeans = new ProcessAnnotatedBeans(SystemInstance.get().getOptions().get("openejb.jaxws.add-remote", false));
- builtInEnvironmentEntries = new BuiltInEnvironmentEntries(SystemInstance.get().getOptions().get("openejb.environment.default", true));
+ builtInEnvironmentEntries = new BuiltInEnvironmentEntries(SystemInstance.get().getOptions().get("openejb.environment.default", false));
envEntriesPropertiesDeployer = new EnvEntriesPropertiesDeployer();
mBeanDeployer = new MBeanDeployer();
mergeWebappJndiContext = new MergeWebappJndiContext();
http://git-wip-us.apache.org/repos/asf/tomee/blob/7a00b1bf/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
index c0a7301..4998330 100644
--- a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
+++ b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
@@ -676,6 +676,9 @@
# How long to wait for broker startup
StartupTimeout 10 seconds
+ # we don't want it to be created if we don't actually use JMS but we have this default connection factory
+ # we don't use Lazy cause the lazyness it would still be eager cause of the connection factory creation
+ StartWhenNeeded true
</ServiceProvider>
<ServiceProvider
http://git-wip-us.apache.org/repos/asf/tomee/blob/7a00b1bf/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQDefaultConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQDefaultConnectionFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQDefaultConnectionFactoryTest.java
index 8da8300..713228c 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQDefaultConnectionFactoryTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/activemq/JMS2AMQDefaultConnectionFactoryTest.java
@@ -18,6 +18,7 @@ package org.apache.openejb.activemq;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.ContainerProperties;
import org.apache.openejb.testing.SimpleLog;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,6 +37,7 @@ import static org.junit.Assert.fail;
@SimpleLog
@Classes(cdi = true, innerClassesAsBean = true)
@RunWith(ApplicationComposer.class)
+@ContainerProperties(@ContainerProperties.Property(name = "openejb.environment.default", value = "true")) // off in embedded mode OOTB
public class JMS2AMQDefaultConnectionFactoryTest {
@Inject
private JMSContext defaultContext;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7a00b1bf/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 4c76e4e..bd2dcca 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -716,6 +716,10 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("# openejb.check.classloader.verbose = false\n");
systemPropertiesWriter.write("\n");
+ systemPropertiesWriter.write("# Activate EE default resources (ManagedExecutorService, JMSConnectionFactory if JMS is there...)");
+ systemPropertiesWriter.write("openejb.environment.default = true\n");
+
+ systemPropertiesWriter.write("\n");
systemPropertiesWriter.write("# tomee.jaxws.subcontext = webservices\n");
systemPropertiesWriter.write("# tomee.jaxws.oldsubcontext = false\n");