JBossWS SVN: r9119 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2449.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-26 10:28:01 -0500 (Mon, 26 Jan 2009)
New Revision: 9119
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java
Log:
Minor changes
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java 2009-01-26 15:27:08 UTC (rev 9118)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2449/JBWS2449TestCase.java 2009-01-26 15:28:01 UTC (rev 9119)
@@ -41,12 +41,12 @@
public class JBWS2449TestCase extends JBossWSTest
{
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2449";
-
+
public static Test suite()
{
return new JBossWSTestSetup(JBWS2449TestCase.class, "jaxws-jbws2449.jar");
}
-
+
public void test() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
@@ -55,22 +55,23 @@
String retObj = port.echo("Hello");
assertEquals("Hello", retObj);
}
-
+
public void testWithRespectBinding() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jbws2449", "EndpointService");
try
{
- Service.create(wsdlURL, serviceName).getPort(Endpoint.class, new RespectBindingFeature(true));
- fail("Exception expected, the wsdl has an understood required extensibility element!");
+ Endpoint ep = Service.create(wsdlURL, serviceName).getPort(Endpoint.class, new RespectBindingFeature(true));
+ ep.echo("hi");
+ fail("Exception expected, the wsdl has a not understood required extensibility element!");
}
catch (Exception e)
{
- //NOOP
+ //NOOP
}
}
-
+
public void testWithRespectBinding2() throws Exception
{
URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
15 years, 3 months
JBossWS SVN: r9118 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-26 10:27:08 -0500 (Mon, 26 Jan 2009)
New Revision: 9118
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[CXF-2006] Excluding test
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-26 10:35:29 UTC (rev 9117)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-26 15:27:08 UTC (rev 9118)
@@ -58,6 +58,9 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-26 10:35:29 UTC (rev 9117)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-26 15:27:08 UTC (rev 9118)
@@ -30,6 +30,9 @@
org/jboss/test/ws/jaxws/jbws1694/**
org/jboss/test/ws/jaxws/jbws1797/**
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
org/jboss/test/ws/jaxws/jbws1190/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-26 10:35:29 UTC (rev 9117)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-26 15:27:08 UTC (rev 9118)
@@ -58,6 +58,9 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
# [JBWS-1655] Add support for endpoint address rewriting
org/jboss/test/ws/jaxws/jbws2150/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-26 10:35:29 UTC (rev 9117)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-26 15:27:08 UTC (rev 9118)
@@ -58,6 +58,9 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-26 10:35:29 UTC (rev 9117)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-26 15:27:08 UTC (rev 9118)
@@ -58,6 +58,9 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-26 10:35:29 UTC (rev 9117)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-26 15:27:08 UTC (rev 9118)
@@ -58,6 +58,9 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
+# [CXF-2006] RespectBinding feature and not understood required extensibility elements
+org/jboss/test/ws/jaxws/jbws2449/**
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*
15 years, 3 months
JBossWS SVN: r9117 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-26 05:35:29 -0500 (Mon, 26 Jan 2009)
New Revision: 9117
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-1949] Excluding new tests too
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-24 10:46:05 UTC (rev 9116)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-01-26 10:35:29 UTC (rev 9117)
@@ -11,6 +11,7 @@
# [JBWS-1949] Metro MTOM ignores content-type on attachment part
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
# [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail
org/jboss/test/ws/jaxws/jbws1762/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-24 10:46:05 UTC (rev 9116)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-01-26 10:35:29 UTC (rev 9117)
@@ -11,6 +11,7 @@
# [JBWS-1949] Metro MTOM ignores content-type on attachment part
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
# [JBWS-1841] WebServiceRef injection from DD doesn't work
org/jboss/test/ws/jaxws/jbws1841/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-24 10:46:05 UTC (rev 9116)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-01-26 10:35:29 UTC (rev 9117)
@@ -11,6 +11,7 @@
# [JBWS-1949] Metro MTOM ignores content-type on attachment part
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
# [JBWS-1841] WebServiceRef injection from DD doesn't work
org/jboss/test/ws/jaxws/jbws1841/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-24 10:46:05 UTC (rev 9116)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-01-26 10:35:29 UTC (rev 9117)
@@ -10,6 +10,7 @@
# [JBWS-1949] Metro MTOM ignores content-type on attachment part
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-24 10:46:05 UTC (rev 9116)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-01-26 10:35:29 UTC (rev 9117)
@@ -10,6 +10,7 @@
# [JBWS-1949] Metro MTOM ignores content-type on attachment part
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-24 10:46:05 UTC (rev 9116)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-01-26 10:35:29 UTC (rev 9117)
@@ -10,6 +10,7 @@
# [JBWS-1949] Metro MTOM ignores content-type on attachment part
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
15 years, 3 months
JBossWS SVN: r9116 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-24 05:46:05 -0500 (Sat, 24 Jan 2009)
New Revision: 9116
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java
Log:
fixing regression
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java 2009-01-24 09:56:50 UTC (rev 9115)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/BindingProviderTestCase.java 2009-01-24 10:46:05 UTC (rev 9116)
@@ -111,8 +111,9 @@
assertEquals("http://www.w3.org/2005/08/addressing", endpointReference.getAttribute("xmlns"));
NodeList addresses = endpointReference.getElementsByTagName("Address");
assertEquals(1, addresses.getLength());
- String targetEndpointAddress = "localhost".equals(getServerHost()) ? "http://127.0.0.1:8080/jaxws-endpointReference" : TARGET_ENDPOINT_ADDRESS;
- assertEquals(targetEndpointAddress, addresses.item(0).getFirstChild().getNodeValue());
+ String eprAddress = addresses.item(0).getFirstChild().getNodeValue();
+ eprAddress = eprAddress.replace("127.0.0.1", "localhost");
+ assertEquals(TARGET_ENDPOINT_ADDRESS.replace("127.0.0.1", "localhost"), eprAddress);
}
private class MyEndpointReference extends EndpointReference
15 years, 3 months
JBossWS SVN: r9115 - stack/native/trunk/modules/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-01-24 04:56:50 -0500 (Sat, 24 Jan 2009)
New Revision: 9115
Modified:
stack/native/trunk/modules/client/pom.xml
Log:
Shortening dependency path to the right JAX-WS implementation
Modified: stack/native/trunk/modules/client/pom.xml
===================================================================
--- stack/native/trunk/modules/client/pom.xml 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/trunk/modules/client/pom.xml 2009-01-24 09:56:50 UTC (rev 9115)
@@ -24,6 +24,11 @@
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-jaxws</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-jaxrpc</artifactId>
<version>${version}</version>
</dependency>
15 years, 3 months
JBossWS SVN: r9114 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-23 14:06:01 -0500 (Fri, 23 Jan 2009)
New Revision: 9114
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
Log:
[JBPAPP-1644] WSDL schema imports do not published successfully.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2009-01-23 17:07:35 UTC (rev 9113)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2009-01-23 19:06:01 UTC (rev 9114)
@@ -570,6 +570,17 @@
</webinf>
</war>
+ <!-- jaxws-jbws2412 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws2412.war" webxml="${tests.output.dir}/resources/jaxws/jbws2412/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2412/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2412/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws2412/WEB-INF">
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
<!-- jaxws-jbws2437 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws2437.jar">
<fileset dir="${tests.output.dir}/classes">
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src
___________________________________________________________________
Name: svn:externals
- test-framework http://anonsvn.jboss.org/repos/jbossws/framework/tags/jbossws-framework-2...
+ test-framework https://svn.jboss.org/repos/jbossws/framework/branches/jbossws-framework-...
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-01-23 17:07:35 UTC (rev 9113)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -164,7 +164,7 @@
// infinity loops prevention
if (published.contains(locationURI))
{
- return;
+ continue;
}
else
{
@@ -215,7 +215,7 @@
// infinity loops prevention
if (published.contains(schemaLocation))
{
- return;
+ continue;
}
else
{
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412 (from rev 9112, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,66 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.ws.jaxws.jbws2412;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test case to test JBWS-2412 for the correct publising of imported schemas.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 23rd January 2009
- */
-public class JBWS2412TestCase extends JBossWSTest
-{
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2412TestCase.class, "jaxws-jbws2412.war");
- }
-
- private TestEndpoint getPort() throws Exception
- {
-
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2412?wsdl");
- QName serviceName = new QName("http://org.jboss.test.ws/jbws2412", "TestEndpointService");
-
- Service service = Service.create(wsdlURL, serviceName);
-
- return service.getPort(TestEndpoint.class);
- }
-
- public void testCall() throws Exception
- {
- String message = "Hi";
- String response = getPort().echo(message);
- assertEquals(message, response);
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java (from rev 9112, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxws.jbws2412;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test case to test JBWS-2412 for the correct publising of imported schemas.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 23rd January 2009
+ */
+public class JBWS2412TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2412TestCase.class, "jaxws-jbws2412.war");
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2412?wsdl");
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws2412", "TestEndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ return service.getPort(TestEndpoint.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ String message = "Hi";
+ String response = getPort().echo(message);
+ assertEquals(message, response);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.ws.jaxws.jbws2412;
-
-import javax.jws.WebService;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 23rd January 2009
- */
-@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2412")
-public interface TestEndpoint
-{
-
- public String echo(final String message);
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java (from rev 9112, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxws.jbws2412;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 23rd January 2009
+ */
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2412")
+public interface TestEndpoint
+{
+
+ public String echo(final String message);
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.ws.jaxws.jbws2412;
-
-import javax.jws.WebService;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 23rd January 2009
- */
-@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws2412", wsdlLocation="WEB-INF/wsdl/TestService.wsdl")
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public String echo(String message)
- {
- return message;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java (from rev 9112, framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.ws.jaxws.jbws2412;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 23rd January 2009
+ */
+@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws2412", wsdlLocation="WEB-INF/wsdl/TestService.wsdl")
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echo(String message)
+ {
+ return message;
+ }
+
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412 (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2412.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2412.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,51 +0,0 @@
-<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws2412' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <xs:schema targetNamespace='http://org.jboss.test.ws/jbws2412' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
-
- <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema1" schemaLocation="./schema1.xsd"/>
- <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema4" schemaLocation="./schema4.xsd"/>
-
- <xs:element name='echo' type='tns:echo'/>
- <xs:element name='echoResponse' type='tns:echoResponse'/>
- <xs:complexType name='echo'>
- <xs:sequence>
- <xs:element minOccurs='0' name='arg0' type='xs:string'/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name='echoResponse'>
- <xs:sequence>
- <xs:element minOccurs='0' name='return' type='xs:string'/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- </types>
- <message name='TestEndpoint_echoResponse'>
- <part element='tns:echoResponse' name='echoResponse'></part>
- </message>
- <message name='TestEndpoint_echo'>
- <part element='tns:echo' name='echo'></part>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='echo'>
- <input message='tns:TestEndpoint_echo'></input>
- <output message='tns:TestEndpoint_echoResponse'></output>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpointService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://127.0.0.1:8080/jaxws-jbws2412'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,51 @@
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws2412' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.test.ws/jbws2412' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+
+ <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema1" schemaLocation="./schema1.xsd"/>
+ <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema4" schemaLocation="./schema4.xsd"/>
+
+ <xs:element name='echo' type='tns:echo'/>
+ <xs:element name='echoResponse' type='tns:echoResponse'/>
+ <xs:complexType name='echo'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'></part>
+ </message>
+ <message name='TestEndpoint_echo'>
+ <part element='tns:echo' name='echo'></part>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'></input>
+ <output message='tns:TestEndpoint_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://127.0.0.1:8080/jaxws-jbws2412'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,5 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema1'
- xmlns='http://www.w3.org/2001/XMLSchema'>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema5" schemaLocation="./schema5.xsd"/>
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,5 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema1'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema5" schemaLocation="./schema5.xsd"/>
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,4 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2'
- xmlns='http://www.w3.org/2001/XMLSchema'>
-
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,4 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema3'
- xmlns='http://www.w3.org/2001/XMLSchema'>
-
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema3'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,5 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema4'
- xmlns='http://www.w3.org/2001/XMLSchema'>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema3" schemaLocation="./schema3.xsd"/>
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,5 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema4'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema3" schemaLocation="./schema3.xsd"/>
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -1,4 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema5'
- xmlns='http://www.w3.org/2001/XMLSchema'>
-
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd (from rev 9112, framework/trunk/testsuite/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-01-23 19:06:01 UTC (rev 9114)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema5'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
15 years, 3 months
JBossWS SVN: r9113 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-01-23 12:07:35 -0500 (Fri, 23 Jan 2009)
New Revision: 9113
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
Log:
[JBWS-2412] WSDL schema imports do not published successfully.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-01-23 17:05:05 UTC (rev 9112)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-01-23 17:07:35 UTC (rev 9113)
@@ -171,7 +171,7 @@
// infinity loops prevention
if (published.contains(locationURI))
{
- return;
+ continue;
}
else
{
@@ -221,7 +221,7 @@
// infinity loops prevention
if (published.contains(schemaLocation))
{
- return;
+ continue;
}
else
{
15 years, 3 months