You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/02/08 23:46:13 UTC
svn commit: r505074 - in /incubator/cxf/trunk: pom.xml
rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
tools/validator/pom.xml
Author: dkulp
Date: Thu Feb 8 14:46:12 2007
New Revision: 505074
URL: http://svn.apache.org/viewvc?view=rev&rev=505074
Log:
Fixes to remove xerces dependencies in httpunit
Modified:
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
incubator/cxf/trunk/tools/validator/pom.xml
Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?view=diff&rev=505074&r1=505073&r2=505074
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Thu Feb 8 14:46:12 2007
@@ -423,6 +423,20 @@
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<version>1.6.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jtidy</groupId>
@@ -505,6 +519,12 @@
<groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
<version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?view=diff&rev=505074&r1=505073&r2=505074
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Thu Feb 8 14:46:12 2007
@@ -222,7 +222,7 @@
URLClassLoader cl;
try {
- cl = new URLClassLoader(new URL[] {classes.toURL()}, classLoader);
+ cl = new URLClassLoader(new URL[] {classes.toURI().toURL()}, classLoader);
} catch (MalformedURLException mue) {
throw new IllegalStateException("Internal error; a directory returns a malformed URL: "
+ mue.getMessage(), mue);
Modified: incubator/cxf/trunk/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/pom.xml?view=diff&rev=505074&r1=505073&r2=505074
==============================================================================
--- incubator/cxf/trunk/tools/validator/pom.xml (original)
+++ incubator/cxf/trunk/tools/validator/pom.xml Thu Feb 8 14:46:12 2007
@@ -83,6 +83,10 @@
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>