Repository: tomee Updated Branches: refs/heads/master b2d2cc08b -> 8dec24c00
Checkstyle/PMD Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8dec24c0 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8dec24c0 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8dec24c0 Branch: refs/heads/master Commit: 8dec24c001468ee491dd7d2e85427c811633adc7 Parents: b2d2cc0 Author: Jonathan Gallimore <[email protected]> Authored: Wed Nov 29 00:52:21 2017 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Wed Nov 29 00:52:21 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/assembler/DeployerEjb.java | 2 +- .../src/main/java/org/apache/openejb/config/AutoConfig.java | 5 ++++- examples/connector-ear/pom.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8dec24c0/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java index 9ca3554..79bed95 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java @@ -248,7 +248,7 @@ public class DeployerEjb implements Deployer { if (properties != null && properties.containsKey(OPENEJB_DEPLOYER_FORCED_APP_ID_PROP)) { appInfo.appId = properties.getProperty(OPENEJB_DEPLOYER_FORCED_APP_ID_PROP); } - + if (!appInfo.webApps.isEmpty()) { appInfo.properties.setProperty("tomcat.unpackWar", "false"); } http://git-wip-us.apache.org/repos/asf/tomee/blob/8dec24c0/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java index 72e2ec5..b7002c6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java @@ -2345,7 +2345,10 @@ public class AutoConfig implements DynamicDeployer, JndiConstants { // for (final ContainerInfo containerInfo : containerInfos) { - if (!MdbContainerInfo.class.isInstance(containerInfo)) continue; + if (!MdbContainerInfo.class.isInstance(containerInfo)) { + continue; + } + final MdbContainerInfo mdbContainerInfo = MdbContainerInfo.class.cast(containerInfo); final String messageListenerInterface = mdbContainerInfo.properties.getProperty("MessageListenerInterface"); if (messageListenerInterface != null) { http://git-wip-us.apache.org/repos/asf/tomee/blob/8dec24c0/examples/connector-ear/pom.xml ---------------------------------------------------------------------- diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml index ca27be5..a17ef21 100644 --- a/examples/connector-ear/pom.xml +++ b/examples/connector-ear/pom.xml @@ -25,7 +25,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <tomee.version>1.7.6-SNAPSHOT</tomee.version> + <tomee.version>7.0.5-SNAPSHOT</tomee.version> <version.shrinkwrap.resolver>2.1.0</version.shrinkwrap.resolver> </properties>
