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/09/19 13:04:31 UTC
svn commit: r816891 - in /webservices/axis2/trunk/java/modules:
integration/itest-build.xml integration/test-resources/wsdl20/GreatH.wsdl
integration/test-resources/wsdl20/HotelReservationService.wsdl
kernel/pom.xml parent/pom.xml
Author: veithen
Date: Sat Sep 19 11:04:30 2009
New Revision: 816891
URL: http://svn.apache.org/viewvc?rev=816891&view=rev
Log:
Fixed the xercesImpl dependency:
* Added an integration test that invokes code generation from a WSDL 2.0. This test fails when xercesImpl is not in the classpath, as expected from WODEN-152.
* Cleaned up the existing WSDL 2.0 test files so that only the final version of WSDL 2.0 is used.
* Changed the dependencies so that xercesImpl comes in as a transitive dependency of woden-impl-dom. This is now the only dependency on xercesImpl.
Removed:
webservices/axis2/trunk/java/modules/integration/test-resources/wsdl20/GreatH.wsdl
Modified:
webservices/axis2/trunk/java/modules/integration/itest-build.xml
webservices/axis2/trunk/java/modules/integration/test-resources/wsdl20/HotelReservationService.wsdl
webservices/axis2/trunk/java/modules/kernel/pom.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
Modified: webservices/axis2/trunk/java/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest-build.xml?rev=816891&r1=816890&r2=816891&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-build.xml Sat Sep 19 11:04:30 2009
@@ -94,6 +94,7 @@
</java>
<ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="rpc-wsdl-codegen" />
+ <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="wsdl20-codegen" />
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestModuleB" />
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/SOAP12Testing/SOAP12TestModuleC" />
@@ -149,6 +150,16 @@
target="jar.client"/>
</target>
+ <target name="wsdl20-codegen">
+ <echo>Running codegen for WSDL 2.0</echo>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-wv 2.0 -ap -o target/wsdl20-test -s -uri test-resources/wsdl20/HotelReservationService.wsdl"/>
+ </java>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/wsdl20-test"
+ target="jar.client"/>
+ </target>
+
<target name="enterprise-wsdl-codegen">
<!-- codegen for the enterprise wsdl -->
<echo>Running codegen for Enterprise WSDL - take 1</echo>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/wsdl20/HotelReservationService.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test-resources/wsdl20/HotelReservationService.wsdl?rev=816891&r1=816890&r2=816891&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/wsdl20/HotelReservationService.wsdl (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/wsdl20/HotelReservationService.wsdl Sat Sep 19 11:04:30 2009
@@ -20,7 +20,7 @@
-->
<description
- xmlns="http://www.w3.org/2006/01/wsdl"
+ xmlns="http://www.w3.org/ns/wsdl"
targetNamespace= "http://greath.example.com/2004/wsdl/resSvc"
xmlns:tns= "http://greath.example.com/2004/wsdl/resSvc"
xmlns:ghns = "http://greath.example.com/2004/schemas/resSvc"
Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?rev=816891&r1=816890&r2=816891&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Sat Sep 19 11:04:30 2009
@@ -81,31 +81,11 @@
<groupId>org.apache.woden</groupId>
<artifactId>woden-api</artifactId>
<version>${woden.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden-impl-dom</artifactId>
<version>${woden.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=816891&r1=816890&r2=816891&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sat Sep 19 11:04:30 2009
@@ -813,6 +813,14 @@
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -828,6 +836,16 @@
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <!-- For the moment, woden-impl-dom really depends on Xerces; see WODEN-152.
+ Once this is fixed, we can also exclude xerces:xercesImpl. -->
+ <!-- exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion -->
</exclusions>
</dependency>
<dependency>