- From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 02 Jul 2008 17:34:48 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/org/w3c/unicorn/contract
In directory hutz:/tmp/cvs-serv31756/org/w3c/unicorn/contract
Modified Files:
WADLUnmarshallerXPath.java
Log Message:
Fixed a few warnings
Removed XMLBeansTest.java as it won't compile without some libs
Forced com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl to be used
Renamed *_text10.vm to *_text.vm
Index: WADLUnmarshallerXPath.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/contract/WADLUnmarshallerXPath.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- WADLUnmarshallerXPath.java 17 Jun 2008 13:41:12 -0000 1.5
+++ WADLUnmarshallerXPath.java 2 Jul 2008 17:34:46 -0000 1.6
@@ -22,7 +22,6 @@
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,6 +32,8 @@
import org.w3c.unicorn.util.LocalizedString;
import org.xml.sax.SAXException;
+import com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl;
+
/**
* WADLUnmarshallerXPath<br />
* Created: May 22, 2006 6:01:14 PM<br />
@@ -112,9 +113,10 @@
WADLUnmarshallerXPath.logger.trace("Constructor");
this.aDocumentBuilderFactory = DocumentBuilderFactory.newInstance();
+
this.aDocumentBuilder = this.aDocumentBuilderFactory
.newDocumentBuilder();
- this.aXPath = XPathFactory.newInstance().newXPath();
+ this.aXPath = new XPathFactoryImpl().newXPath();
this.aXPath
.setNamespaceContext(WADLUnmarshallerXPath.aNamespaceContext);
}
@@ -141,7 +143,7 @@
MimeTypeParseException {
WADLUnmarshallerXPath.logger.trace("unmarshal");
this.parseDocsHeader();
- this.parseMethods();
+ this.parseMethods();
}
/**
Received on Wednesday, 2 July 2008 17:35:24 UTC