You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/03/28 22:37:50 UTC
svn commit: r759598 - in /webservices/axis2/branches/java/1_5: ./
modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
modules/parent/pom.xml
Author: veithen
Date: Sat Mar 28 21:37:50 2009
New Revision: 759598
URL: http://svn.apache.org/viewvc?rev=759598&view=rev
Log:
Removed dependencies on xml-apis and xercesImpl since the target platform is now Java 5 (merged change from trunk).
Modified:
webservices/axis2/branches/java/1_5/ (props changed)
webservices/axis2/branches/java/1_5/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
webservices/axis2/branches/java/1_5/modules/parent/pom.xml
Propchange: webservices/axis2/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 28 21:37:50 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503,757151-757153
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503,757151-757153,759488,759507
Modified: webservices/axis2/branches/java/1_5/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java?rev=759598&r1=759597&r2=759598&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java (original)
+++ webservices/axis2/branches/java/1_5/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/GorillaDLWProxyTests.java Sat Mar 28 21:37:50 2009
@@ -25,7 +25,6 @@
import org.apache.axis2.jaxws.framework.AbstractTestCase;
import org.apache.axis2.jaxws.message.databinding.JAXBUtilsMonitor;
import org.apache.axis2.jaxws.proxy.gorilla_dlw.sei.GorillaInterface;
-import org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
@@ -482,7 +481,6 @@
GorillaInterface proxy = getProxy();
GregorianCalendar cal = new GregorianCalendar(Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH);
DatatypeFactory javaxtypeFactory = DatatypeFactory.newInstance();
- DatatypeFactory xercesfactoryImpl = DatatypeFactoryImpl.newInstance();
XMLGregorianCalendar request= javaxtypeFactory.newXMLGregorianCalendar(cal);
System.out.println("Javax Factory Clazz Name = "+request.getClass().getName());
Duration d = javaxtypeFactory.newDuration(System.currentTimeMillis());
Modified: webservices/axis2/branches/java/1_5/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/parent/pom.xml?rev=759598&r1=759597&r2=759598&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/parent/pom.xml Sat Mar 28 21:37:50 2009
@@ -141,8 +141,6 @@
<woden.version>1.0M8</woden.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xalan.version>2.7.0</xalan.version>
- <xerces.version>2.8.1</xerces.version>
- <xml_apis.version>1.3.04</xml_apis.version>
<xmlbeans.version>2.3.0</xmlbeans.version>
<xml_resolver.version>1.2</xml_resolver.version>
<xmlschema.version>1.4.3</xmlschema.version>
@@ -568,11 +566,6 @@
<version>${tomcat.version}</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml_apis.version}</version>
- </dependency>
- <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>${xml_resolver.version}</version>
@@ -581,6 +574,12 @@
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -701,6 +700,16 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>${axiom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -829,6 +838,10 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -840,6 +853,10 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -998,11 +1015,6 @@
<version>${jalopy.version}</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- <dependency>
<groupId>org.igniterealtime</groupId>
<artifactId>smack</artifactId>
<version>${smack.version}</version>
@@ -1067,10 +1079,6 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<scope>test</scope>