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/03/16 11:01:58 UTC
tomee git commit: TOMEE-1738 basic TomEEJarScanner configuration
Repository: tomee
Updated Branches:
refs/heads/master 9f790cc11 -> 46bd8a8d3
TOMEE-1738 basic TomEEJarScanner configuration
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/46bd8a8d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/46bd8a8d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/46bd8a8d
Branch: refs/heads/master
Commit: 46bd8a8d39b5041e09bb34d08127eddb119af33f
Parents: 9f790cc
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Mar 16 11:01:38 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Mar 16 11:01:38 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/tomee/loader/TomcatHelper.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/46bd8a8d/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
index c12e420..e2acc45 100644
--- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
+++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java
@@ -31,6 +31,7 @@ import javax.management.ObjectName;
import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
import java.security.Principal;
+import java.util.Properties;
public class TomcatHelper {
private static StandardServer server;
@@ -158,7 +159,19 @@ public class TomcatHelper {
if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("tomee.tomcat.override.jar-scanner", "true"))
&& !TomEEJarScanner.class.isInstance(standardContext.getJarScanner())
&& StandardJarScanner.class.isInstance(standardContext.getJarScanner())) {
- standardContext.setJarScanner(new TomEEJarScanner());
+ final TomEEJarScanner jarScanner = new TomEEJarScanner();
+
+ final Properties properties = SystemInstance.get().getProperties();
+ final String scanClasspath = properties.getProperty(TomEEJarScanner.class.getName() + ".scanClassPath");
+ if (scanClasspath != null) {
+ jarScanner.setScanClassPath(Boolean.parseBoolean(scanClasspath));
+ }
+ final String scanBootstrap = properties.getProperty(TomEEJarScanner.class.getName() + ".scanBootstrapClassPath");
+ if (scanBootstrap != null) {
+ jarScanner.setScanBootstrapClassPath(Boolean.parseBoolean(scanBootstrap));
+ }
+
+ standardContext.setJarScanner(jarScanner);
}
} catch (final Exception e) {
// ignore