- From: Jonathan Barouh via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 09 Sep 2008 10:16:18 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/org/w3c/unicorn In directory hutz:/tmp/cvs-serv20587/org/w3c/unicorn Modified Files: UnicornCall.java Log Message: Conflict in libraries for XPathFactory fixed. Index: UnicornCall.java =================================================================== RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/UnicornCall.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- UnicornCall.java 8 Sep 2008 13:44:30 -0000 1.19 +++ UnicornCall.java 9 Sep 2008 10:16:16 -0000 1.20 @@ -46,6 +46,8 @@ import org.w3c.unicorn.tasklisttree.TLTNode; import org.w3c.unicorn.util.Property; +import com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl; + /** * UnicornCall Created: Jun 29, 2006 2:44:12 PM * @@ -791,7 +793,7 @@ String xpathStr = cond.getValue(); - XPathFactory xpathFact = XPathFactory.newInstance(); + XPathFactory xpathFact = new XPathFactoryImpl(); XPath xpath = xpathFact.newXPath(); XPathExpression xpe = xpath.compile(xpathStr);
Received on Tuesday, 9 September 2008 10:16:51 UTC