[jbossws-commits] JBossWS SVN: r6234 - in stack/cxf/trunk: ant-import and 1 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Fri Apr 4 07:58:14 EDT 2008 

Author: thomas.diesler at jboss.com
Date: 2008-04-04 07:58:14 -0400 (Fri, 04 Apr 2008)
New Revision: 6234

Modified:
   stack/cxf/trunk/ant-import/build-testsuite.xml
   stack/cxf/trunk/ant-import/build-thirdparty.xml
   stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
   stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
   stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
   stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
   stack/cxf/trunk/version.properties
Log:
[JBWS-2096] Migrate common jax-ws tests to framework (WIP)

Modified: stack/cxf/trunk/ant-import/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-testsuite.xml	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/ant-import/build-testsuite.xml	2008-04-04 11:58:14 UTC (rev 6234)
@@ -52,11 +52,27 @@
     
   </target>
   
+	<!-- ================================================================== -->
+	<!-- Generating sources                                                 -->
+	<!-- ================================================================== -->
+
+	<target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts">
+
+		<!-- Define the JAX-WS wsconsume task - ->
+		<taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">			
+      <classpath refid="tests.client.classpath"/>
+    </taskdef>
+    
+		<wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+		<wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/>
+    -->
+	</target>
+
   <!-- ================================================================== -->
   <!-- Compiling                                                          -->
   <!-- ================================================================== -->
 
-  <target name="tests-compile" depends="tests-init" description="Compile sources">
+  <target name="tests-compile" depends="wsconsume" description="Compile sources">
 		<macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
 		<macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/>
   </target>

Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml	2008-04-04 11:58:14 UTC (rev 6234)
@@ -84,7 +84,10 @@
   
   <target name="thirdparty-classpath" depends="thirdparty-get">
     <path id="cxf.integration.classpath">
-        <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar -->
+      <!-- 
+        A stack MUST NOT have a compile time dependency on framework
+        http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071
+      -->
       <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
       <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
       

Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt	2008-04-04 11:58:14 UTC (rev 6234)
@@ -4,7 +4,28 @@
 
 # EJB3/Injection excludes
 org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
 
+# [JBWS-1774] Provide tools implementation for CXF
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
 # [JBWS-1683] Fix JAXR samples for CXF
 org/jboss/test/ws/jaxws/samples/jaxr/**
 

Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt	2008-04-04 11:58:14 UTC (rev 6234)
@@ -4,7 +4,28 @@
 
 # EJB3/Injection excludes
 org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
 
+# [JBWS-1774] Provide tools implementation for CXF
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
 # [JBWS-1683] Fix JAXR samples for CXF
 org/jboss/test/ws/jaxws/samples/jaxr/**
 

Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt	2008-04-04 11:58:14 UTC (rev 6234)
@@ -2,6 +2,26 @@
 # $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun at jboss.com $
 #
 
+# [JBWS-1774] Provide tools implementation for CXF
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
 # [JBWS-1683] Fix JAXR samples for CXF
 org/jboss/test/ws/jaxws/samples/jaxr/**
 

Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt	2008-04-04 11:58:14 UTC (rev 6234)
@@ -2,6 +2,26 @@
 # $Id$
 #
 
+# [JBWS-1774] Provide tools implementation for CXF
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2105] Remove dependency on native wsdl model
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1190/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/jbws1665/**
+org/jboss/test/ws/jaxws/jbws1809/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1909/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/webfault/**
+
 # [JBWS-1683] Fix JAXR samples for CXF
 org/jboss/test/ws/jaxws/samples/jaxr/**
 
@@ -31,4 +51,5 @@
 
 # TODO: Fix classpath to ClientLauncher
 org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/webserviceref/**
 

Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties	2008-04-04 11:17:34 UTC (rev 6233)
+++ stack/cxf/trunk/version.properties	2008-04-04 11:58:14 UTC (rev 6234)
@@ -33,8 +33,8 @@
 
 # Thirdparty library versions
 jbossws-spi=1.0.2.GA
-jbossws-common=1.0.4.GA
-jbossws-framework=3.0.1.GA
+jbossws-common=snapshot
+jbossws-framework=snapshot
 jbossws-jboss42=4.2.1.GA
 
 apache-xml-commons=1.2

More information about the jbossws-commits mailing list