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 2014/12/10 10:53:36 UTC
tomee git commit: skipping myfaces in TomEEJarScanner
Repository: tomee
Updated Branches:
refs/heads/develop 18b7cb8bc -> 692689ba8
skipping myfaces in TomEEJarScanner
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/692689ba
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/692689ba
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/692689ba
Branch: refs/heads/develop
Commit: 692689ba826c049bba826c01c28ad26ed7ffb6c7
Parents: 18b7cb8
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Dec 10 10:53:04 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Dec 10 10:53:04 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/tomee/loader/TomEEJarScanner.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/692689ba/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
index 637bd04..1695dcc 100644
--- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
+++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java
@@ -105,12 +105,12 @@ public class TomEEJarScanner extends StandardJarScanner {
if (INCLUDE.accept(jarName)) {
return true;
}
- if (jarName.startsWith("tomcat-websocket")) {
+ if (jarName.startsWith("tomcat-websocket") || jarName.startsWith("myfaces-impl") /* see org.apache.tomee.jasper.TomEETldScanner.scanPlatform */) {
return false;
}
}
if (jarName.startsWith("johnzon-")) {
- return false; // but we scan it in openejb scnaning
+ return false; // but we scan it in openejb scanning
}
return !NewLoaderLogic.skip(jarName) && (delegate == null || delegate.check(jarScanType, jarName));
}