tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: TOMEE-1066 upgrade jstl - fixing scanning includes
Date Fri, 17 Mar 2017 21:15:17 GMT
Repository: tomee
Updated Branches:
  refs/heads/master 06e48946c -> e416ea933


TOMEE-1066 upgrade jstl - fixing scanning includes


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e416ea93
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e416ea93
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e416ea93

Branch: refs/heads/master
Commit: e416ea933450ea34a99bf829cde362480b56f59e
Parents: 06e4894
Author: rmannibucau <rmannibucau@apache.org>
Authored: Fri Mar 17 22:15:10 2017 +0100
Committer: rmannibucau <rmannibucau@apache.org>
Committed: Fri Mar 17 22:15:10 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/openejb/config/TldScanner.java        | 2 +-
 .../src/main/java/org/apache/tomee/jasper/TomEETldScanner.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/e416ea93/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
index 0666810..e8849f3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
@@ -324,7 +324,7 @@ public class TldScanner {
             urlSet = URLs.cullSystemJars(urlSet);
             urlSet = applyBuiltinExcludes(
                     urlSet,
-                    Filters.tokens("taglibs-standard-jstlel", "javax.faces-2.", "spring-security-taglibs",
"spring-webmvc"),
+                    Filters.tokens("taglibs-standard-impl", "taglibs-standard-jstlel", "javax.faces-2.",
"spring-security-taglibs", "spring-webmvc"),
                     Filters.prefixes("commons-jcs-", "myfaces-", "tomcat-websocket.jar"));
// myfaces is hardcoded in tomee
         } catch (final IOException e) {
             DeploymentLoader.logger.warning("Error scanning class loader for JSP tag libraries",
e);

http://git-wip-us.apache.org/repos/asf/tomee/blob/e416ea93/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java
index 61a96a4..5d6773b 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/jasper/TomEETldScanner.java
@@ -39,7 +39,7 @@ import static org.apache.openejb.loader.JarLocation.jarLocation;
 public class TomEETldScanner extends TldScanner {
     private static final Paths PATHS = new Paths(null);
     private static final URL MYFACES_URL = findJar("myfaces-impl", "org.apache.myfaces.webapp.AbstractFacesInitializer");
-    private static final URL JSTL_URL = findJar("taglibs-standard-jstlel", "javax.servlet.jsp.jstl.core.ConditionalTagSupport");
+    private static final URL JSTL_URL = findJar("taglibs-standard-impl", "javax.servlet.jsp.jstl.core.ConditionalTagSupport");
     private static final Map<String, TldResourcePath> URI_TLD_RESOURCE = new HashMap<>();
     private static final Map<TldResourcePath, TaglibXml> TLD_RESOURCE_TAG_LIB = new
HashMap<>();
 


Mime
View raw message