JBossWS SVN: r9580 - stack/cxf/trunk/modules/management.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-12 05:22:31 -0400 (Thu, 12 Mar 2009)
New Revision: 9580
Modified:
stack/cxf/trunk/modules/management/pom.xml
Log:
[JBWS-2573] fix comment
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-03-12 09:22:18 UTC (rev 9579)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-03-12 09:22:31 UTC (rev 9580)
@@ -15,8 +15,8 @@
<dependencies>
<!--
- These runtime dependencies are picked up by the assembly-deploy-artifacts
- descriptor. They have no real relevants to this module.
+ These dependencies are picked up by the assembly-deploy-artifacts
+ descriptor. They have no real and relevant meaning for this module
-->
<dependency>
<groupId>org.jboss.ws</groupId>
17 years, 1 month
JBossWS SVN: r9579 - stack/metro/trunk/modules/management.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-12 05:22:18 -0400 (Thu, 12 Mar 2009)
New Revision: 9579
Modified:
stack/metro/trunk/modules/management/pom.xml
Log:
[JBWS-2573] fix comment
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-03-12 09:18:54 UTC (rev 9578)
+++ stack/metro/trunk/modules/management/pom.xml 2009-03-12 09:22:18 UTC (rev 9579)
@@ -1,28 +1,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack Metro Management</name>
<artifactId>jbossws-metro-management</artifactId>
<packaging>war</packaging>
-
+
<parent>
<groupId>org.jboss.ws.metro</groupId>
<artifactId>jbossws-metro</artifactId>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<dependencies>
- <!--
- These runtime dependencies are picked up by the assembly-deploy-artifacts
- descriptor. They have no real relevants to this module.
+ <!--
+ These dependencies are picked up by the assembly-deploy-artifacts
+ descriptor. They have no real and relevant meaning for this module
-->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
17 years, 1 month
JBossWS SVN: r9578 - in stack/cxf/trunk: modules/server and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-12 05:18:54 -0400 (Thu, 12 Mar 2009)
New Revision: 9578
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml
Log:
[JBWS-2573] fix
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -1,49 +1,49 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack CXF Management</name>
<artifactId>jbossws-cxf-management</artifactId>
<packaging>war</packaging>
-
+
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<dependencies>
- <!--
+ <!--
These runtime dependencies are picked up by the assembly-deploy-artifacts
descriptor. They have no real relevants to this module.
-->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<classifier>testsuite</classifier>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<!-- [JBWS-2505] -->
<!-- START -->
@@ -51,23 +51,23 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
-->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>sar</type>
</dependency>
</dependencies>
-
+
<!-- Build -->
<build>
<plugins>
@@ -94,14 +94,13 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -174,7 +174,7 @@
<build>
<resources>
<resource>
- <targetPath>/</targetPath>
+ <targetPath>.</targetPath>
<directory>src/main/resources/jbossws-cxf-server.jar</directory>
</resource>
<resource>
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -89,7 +89,7 @@
<dependencySet>
<outputDirectory>tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:testsuite</include>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -87,7 +87,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
@@ -102,7 +102,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss501:jar</include>
@@ -115,7 +115,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss510x:jar</include>
@@ -125,7 +125,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
Modified: stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -57,7 +57,7 @@
<dependencySet>
<outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:testsuite</include>
17 years, 1 month
JBossWS SVN: r9577 - in stack/metro/trunk: modules/server and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-12 05:13:03 -0400 (Thu, 12 Mar 2009)
New Revision: 9577
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
stack/metro/trunk/src/main/scripts/assembly-src-dist.xml
Log:
[JBWS-2573] fix
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/modules/management/pom.xml 2009-03-12 09:13:03 UTC (rev 9577)
@@ -21,29 +21,29 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<classifier>testsuite</classifier>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<!-- [JBWS-2505] -->
<!-- START -->
@@ -51,19 +51,19 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
</dependency>
-->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>sar</type>
</dependency>
</dependencies>
@@ -94,14 +94,13 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
</resource>
</webResources>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/modules/server/pom.xml 2009-03-12 09:13:03 UTC (rev 9577)
@@ -123,7 +123,7 @@
<build>
<resources>
<resource>
- <targetPath>/</targetPath>
+ <targetPath>.</targetPath>
<directory>src/main/resources/jbossws-metro-server.jar</directory>
</resource>
<resource>
Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2009-03-12 09:13:03 UTC (rev 9577)
@@ -89,7 +89,7 @@
<dependencySet>
<outputDirectory>tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:testsuite</include>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-12 09:13:03 UTC (rev 9577)
@@ -75,7 +75,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
@@ -90,7 +90,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss501:jar</include>
@@ -103,7 +103,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss510x:jar</include>
@@ -113,7 +113,7 @@
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
Modified: stack/metro/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-src-dist.xml 2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/src/main/scripts/assembly-src-dist.xml 2009-03-12 09:13:03 UTC (rev 9577)
@@ -57,7 +57,7 @@
<dependencySet>
<outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
+ <scope>provided</scope>
<unpack>true</unpack>
<includes>
<include>*:jbossws-framework:zip:testsuite</include>
17 years, 1 month
JBossWS SVN: r9575 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1665 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-11 13:27:06 -0400 (Wed, 11 Mar 2009)
New Revision: 9575
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
Log:
[JBWS-1665] Fixing test (changes got lost in the past when working on branch 2.0)
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-03-10 19:25:14 UTC (rev 9574)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-03-11 17:27:06 UTC (rev 9575)
@@ -246,6 +246,13 @@
</classes>
</war>
+ <!-- jaxws-jbws1665 -->
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1665.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1665/**/*.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws1694 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1694.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2009-03-10 19:25:14 UTC (rev 9574)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2009-03-11 17:27:06 UTC (rev 9575)
@@ -27,7 +27,10 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import junit.framework.Test;
+
import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
/**
* [JBWS-1665] incorrect wsdl generation
@@ -36,32 +39,14 @@
*/
public class JBWS1665TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingService";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1665/TrackingServiceBean";
-// public static Test suite()
-// {
-// return JBossWSTestSetup.newTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar");
-// }
-
- public void testWebService() throws Exception
+ public static Test suite()
{
- System.out.println("FIXME [JBWS-1665] incorrect wsdl generation");
-
- //assertWSDLAccess();
-
- // Need to validate the WSDL is property populated. Several fields such as
- // element names are being left blank. This is related to case 16130. The
- // entire generated wsdl is attached to the case.
-
- /*
- QName serviceName = new QName("http://org.jboss.ws/jbws1665", "EJB3BeanService");
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- Service service = Service.create(wsdlURL, serviceName);
- TrackingServiceInterface port = (TrackingServiceInterface)service.getPort(TrackingServiceInterface.class);
- */
+ return new JBossWSTestSetup(JBWS1665TestCase.class, "jaxws-jbws1665.jar");
}
- private void assertWSDLAccess() throws Exception
+ public void testWebService() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
17 years, 1 month
JBossWS SVN: r9574 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-10 15:25:14 -0400 (Tue, 10 Mar 2009)
New Revision: 9574
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2223][JBWS-2571] updating exclude files
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-10 19:24:01 UTC (rev 9573)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-10 19:25:14 UTC (rev 9574)
@@ -62,8 +62,7 @@
# [JBWS-2561] XOP request not properly inlined
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2571] Mode.INOUT parameter not generated
org/jboss/test/ws/jaxws/holder/**
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-10 19:24:01 UTC (rev 9573)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-10 19:25:14 UTC (rev 9574)
@@ -50,8 +50,7 @@
# [JBWS-2561] XOP request not properly inlined
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2571] Mode.INOUT parameter not generated
org/jboss/test/ws/jaxws/holder/**
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-10 19:24:01 UTC (rev 9573)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-10 19:25:14 UTC (rev 9574)
@@ -50,8 +50,7 @@
# [JBWS-2561] XOP request not properly inlined
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2571] Mode.INOUT parameter not generated
org/jboss/test/ws/jaxws/holder/**
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-10 19:24:01 UTC (rev 9573)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-10 19:25:14 UTC (rev 9574)
@@ -50,8 +50,7 @@
# [JBWS-2561] XOP request not properly inlined
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2571] Mode.INOUT parameter not generated
org/jboss/test/ws/jaxws/holder/**
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-10 19:24:01 UTC (rev 9573)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-10 19:25:14 UTC (rev 9574)
@@ -50,8 +50,7 @@
# [JBWS-2561] XOP request not properly inlined
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
+# [JBWS-2571] Mode.INOUT parameter not generated
org/jboss/test/ws/jaxws/holder/**
# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
17 years, 1 month
JBossWS SVN: r9573 - in stack/cxf/trunk/modules/testsuite/framework-tests: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-10 15:24:01 -0400 (Tue, 10 Mar 2009)
New Revision: 9573
Added:
stack/cxf/trunk/modules/testsuite/framework-tests/scripts/
stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
Modified:
stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
Log:
[JBWS-2223] wsconsume for cxf build
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-10 18:16:25 UTC (rev 9572)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2009-03-10 19:24:01 UTC (rev 9573)
@@ -87,6 +87,22 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>wsconsume</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="maven.test.classpath" refid="maven.test.classpath"/>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
+ <property name="tests.output.dir" value="${project.build.directory}"/>
+ <property name="project.version" value="${project.version}"/>
+ <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
Added: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2009-03-10 19:24:01 UTC (rev 9573)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ============================================================ -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- ============================================================ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Generating sources -->
+ <!-- ================================================================== -->
+
+ <target name="wsconsume" description="Consume JAX-WS contracts">
+
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask">
+ <classpath>
+ <pathelement path="${maven.test.classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
JBossWS SVN: r9572 - framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-10 14:16:25 -0400 (Tue, 10 Mar 2009)
New Revision: 9572
Modified:
framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
Log:
Nillable elements should prevent wrapped style from being used (JAX-WS 2.3.1.2 (V)), thus changing some nillable="true" to nillable="false" to go on using the wrapped style implementation
Modified: framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2009-03-09 22:11:02 UTC (rev 9571)
+++ framework/trunk/testsuite/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2009-03-10 18:16:25 UTC (rev 9572)
@@ -4,16 +4,16 @@
<xs:schema elementFormDefault="qualified" targetNamespace="http://types.complex.jaxws.ws.test.jboss.org/" version="1.0" xmlns:ns1="http://complex.jaxws.ws.test.jboss.org/" xmlns:ns2="http://extra.complex.jaxws.ws.test.jboss.org/" xmlns:tns="http://types.complex.jaxws.ws.test.jboss.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://complex.jaxws.ws.test.jboss.org/"/>
<xs:import namespace="http://extra.complex.jaxws.ws.test.jboss.org/"/>
- <xs:element name="AlreadyRegisteredFault" nillable="true" type="tns:AlreadyRegisteredFault"/>
- <xs:element name="BulkRegister" nillable="true" type="tns:BulkRegister"/>
- <xs:element name="BulkRegisterResponse" nillable="true" type="tns:BulkRegisterResponse"/>
- <xs:element name="GetStatistics" nillable="true" type="tns:GetStatistics"/>
- <xs:element name="GetStatisticsResponse" nillable="true" type="tns:GetStatisticsResponse"/>
- <xs:element name="Register" nillable="true" type="tns:Register"/>
- <xs:element name="RegisterForInvoice" nillable="true" type="tns:RegisterForInvoice"/>
- <xs:element name="RegisterForInvoiceResponse" nillable="true" type="tns:RegisterForInvoiceResponse"/>
- <xs:element name="RegisterResponse" nillable="true" type="tns:RegisterResponse"/>
- <xs:element name="ValidationFault" nillable="true" type="tns:ValidationFault"/>
+ <xs:element name="AlreadyRegisteredFault" nillable="false" type="tns:AlreadyRegisteredFault"/>
+ <xs:element name="BulkRegister" nillable="false" type="tns:BulkRegister"/>
+ <xs:element name="BulkRegisterResponse" nillable="false" type="tns:BulkRegisterResponse"/>
+ <xs:element name="GetStatistics" nillable="false" type="tns:GetStatistics"/>
+ <xs:element name="GetStatisticsResponse" nillable="false" type="tns:GetStatisticsResponse"/>
+ <xs:element name="Register" nillable="false" type="tns:Register"/>
+ <xs:element name="RegisterForInvoice" nillable="false" type="tns:RegisterForInvoice"/>
+ <xs:element name="RegisterForInvoiceResponse" nillable="false" type="tns:RegisterForInvoiceResponse"/>
+ <xs:element name="RegisterResponse" nillable="false" type="tns:RegisterResponse"/>
+ <xs:element name="ValidationFault" nillable="false" type="tns:ValidationFault"/>
<xs:complexType name="Register">
<xs:sequence>
<xs:element name="Customer" nillable="true" type="ns1:Customer"/>
17 years, 1 month