Repository: tomee Updated Branches: refs/heads/master fa264b766 -> bccc67be0
forcing tomcat.unpackWar=false for ears as well Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bccc67be Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bccc67be Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bccc67be Branch: refs/heads/master Commit: bccc67be0bf8381328d5199e6dc0efbbaf2f35ab Parents: fa264b7 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Tue Feb 9 18:47:15 2016 +0100 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Tue Feb 9 18:47:15 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/openejb/assembler/DeployerEjb.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/bccc67be/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 cc17061..7f51ad0 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 @@ -25,6 +25,7 @@ import org.apache.openejb.UndeployException; import org.apache.openejb.assembler.classic.AppInfo; import org.apache.openejb.assembler.classic.Assembler; import org.apache.openejb.assembler.classic.DeploymentExceptionManager; +import org.apache.openejb.assembler.classic.WebAppInfo; import org.apache.openejb.config.AppModule; import org.apache.openejb.config.ConfigurationFactory; import org.apache.openejb.config.DeploymentLoader; @@ -248,6 +249,9 @@ public class DeployerEjb implements Deployer { appInfo.appId = properties.getProperty(OPENEJB_DEPLOYER_FORCED_APP_ID_PROP); } + if (!appInfo.webApps.isEmpty()) { + appInfo.properties.setProperty("tomcat.unpackWar", "false"); + } assembler.createApplication(appInfo); saveIfNeeded(properties, file, appInfo);