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/09/13 13:47:35 UTC
[1/2] tomee git commit: TOMEE-1930 avoid to scan files tomcat is
uploading
Repository: tomee
Updated Branches:
refs/heads/master 2fe12fc53 -> 00378f292
TOMEE-1930 avoid to scan files tomcat is uploading
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/03aff626
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/03aff626
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/03aff626
Branch: refs/heads/master
Commit: 03aff626b0e75d4f0398d99ed4a20e38364695db
Parents: 2fe12fc
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Sep 13 15:45:30 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Sep 13 15:45:30 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/03aff626/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 5ed26c7..e167ca4 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
@@ -2146,7 +2146,11 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
final File appBase = appBase(standardHost);
final File[] files = appBase.listFiles();
if (null != files) {
- for (File file : files) {
+ for (final File file : files) {
+ if (file.getName().endsWith(".tmp")) { // tomcat is uploading, see org.apache.catalina.manager.ManagerServlet.deploy(java.io.PrintWriter, org.apache.catalina.util.ContextName, java.lang.String, boolean, javax.servlet.http.HttpServletRequest, org.apache.tomcat.util.res.StringManager)
+ continue;
+ }
+
final String name = file.getName();
// ignore war files
if (name.toLowerCase().endsWith(".war") || isRoot(name)
[2/2] tomee git commit: TOMEE-1930 flag to skip host check in webapp
builder
Posted by rm...@apache.org.
TOMEE-1930 flag to skip host check in webapp builder
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/00378f29
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/00378f29
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/00378f29
Branch: refs/heads/master
Commit: 00378f292ad6660470d6c15d6ef5df8dc5d00bdb
Parents: 03aff62
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Tue Sep 13 15:47:02 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Tue Sep 13 15:47:02 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/00378f29/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 e167ca4..1553219 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
@@ -267,6 +267,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
private ClassLoader parentClassLoader;
private boolean initJEEInfo = true;
private final ServletContextHandler servletContextHandler;
+ private boolean noHostCheck;
/**
* Creates a new web application builder
@@ -340,6 +341,8 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
} catch (final Throwable th) {
// no-op: can be another API impl, normally we are ok, this is really just a safe belt
}
+
+ noHostCheck = !Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.host.check", "true"));
}
private void setComponentsUsedByCDI() {
@@ -2123,6 +2126,9 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
*/
@Override
public synchronized void checkHost(final StandardHost standardHost) {
+ if (noHostCheck) {
+ return;
+ }
if (standardHost.getAutoDeploy()) {
// Undeploy any modified application
for (final Iterator<Map.Entry<String, DeployedApplication>> iterator = deployedApps.entrySet().iterator(); iterator.hasNext(); ) {
@@ -2146,7 +2152,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
final File appBase = appBase(standardHost);
final File[] files = appBase.listFiles();
if (null != files) {
- for (final File file : files) {
+ for (File file : files) {
if (file.getName().endsWith(".tmp")) { // tomcat is uploading, see org.apache.catalina.manager.ManagerServlet.deploy(java.io.PrintWriter, org.apache.catalina.util.ContextName, java.lang.String, boolean, javax.servlet.http.HttpServletRequest, org.apache.tomcat.util.res.StringManager)
continue;
}