Repository: tomee Updated Branches: refs/heads/master 09f5615ba -> e02c764db
addValve on host is locked so using pipeline directly Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e02c764d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e02c764d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e02c764d Branch: refs/heads/master Commit: e02c764db908ea49ced4890a38224c8710ccbb62 Parents: 09f5615 Author: Romain Manni-Bucau <rmannibu...@gmail.com> Authored: Sat Jul 16 11:18:05 2016 +0200 Committer: Romain Manni-Bucau <rmannibu...@gmail.com> Committed: Sat Jul 16 11:18:05 2016 +0200 ---------------------------------------------------------------------- .../apache/tomee/arquillian/webapp/TomEEWebappContainer.java | 5 ++++- .../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e02c764d/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java index 852bde2..6b2282f 100644 --- a/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java +++ b/arquillian/arquillian-tomee-webapp-remote/src/main/java/org/apache/tomee/arquillian/webapp/TomEEWebappContainer.java @@ -157,10 +157,13 @@ public class TomEEWebappContainer extends TomEEContainer<TomEEWebappConfiguratio final URL url = new URL(baseUrl); logger.info("Calling TomEE Installer Servlet on " + url); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < Integer.getInteger("tomee.webapp.container.client.retries", 3); i++) { final URLConnection uc = url.openConnection(); // dG9tZWU6dG9tZWU= --> Base64 of tomee:tomee final String authorizationString = "Basic dG9tZWU6dG9tZWU="; + final int timeout = Integer.getInteger("tomee.webapp.container.client.timeout", 60000); + uc.setConnectTimeout(timeout); + uc.setReadTimeout(timeout); uc.setRequestProperty("Authorization", authorizationString); try { final InputStream is = uc.getInputStream(); http://git-wip-us.apache.org/repos/asf/tomee/blob/e02c764d/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 66226ae..bb335ee 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 @@ -307,7 +307,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare final StandardHost host = (StandardHost) engineChild; manageCluster(host.getCluster()); addTomEERealm(host); - host.addValve(new OpenEJBSecurityListener.RequestCapturer()); + host.getPipeline().addValve(new OpenEJBSecurityListener.RequestCapturer()); hosts.add(host); for (final LifecycleListener listener : host.findLifecycleListeners()) { if (listener instanceof HostConfig) {