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/02/08 22:10:42 UTC
tomee git commit: tomcat.unpackWar for TomcatWebappDeployer and
fixing style
Repository: tomee
Updated Branches:
refs/heads/master 68d795781 -> f61f413bd
tomcat.unpackWar for TomcatWebappDeployer and fixing style
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f61f413b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f61f413b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f61f413b
Branch: refs/heads/master
Commit: f61f413bd87b989dea05d943443b922382eb8071
Parents: 68d7957
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Feb 8 22:10:27 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Feb 8 22:10:27 2016 +0100
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 8 +-
.../openejb/itest/legacy/LegacyServerTest.java" | 338 -------------------
.../tomee/catalina/TomcatWebAppBuilder.java | 1 +
.../deployment/TomcatWebappDeployer.java | 1 +
4 files changed, 8 insertions(+), 340 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/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 01b0d00..af34aa3 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
@@ -2370,8 +2370,12 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
final NamingEnumeration<Binding> bindings = globalContext.listBindings(ctx);
while (bindings.hasMoreElements()) {
final Binding binding = bindings.nextElement();
- if (!binding.getName().equals(objName)) continue;
- if (!LazyObjectReference.class.isInstance(binding.getObject())) continue;
+ if (!binding.getName().equals(objName)) {
+ continue;
+ }
+ if (!LazyObjectReference.class.isInstance(binding.getObject())) {
+ continue;
+ }
final LazyObjectReference<?> ref = LazyObjectReference.class.cast(binding.getObject());
if (! ref.isInitialized()) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/"itests/legacy-server\263src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java"
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/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 0368459..b889138 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
@@ -492,6 +492,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
standardContext.setParentClassLoader(containerLoader);
}
}
+ standardContext.setUnpackWAR(!"false".equalsIgnoreCase(appInfo.properties.getProperty("tomcat.unpackWar")));
if (contextXml != null) {
standardContext.setConfigFile(contextXmlUrl);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/f61f413b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
index a09d8da..de0914d 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/deployment/TomcatWebappDeployer.java
@@ -42,6 +42,7 @@ public class TomcatWebappDeployer implements WebAppDeployer {
final Collection<String> alreadyDeployed = tomcatWebAppBuilder.availableApps();
final AppInfo appInfo = fakeInfo(file, host, context);
+ appInfo.properties.setProperty("tomcat.unpackWar", "false");
try {
tomcatWebAppBuilder.deployWebApps(appInfo, null); // classloader == null -> standalone war
} catch (final Exception e) { // tomcat lost the real exception (only in lifecycle exception string) so try to find it back