You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2006/12/08 18:12:15 UTC
svn commit: r484664 - in /incubator/ode/trunk: ./ axis2-war/ bpel-compiler/
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/
bpel-store/src/main/java/org/apache/ode/store/ utils/ ut...
Author: mriou
Date: Fri Dec 8 09:12:13 2006
New Revision: 484664
URL: http://svn.apache.org/viewvc?view=rev&rev=484664
Log:
Replaced the dependency on the Xerces version embedded in the JDK with a direct dependency on Xerces and Xalan. Made a 3 hours offrand to the Maven gods to get the right versions of both Xerces and Xalan to be picked, without duplicates.
Modified:
incubator/ode/trunk/axis2-war/pom.xml
incubator/ode/trunk/bpel-compiler/pom.xml
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/DOMBuilderContentHandler.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentEntityResolver.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java
incubator/ode/trunk/pom.xml
incubator/ode/trunk/utils/pom.xml
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/XMLParserUtils.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/DefaultXMLEntityResolver.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java
incubator/ode/trunk/utils/src/test/java/org/apache/ode/utils/XMLParserUtilsTest.java
Modified: incubator/ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/pom.xml?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/axis2-war/pom.xml (original)
+++ incubator/ode/trunk/axis2-war/pom.xml Fri Dec 8 09:12:13 2006
@@ -368,6 +368,11 @@
<artifactId>activation</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- ODE Database -->
<dependency>
Modified: incubator/ode/trunk/bpel-compiler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/pom.xml?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/bpel-compiler/pom.xml (original)
+++ incubator/ode/trunk/bpel-compiler/pom.xml Fri Dec 8 09:12:13 2006
@@ -76,5 +76,9 @@
<artifactId>saxon-dom</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>xalan</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WsdlFinderXMLEntityResolver.java Fri Dec 8 09:12:13 2006
@@ -18,20 +18,19 @@
*/
package org.apache.ode.bpel.compiler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ode.utils.fs.FileUtils;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
+import org.apache.xerces.xni.parser.XMLInputSource;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ode.utils.fs.FileUtils;
-
-import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
public class WsdlFinderXMLEntityResolver implements XMLEntityResolver {
Modified: incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/DOMBuilderContentHandler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/DOMBuilderContentHandler.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/DOMBuilderContentHandler.java (original)
+++ incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/DOMBuilderContentHandler.java Fri Dec 8 09:12:13 2006
@@ -18,14 +18,13 @@
*/
package org.apache.ode.bpel.compiler.bom;
+import org.apache.xml.utils.DOMBuilder;
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import com.sun.org.apache.xml.internal.utils.DOMBuilder;
-
public class DOMBuilderContentHandler extends DOMBuilder {
private Locator _locator;
@@ -40,7 +39,7 @@
public void startElement(String ns, String localName, String name, Attributes atts) throws SAXException {
if (localName.equals("literal") || _suppressLineNo > 0)
++_suppressLineNo;
-
+
if (_locator != null && _suppressLineNo == 0) {
AttributesImpl a = new AttributesImpl(atts);
a.addAttribute(BpelObject.ATTR_LINENO.getNamespaceURI(), BpelObject.ATTR_LINENO.getLocalPart(),
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentEntityResolver.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentEntityResolver.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentEntityResolver.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentEntityResolver.java Fri Dec 8 09:12:13 2006
@@ -1,10 +1,10 @@
package org.apache.ode.store;
-import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
import org.apache.ode.utils.fs.FileUtils;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
+import org.apache.xerces.xni.parser.XMLInputSource;
import java.io.File;
import java.io.IOException;
Modified: incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java (original)
+++ incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DocumentRegistry.java Fri Dec 8 09:12:13 2006
@@ -1,11 +1,11 @@
package org.apache.ode.store;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL;
import org.apache.ode.utils.xsd.SchemaModel;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
import javax.xml.namespace.QName;
import java.net.URI;
Modified: incubator/ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Fri Dec 8 09:12:13 2006
@@ -80,14 +80,15 @@
<staxVersion>1.1.2-dev</staxVersion>
<wsdl4jVersion>1.5.2</wsdl4jVersion>
<xapoolVersion>1.4</xapoolVersion>
- <xercesVersion>2.6.2</xercesVersion>
+ <xercesVersion>2.8.0</xercesVersion>
<xmlResolverVersion>1.1</xmlResolverVersion>
<xmlbeansVersion>2.1.0</xmlbeansVersion>
<springVersion>1.2.6</springVersion>
<derbyVersion>10.1.2.1</derbyVersion>
<quartzVersion>1.5.1</quartzVersion>
<xstreamVersion>1.2</xstreamVersion>
- <hsqlDbVersion>1.8.0.7</hsqlDbVersion>
+ <xalanVersion>2.7.0</xalanVersion>
+ <hsqlDbVersion>1.8.0.7</hsqlDbVersion>
<!--
| Build number used by the intalio:release plugin
@@ -130,7 +131,6 @@
<module>dao-hibernate</module>
<module>bpel-store</module>
<module>dao-hibernate-db-derby</module>
- <!-- module>dao-memory</module -->
<module>jbi</module>
@@ -623,6 +623,17 @@
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>${jaxenVersion}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xalan</artifactId>
+ <groupId>xalan</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>xalan</artifactId>
+ <version>${xalanVersion}</version>
</dependency>
<dependency>
Modified: incubator/ode/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/pom.xml?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/pom.xml (original)
+++ incubator/ode/trunk/utils/pom.xml Fri Dec 8 09:12:13 2006
@@ -24,39 +24,49 @@
<name>ODE :: Utilities</name>
<packaging>jar</packaging>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode</artifactId>
- <version>2.0-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
<version>2.0-SNAPSHOT</version>
<dependencies>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>xalan</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/DOMUtils.java Fri Dec 8 09:12:13 2006
@@ -18,8 +18,6 @@
*/
package org.apache.ode.utils;
-import com.sun.org.apache.xerces.internal.dom.DOMOutputImpl;
-import com.sun.org.apache.xerces.internal.impl.Constants;
import com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
@@ -30,6 +28,8 @@
import org.apache.commons.pool.PoolableObjectFactory;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.ode.utils.sax.LoggingErrorHandler;
+import org.apache.xerces.dom.DOMOutputImpl;
+import org.apache.xerces.impl.Constants;
import org.w3c.dom.*;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/XMLParserUtils.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/XMLParserUtils.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/XMLParserUtils.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/XMLParserUtils.java Fri Dec 8 09:12:13 2006
@@ -18,23 +18,21 @@
*/
package org.apache.ode.utils;
-import com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl;
-import com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl;
-import com.sun.org.apache.xerces.internal.parsers.DOMParser;
-import com.sun.org.apache.xerces.internal.parsers.SAXParser;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
+import org.apache.xerces.jaxp.SAXParserFactoryImpl;
+import org.apache.xerces.parsers.DOMParser;
+import org.apache.xerces.parsers.SAXParser;
+import org.xml.sax.*;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.SAXParserFactory;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Iterator;
import java.util.StringTokenizer;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.*;
-
/**
* A collection of utility methods for the Apache Xerces XML parser.
*/
@@ -58,9 +56,9 @@
*/
static {
System.setProperty("javax.xml.parsers.SAXParserFactory",
- "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl");
+ "org.apache.xerces.jaxp.SAXParserFactoryImpl");
System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
- "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
+ "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
}
/**
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/CapturingXMLEntityResolver.java Fri Dec 8 09:12:13 2006
@@ -18,21 +18,20 @@
*/
package org.apache.ode.utils.xsd;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ode.utils.StreamUtils;
import org.apache.ode.utils.fs.FileUtils;
-import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
+import org.apache.xerces.xni.parser.XMLInputSource;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* A wrapper for {@link XMLEntityResolver}s that defers resolution to the
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/DefaultXMLEntityResolver.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/DefaultXMLEntityResolver.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/DefaultXMLEntityResolver.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/DefaultXMLEntityResolver.java Fri Dec 8 09:12:13 2006
@@ -18,10 +18,10 @@
*/
package org.apache.ode.utils.xsd;
-import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
+import org.apache.xerces.xni.parser.XMLInputSource;
import java.io.IOException;
import java.net.URL;
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/LoggingXmlErrorHandler.java Fri Dec 8 09:12:13 2006
@@ -19,12 +19,11 @@
package org.apache.ode.utils.xsd;
-import org.apache.ode.utils.msg.MessageBundle;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLErrorHandler;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException;
-
import org.apache.commons.logging.Log;
+import org.apache.ode.utils.msg.MessageBundle;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLErrorHandler;
+import org.apache.xerces.xni.parser.XMLParseException;
/**
* Implementation of {@link LoggingXmlErrorHandler} that outputs messages to a
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java Fri Dec 8 09:12:13 2006
@@ -18,26 +18,24 @@
*/
package org.apache.ode.utils.xsd;
-import com.sun.org.apache.xerces.internal.dom.DOMInputImpl;
-import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaLoader;
-import com.sun.org.apache.xerces.internal.xs.LSInputList;
-import com.sun.org.apache.xerces.internal.xs.XSModel;
-import com.sun.org.apache.xerces.internal.xs.XSTypeDefinition;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource;
-import com.sun.org.apache.xerces.internal.xni.XMLResourceIdentifier;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
+import org.apache.xerces.dom.DOMInputImpl;
+import org.apache.xerces.impl.xs.XMLSchemaLoader;
+import org.apache.xerces.xni.XMLResourceIdentifier;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
+import org.apache.xerces.xni.parser.XMLInputSource;
+import org.apache.xerces.xs.LSInputList;
+import org.apache.xerces.xs.XSModel;
+import org.apache.xerces.xs.XSTypeDefinition;
+import org.w3c.dom.ls.LSInput;
+import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URI;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.ls.LSInput;
/**
* Xerces based schema model.
Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/xsd/XSUtils.java Fri Dec 8 09:12:13 2006
@@ -18,14 +18,17 @@
*/
package org.apache.ode.utils.xsd;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ode.utils.msg.MessageBundle;
-import com.sun.org.apache.xerces.internal.dom.DOMInputImpl;
-import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaLoader;
-import com.sun.org.apache.xerces.internal.xni.XNIException;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLEntityResolver;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLErrorHandler;
-import com.sun.org.apache.xerces.internal.xni.parser.XMLParseException;
-import com.sun.org.apache.xerces.internal.xs.XSModel;
+import org.apache.xerces.dom.DOMInputImpl;
+import org.apache.xerces.impl.xs.XMLSchemaLoader;
+import org.apache.xerces.xni.XNIException;
+import org.apache.xerces.xni.parser.XMLEntityResolver;
+import org.apache.xerces.xni.parser.XMLErrorHandler;
+import org.apache.xerces.xni.parser.XMLParseException;
+import org.apache.xerces.xs.XSModel;
+import org.w3c.dom.ls.LSInput;
import java.io.UnsupportedEncodingException;
import java.net.URI;
@@ -34,10 +37,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.ls.LSInput;
-
/**
* Various utility methods related to XML Schema processing.
*/
@@ -204,9 +203,6 @@
throw new XNIException("Unknown XSD error state; domain=" + domain + ", key=" +key);
}
- /**
- * @see org.apache.xerces.xni.impl.XMLErrorHandler#fatalError(java.lang.String, java.lang.String, org.apache.xerces.xni.impl.XMLParseException)
- */
public void fatalError(String domain, String key, XMLParseException ex) throws XNIException {
if (_log.isDebugEnabled())
_log.debug("XSDErrorHandler.fatal: domain=" + domain + ", key=" + key,ex);
Modified: incubator/ode/trunk/utils/src/test/java/org/apache/ode/utils/XMLParserUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/test/java/org/apache/ode/utils/XMLParserUtilsTest.java?view=diff&rev=484664&r1=484663&r2=484664
==============================================================================
--- incubator/ode/trunk/utils/src/test/java/org/apache/ode/utils/XMLParserUtilsTest.java (original)
+++ incubator/ode/trunk/utils/src/test/java/org/apache/ode/utils/XMLParserUtilsTest.java Fri Dec 8 09:12:13 2006
@@ -18,17 +18,15 @@
*/
package org.apache.ode.utils;
-import org.apache.ode.utils.sax.FailOnErrorErrorHandler;
-import com.sun.org.apache.xerces.internal.parsers.DOMParser;
import common.TestResources;
-
-import java.net.URL;
-
import junit.framework.TestCase;
-
+import org.apache.ode.utils.sax.FailOnErrorErrorHandler;
+import org.apache.xerces.parsers.DOMParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+
+import java.net.URL;
public class XMLParserUtilsTest extends TestCase {