Author: kkolinko
Date: Thu Feb 5 18:12:31 2015
New Revision: 1657653
URL: http://svn.apache.org/r1657653
Log:
Fix compilation failure in a test class when using JDK 1.5.
The XPathFactory.newInstance(String, String, ClassLoader) method is @since Java
1.6.
>From code review, the only difference between old and new methods is presence
>of the second argument,
>"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl". The null class
>loader is interpreted as TCCL by both methods, so there is no difference.
This test is @Ignore'd so it is not really tested.
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
tomcat/taglibs/standard/trunk/pom.xml
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java?rev=1657653&r1=1657652&r2=1657653&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
Thu Feb 5 18:12:31 2015
@@ -218,7 +218,8 @@ public class ForEachTagTest {
return doc;
}
};
- XPathFactory factory =
XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI,
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl", null);
+ // XPathFactory factory =
XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI,
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl", null);
+ XPathFactory factory =
XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI);
System.out.println("factory.getClass() = " + factory.getClass());
factory.setXPathVariableResolver(resolver);
XPathExpression select = factory.newXPath().compile("$doc/root/a");
Modified: tomcat/taglibs/standard/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1657653&r1=1657652&r2=1657653&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/pom.xml Thu Feb 5 18:12:31 2015
@@ -65,6 +65,7 @@
<developer><name>Henri Yandell</name></developer>
<developer><name>Bjorn Townsend</name></developer>
<developer><name>Jeremy Boynes</name></developer>
+ <developer><name>Konstantin Kolinko</name></developer>
</developers>
<contributors>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
