X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.webextender%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fwebextender%2FTomcatDeployer.java;h=27b0670321327d088bae888afde802bb01d759c0;hb=6923ae4b420d1b2eccbccae00f04ae46ab59f72c;hp=c41351dc0083440165d534fb75e2ab2431f9db53;hpb=ca91d6c3f261173feb0ae4914450a119336f83c1;p=lgpl%2Fargeo-commons.git diff --git a/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java b/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java index c41351dc0..27b067032 100644 --- a/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java +++ b/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/webextender/TomcatDeployer.java @@ -15,6 +15,7 @@ import org.springframework.util.ObjectUtils; public class TomcatDeployer extends TomcatWarDeployer { private String serverInfo; private Service service; + private String contextPath = "/org.argeo.rap.webapp"; @Override public void setService(Object service) { @@ -23,8 +24,8 @@ public class TomcatDeployer extends TomcatWarDeployer { // TODO: listen to OSGi service so that we get notified in the // (unlikely) case the underlying service is updated serverInfo = ((Service) service).getInfo(); - if (log.isDebugEnabled()) - log.debug("Argeo modified Tomcat deployer used"); + if (log.isTraceEnabled()) + log.trace("Argeo modified Tomcat deployer used"); } @Override @@ -42,8 +43,7 @@ public class TomcatDeployer extends TomcatWarDeployer { // Required for multiple RAP sessions to work with Tomcat // see // http://wiki.eclipse.org/RAP/FAQ#How_to_run_a_RAP_application_in_multiple_browser_tabs.2Fwindows.3F - // TODO make it configurable in order to cover other web apps - Context context = getContext("/org.argeo.rap.webapp"); + Context context = getContext(contextPath); if (context != null) context.setCookies(false); } @@ -51,7 +51,8 @@ public class TomcatDeployer extends TomcatWarDeployer { /** @return null if not found */ private Context getContext(String path) { for (Container container : getHost().findChildren()) { - log.debug(container.getClass() + ": " + container.getName()); + if (log.isTraceEnabled()) + log.trace(container.getClass() + ": " + container.getName()); if (container instanceof Context) { Context context = (Context) container; if (path.equals(context.getPath())) @@ -78,4 +79,8 @@ public class TomcatDeployer extends TomcatWarDeployer { return children[0]; } + public void setContextPath(String contextPath) { + this.contextPath = contextPath; + } + }