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 2015/04/13 10:58:16 UTC
tomee git commit: better finding of library for TomEETldScanner
Repository: tomee
Updated Branches:
refs/heads/master f5563bd1f -> 25c10a46a
better finding of library for TomEETldScanner
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/25c10a46
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/25c10a46
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/25c10a46
Branch: refs/heads/master
Commit: 25c10a46a84e269154058cca676ec689702c96a1
Parents: f5563bd
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 13 10:58:10 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 13 10:58:10 2015 +0200
----------------------------------------------------------------------
tck/cdi-embedded/src/test/resources/failing.xml | 5 +----
.../java/org/apache/tomee/jasper/TomEETldScanner.java | 14 +++++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/25c10a46/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index 729103e..bf0d833 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -32,10 +32,7 @@
-Dopenejb.cdi.conversation.http.use-get-parameter=true
-->
<classes>
- <class name="org.jboss.cdi.tck.tests.alternative.selection.resource.ResourceAlternative04Test" />
- <class name="org.jboss.cdi.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest" />
- <class name="org.jboss.cdi.tck.tests.context.conversation.event.notattached.DestroyConversationNotAssociatedWithCurrentRequestEventTest" />
- <class name="org.jboss.cdi.tck.tests.context.conversation.servlet.ServletConversationTest" />
+ <class name="org.jboss.cdi.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest" />
</classes>
</test>
</suite>
http://git-wip-us.apache.org/repos/asf/tomee/blob/25c10a46/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 f53b605..3e60773 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
@@ -25,6 +25,7 @@ import org.apache.tomcat.util.descriptor.tld.TldResourcePath;
import org.apache.tomcat.util.descriptor.tld.ValidatorXml;
import org.apache.tomee.installer.Paths;
+import java.io.File;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -32,11 +33,13 @@ import javax.servlet.ServletContext;
import javax.servlet.jsp.tagext.FunctionInfo;
import javax.servlet.jsp.tagext.TagAttributeInfo;
+import static org.apache.openejb.loader.JarLocation.jarLocation;
+
@SuppressWarnings("PMD") // this is generated so we don't really care
public class TomEETldScanner extends TldScanner {
private static final Paths PATHS = new Paths(null);
- private static final URL MYFACES_URL = findJar("myfaces-impl");
- private static final URL JSTL_URL = findJar("openejb-jstl");
+ private static final URL MYFACES_URL = findJar("myfaces-impl", "org.apache.myfaces.webapp.AbstractFacesInitializer");
+ private static final URL JSTL_URL = findJar("openejb-jstl", "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<>();
@@ -7192,10 +7195,11 @@ public class TomEETldScanner extends TldScanner {
}
//CHECKSTYLE:ON
- private static URL findJar(final String s) {
+ private static URL findJar(final String s, final String api) {
try {
- return PATHS.findTomEELibJar(s).toURI().toURL();
- } catch (final Exception e) {
+ final File tomEELibJar = PATHS.findTomEELibJar(s);
+ return (tomEELibJar == null ? jarLocation(TomEETldScanner.class.getClassLoader().loadClass(api)) : tomEELibJar).toURI().toURL();
+ } catch (final Throwable e) {
// no-op
}
return null;