You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/22 02:24:36 UTC
svn commit: r1173917 - in
/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader:
EmbeddedJarScanner.java TomEEJarScanner.java
Author: dblevins
Date: Thu Sep 22 00:24:36 2011
New Revision: 1173917
URL: http://svn.apache.org/viewvc?rev=1173917&view=rev
Log:
Attempt to further optimize scanning (and memory usage)
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java?rev=1173917&r1=1173916&r2=1173917&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java Thu Sep 22 00:24:36 2011
@@ -67,7 +67,10 @@ public class EmbeddedJarScanner implemen
try {
final UrlSet classpath = new UrlSet(classloader);
- final UrlSet excluded = classpath.exclude(".*/WEB-INF/lib/.*");
+
+ UrlSet excluded = classpath.exclude(".*/WEB-INF/lib/.*");
+ excluded = excluded.exclude(".*myfaces-impl-.*");
+ excluded = excluded.exclude(".*openejb-jsf-.*");
final UrlSet scan = classpath.exclude(excluded);
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java?rev=1173917&r1=1173916&r2=1173917&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java Thu Sep 22 00:24:36 2011
@@ -30,29 +30,36 @@ import java.util.Set;
public class TomEEJarScanner extends StandardJarScanner {
public void scan(ServletContext context, ClassLoader classLoader, JarScannerCallback callback, Set<String> jarsToIgnore) {
- String openejbWar = System.getProperty("openejb.war");
-
- if (openejbWar == null) {
+ if ("FragmentJarScannerCallback".equals(callback.getClass().getSimpleName())) {
EmbeddedJarScanner embeddedJarScanner = new EmbeddedJarScanner();
embeddedJarScanner.scan(context, classLoader, callback, jarsToIgnore);
- return;
- }
-
- Set<String> newIgnores = new HashSet<String>();
- if (jarsToIgnore != null) {
- newIgnores.addAll(jarsToIgnore);
- }
-
- if (openejbWar != null && "FragmentJarScannerCallback".equals(callback.getClass().getSimpleName())) {
- File openejbApp = new File(openejbWar);
- File libFolder = new File(openejbApp, "lib");
- for (File f : libFolder.listFiles()) {
- if (f.getName().toLowerCase().endsWith(".jar")) {
- newIgnores.add(f.getName());
- }
- }
+ } else {
+ super.scan(context, classLoader, callback, jarsToIgnore);
}
- super.scan(context, classLoader, callback, newIgnores);
+// String openejbWar = System.getProperty("openejb.war");
+//
+// if (openejbWar == null) {
+// EmbeddedJarScanner embeddedJarScanner = new EmbeddedJarScanner();
+// embeddedJarScanner.scan(context, classLoader, callback, jarsToIgnore);
+// return;
+// }
+//
+// Set<String> newIgnores = new HashSet<String>();
+// if (jarsToIgnore != null) {
+// newIgnores.addAll(jarsToIgnore);
+// }
+//
+// if (openejbWar != null && "FragmentJarScannerCallback".equals(callback.getClass().getSimpleName())) {
+// File openejbApp = new File(openejbWar);
+// File libFolder = new File(openejbApp, "lib");
+// for (File f : libFolder.listFiles()) {
+// if (f.getName().toLowerCase().endsWith(".jar")) {
+// newIgnores.add(f.getName());
+// }
+// }
+// }
+//
+// super.scan(context, classLoader, callback, newIgnores);
}
}