JBossWS SVN: r10972 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-21 05:35:28 -0400 (Wed, 21 Oct 2009)
New Revision: 10972
Modified:
stack/cxf/trunk/pom.xml
Log:
fixing hudson regresssion CXF against AS trunk - PS: I'll never like maven
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-10-21 08:26:44 UTC (rev 10971)
+++ stack/cxf/trunk/pom.xml 2009-10-21 09:35:28 UTC (rev 10972)
@@ -244,6 +244,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
15 years, 2 months
- 1
- 0
JBossWS SVN: r10971 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-21 04:26:44 -0400 (Wed, 21 Oct 2009)
New Revision: 10971
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java
Log:
[JBWS-2717] fixing hudson regression
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2009-10-21 07:50:42 UTC (rev 10970)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2009-10-21 08:26:44 UTC (rev 10971)
@@ -111,7 +111,6 @@
protected void appendDefinitions(StringBuilder buffer, String namespace)
{
- buffer.append("<?xml version=\"1.0\" encoding=\"" + Constants.DEFAULT_XML_CHARSET + "\"?>");
buffer.append("<definitions");
//Append service name as done by wscompile, if there is just one
WSDLService[] services = wsdl.getServices();
15 years, 2 months
- 1
- 0
JBossWS SVN: r10970 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-21 03:50:42 -0400 (Wed, 21 Oct 2009)
New Revision: 10970
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java
Log:
[JBWS-2717] fixing test to be more generic
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java 2009-10-21 07:16:52 UTC (rev 10969)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2630/JBWS2630TestCase.java 2009-10-21 07:50:42 UTC (rev 10970)
@@ -29,6 +29,9 @@
import javax.management.ObjectName;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
+import javax.wsdl.Definition;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
import junit.framework.Test;
@@ -63,9 +66,10 @@
public void testWSDL() throws Exception
{
- URL url = new URL(endpointAddress + "?wsdl");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertTrue(br.readLine().contains("definition"));
+ URL wsdlURL = new URL(endpointAddress + "?wsdl");
+ Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
+
+ assertNotNull("Unable to get WSDL", wsdl);
}
public void testEndpoint() throws Exception
@@ -77,4 +81,14 @@
String s = "Hi";
assertEquals(s, port.echo(s));
}
+
+ private Definition getWSDLDefinition(String wsdlLocation) throws Exception
+ {
+ WSDLFactory wsdlFactory = WSDLFactory.newInstance();
+ WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+
+ Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
+ return definition;
+ }
+
}
15 years, 2 months
- 1
- 0
JBossWS SVN: r10969 - in stack/native/trunk/modules/testsuite/native-tests/src/test: java/org/jboss/test/ws/jaxrpc/wsdlpublish and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-21 03:16:52 -0400 (Wed, 21 Oct 2009)
New Revision: 10969
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
Log:
[JBWS-2718] fixing tests to be alligned with new publish directory structure
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2009-10-21 07:16:52 UTC (rev 10969)
@@ -48,7 +48,8 @@
ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
File dataDir = serverConfig.getServerDataDir();
- File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
+ String s = File.separator;
+ File wsdlDir = new File(dataDir.getAbsolutePath() + s + "wsdl" + s + archive + s + "WEB-INF" + s + "wsdl" + s );
if (wsdlDir.exists() == false)
{
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase.java 2009-10-21 07:16:52 UTC (rev 10969)
@@ -52,11 +52,11 @@
URL mappingURL = getResourceURL("jaxrpc/wsdlpublish/WEB-INF/jaxrpc-mapping.xml");
QName serviceName = new QName("http://org.jboss.test.ws/wsdlpublish", "TestService");
Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL);
-
+
TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
+
String dir = System.getProperty("wsdl.publish.location");
- String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/foo/bar/TestService.wsdl").getAbsolutePath());
+ String resStr = port.echoSimple(new File(dir + "/some-wsdl-location/WEB-INF/wsdl/foo/bar/TestService.wsdl").getAbsolutePath());
assertEquals("{http://org.jboss.test.ws/wsdlpublish}TestEndpoint", resStr);
}
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2009-10-21 07:16:52 UTC (rev 10969)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
- <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/TestService.wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl.publish.location@/jsr109ejb/META-INF/wsdl/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-20 16:16:25 UTC (rev 10968)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2009-10-21 07:16:52 UTC (rev 10969)
@@ -7,7 +7,7 @@
<service-ref>
<service-ref-name>service/TestServiceJSE</service-ref-name>
- <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/TestService.wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl.publish.location@/jsr109pojo/WEB-INF/wsdl/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
15 years, 2 months
- 1
- 0
JBossWS SVN: r10968 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-20 12:16:25 -0400 (Tue, 20 Oct 2009)
New Revision: 10968
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
Log:
[JBWS-2718] fixing issue
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-10-20 14:52:40 UTC (rev 10967)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-10-20 16:16:25 UTC (rev 10968)
@@ -241,7 +241,7 @@
//check for sub-directories
resourcePath = resourcePath.substring(0, resourcePath.lastIndexOf("/") + 1);
- resourcePath = expLocation + resourcePath + schemaLocation;
+ resourcePath = resourcePath + schemaLocation;
while (resourcePath.indexOf("//") != -1)
{
resourcePath = resourcePath.replace("//", "/");
@@ -355,19 +355,21 @@
File wsdlFile;
if (wsdlLocation.indexOf(expLocation) >= 0)
{
- wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length());
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation));
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
- else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:"))
+ else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:")
+ || wsdlLocation.startsWith("jar:") || wsdlLocation.startsWith("vfszip:"))
{
- wsdlLocation = wsdlLocation.substring(wsdlLocation.lastIndexOf("/") + 1);
+ wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(archiveName) + archiveName.length());
wsdlFile = new File(locationFile + "/" + wsdlLocation);
}
else
{
- throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation);
+ throw new WSException("Invalid wsdlFile '" + wsdlLocation + "' location, expected in: " + expLocation);
}
return wsdlFile;
}
+
}
15 years, 2 months
- 1
- 0
JBossWS SVN: r10967 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-20 10:52:40 -0400 (Tue, 20 Oct 2009)
New Revision: 10967
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/JBWS2718TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/ServiceImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CountryCodeType.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CurrencyCodeType.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodes.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodesResponse.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodes.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodesResponse.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ObjectFactory.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ServiceType.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/package-info.java
framework/trunk/testsuite/test/resources/jaxws/jbws2718/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/web.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/TestService.wsdl
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/common/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/common/1.0-SNAPSHOT/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/my-service/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/my-service/1.0-SNAPSHOT/
framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2718] providing test case
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-20 12:09:12 UTC (rev 10966)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-20 14:52:40 UTC (rev 10967)
@@ -847,6 +847,17 @@
</classes>
</war>
+ <!-- jaxws-jbws2718 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2718.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2718/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2718/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2718/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2718/WEB-INF">
+ <include name="wsdl1/**"/>
+ </webinf>
+ </war>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/JBWS2718TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/JBWS2718TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/JBWS2718TestCase.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,88 @@
+/*
+ * 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.jbws2718;
+
+import java.net.URL;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.jaxws.jbws2718.generated.CountryCodeType;
+import org.jboss.test.ws.jaxws.jbws2718.generated.CurrencyCodeType;
+import org.jboss.test.ws.jaxws.jbws2718.generated.ServiceType;
+import org.jboss.test.ws.jaxws.jbws2718.generated.GetCountryCodesResponse.Response;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2718] Loading artifacts from WEB-INF/wsdl1 fails
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class JBWS2718TestCase extends JBossWSTest
+{
+ private String targetNS = "http://jbws2718.jaxws.ws.test.jboss.org/";
+ private ServiceType proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2718TestCase.class, "jaxws-jbws2718.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "EndpointService");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2718/Service?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = service.getPort(ServiceType.class);
+ }
+
+ public void testCountryCodes() throws Exception
+ {
+ Response response = proxy.getCountryCodes();
+ List<CountryCodeType> countryCodes = response.getCountry();
+ assertEquals(countryCodes.get(0), CountryCodeType.CZ);
+ assertEquals(countryCodes.get(1), CountryCodeType.DE);
+ }
+
+ public void testCurrencyCodes() throws Exception
+ {
+ org.jboss.test.ws.jaxws.jbws2718.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes();
+ List<CurrencyCodeType> currencyCodes = response.getCurrency();
+ assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK);
+ assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR);
+ }
+
+ public void test() throws Exception
+ {
+ assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ));
+ assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE));
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/ServiceImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/ServiceImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/ServiceImpl.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -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.jbws2718;
+
+import java.util.List;
+
+import javax.jws.WebService;
+
+import org.jboss.test.ws.jaxws.jbws2718.generated.CountryCodeType;
+import org.jboss.test.ws.jaxws.jbws2718.generated.CurrencyCodeType;
+import org.jboss.test.ws.jaxws.jbws2718.generated.GetCurrencyCodesResponse;
+import org.jboss.test.ws.jaxws.jbws2718.generated.ServiceType;
+import org.jboss.test.ws.jaxws.jbws2718.generated.GetCountryCodesResponse.Response;
+
+@WebService(portName = "ServicePort", serviceName = "EndpointService", wsdlLocation = "WEB-INF/wsdl1/TestService.wsdl", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws2718.generated.ServiceType")
+public class ServiceImpl implements ServiceType
+{
+
+ public Response getCountryCodes()
+ {
+ Response response = new Response();
+ List<CountryCodeType> values = response.getCountry();
+ values.add(CountryCodeType.CZ);
+ values.add(CountryCodeType.DE);
+ return response;
+ }
+
+ public CurrencyCodeType getCurrency(CountryCodeType parameters)
+ {
+ if (parameters == CountryCodeType.CZ)
+ return CurrencyCodeType.CZK;
+ if (parameters == CountryCodeType.DE)
+ return CurrencyCodeType.EUR;
+
+ throw new IllegalArgumentException();
+ }
+
+ public GetCurrencyCodesResponse.Response getCurrencyCodes()
+ {
+ GetCurrencyCodesResponse.Response response = new GetCurrencyCodesResponse.Response();
+ List<CurrencyCodeType> values = response.getCurrency();
+ values.add(CurrencyCodeType.CZK);
+ values.add(CurrencyCodeType.EUR);
+ return response;
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CountryCodeType.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CountryCodeType.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CountryCodeType.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,56 @@
+/*
+ * 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.jbws2718.generated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>Java class for CountryCodeType.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * <simpleType name="CountryCodeType">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ * <enumeration value="DE"/>
+ * <enumeration value="CZ"/>
+ * </restriction>
+ * </simpleType>
+ * </pre>
+ */
+@XmlType(name = "CountryCodeType", namespace = "urn:BaseComponents")
+@XmlEnum
+public enum CountryCodeType {
+
+ DE,
+ CZ;
+
+ public String value() {
+ return name();
+ }
+
+ public static CountryCodeType fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CurrencyCodeType.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CurrencyCodeType.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/CurrencyCodeType.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,56 @@
+/*
+ * 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.jbws2718.generated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>Java class for CurrencyCodeType.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * <simpleType name="CurrencyCodeType">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ * <enumeration value="CZK"/>
+ * <enumeration value="EUR"/>
+ * </restriction>
+ * </simpleType>
+ * </pre>
+ */
+@XmlType(name = "CurrencyCodeType", namespace = "urn:BaseComponents")
+@XmlEnum
+public enum CurrencyCodeType {
+
+ CZK,
+ EUR;
+
+ public String value() {
+ return name();
+ }
+
+ public static CurrencyCodeType fromValue(String v) {
+ return valueOf(v);
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodes.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodes.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodes.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,53 @@
+/*
+ * 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.jbws2718.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "getCountryCodes")
+public class GetCountryCodes {
+
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodesResponse.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodesResponse.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCountryCodesResponse.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,153 @@
+/*
+ * 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.jbws2718.generated;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="response">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="country" type="{urn:BaseComponents}CountryCodeType" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "response"
+})
+@XmlRootElement(name = "getCountryCodesResponse")
+public class GetCountryCodesResponse {
+
+ @XmlElement(required = true)
+ protected GetCountryCodesResponse.Response response;
+
+ /**
+ * Gets the value of the response property.
+ *
+ * @return
+ * possible object is
+ * {@link GetCountryCodesResponse.Response }
+ *
+ */
+ public GetCountryCodesResponse.Response getResponse() {
+ return response;
+ }
+
+ /**
+ * Sets the value of the response property.
+ *
+ * @param value
+ * allowed object is
+ * {@link GetCountryCodesResponse.Response }
+ *
+ */
+ public void setResponse(GetCountryCodesResponse.Response value) {
+ this.response = value;
+ }
+
+
+ /**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="country" type="{urn:BaseComponents}CountryCodeType" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "country"
+ })
+ public static class Response {
+
+ @XmlElement(required = true, nillable = true)
+ protected List<CountryCodeType> country;
+
+ /**
+ * Gets the value of the country property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the country property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getCountry().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link CountryCodeType }
+ *
+ *
+ */
+ public List<CountryCodeType> getCountry() {
+ if (country == null) {
+ country = new ArrayList<CountryCodeType>();
+ }
+ return this.country;
+ }
+
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodes.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodes.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodes.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,51 @@
+/*
+ * 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.jbws2718.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "getCurrencyCodes")
+public class GetCurrencyCodes {
+
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodesResponse.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodesResponse.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/GetCurrencyCodesResponse.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,153 @@
+/*
+ * 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.jbws2718.generated;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="response">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="currency" type="{urn:BaseComponents}CurrencyCodeType" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </element>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+ "response"
+})
+@XmlRootElement(name = "getCurrencyCodesResponse")
+public class GetCurrencyCodesResponse {
+
+ @XmlElement(required = true)
+ protected GetCurrencyCodesResponse.Response response;
+
+ /**
+ * Gets the value of the response property.
+ *
+ * @return
+ * possible object is
+ * {@link GetCurrencyCodesResponse.Response }
+ *
+ */
+ public GetCurrencyCodesResponse.Response getResponse() {
+ return response;
+ }
+
+ /**
+ * Sets the value of the response property.
+ *
+ * @param value
+ * allowed object is
+ * {@link GetCurrencyCodesResponse.Response }
+ *
+ */
+ public void setResponse(GetCurrencyCodesResponse.Response value) {
+ this.response = value;
+ }
+
+
+ /**
+ * <p>Java class for anonymous complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="currency" type="{urn:BaseComponents}CurrencyCodeType" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+ @XmlAccessorType(XmlAccessType.FIELD)
+ @XmlType(name = "", propOrder = {
+ "currency"
+ })
+ public static class Response {
+
+ @XmlElement(required = true, nillable = true)
+ protected List<CurrencyCodeType> currency;
+
+ /**
+ * Gets the value of the currency property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the currency property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getCurrency().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link CurrencyCodeType }
+ *
+ *
+ */
+ public List<CurrencyCodeType> getCurrency() {
+ if (currency == null) {
+ currency = new ArrayList<CurrencyCodeType>();
+ }
+ return this.currency;
+ }
+
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ObjectFactory.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ObjectFactory.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ObjectFactory.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,121 @@
+/*
+ * 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.jbws2718.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.test.ws.jaxws.jbws2718.generated package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _GetCurrencyResponse_QNAME = new QName("http://jbws2718.jaxws.ws.test.jboss.org/", "getCurrencyResponse");
+ private final static QName _GetCurrency_QNAME = new QName("http://jbws2718.jaxws.ws.test.jboss.org/", "getCurrency");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws2718.generated
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link GetCountryCodesResponse.Response }
+ *
+ */
+ public GetCountryCodesResponse.Response createGetCountryCodesResponseResponse() {
+ return new GetCountryCodesResponse.Response();
+ }
+
+ /**
+ * Create an instance of {@link GetCurrencyCodesResponse.Response }
+ *
+ */
+ public GetCurrencyCodesResponse.Response createGetCurrencyCodesResponseResponse() {
+ return new GetCurrencyCodesResponse.Response();
+ }
+
+ /**
+ * Create an instance of {@link GetCountryCodes }
+ *
+ */
+ public GetCountryCodes createGetCountryCodes() {
+ return new GetCountryCodes();
+ }
+
+ /**
+ * Create an instance of {@link GetCurrencyCodesResponse }
+ *
+ */
+ public GetCurrencyCodesResponse createGetCurrencyCodesResponse() {
+ return new GetCurrencyCodesResponse();
+ }
+
+ /**
+ * Create an instance of {@link GetCurrencyCodes }
+ *
+ */
+ public GetCurrencyCodes createGetCurrencyCodes() {
+ return new GetCurrencyCodes();
+ }
+
+ /**
+ * Create an instance of {@link GetCountryCodesResponse }
+ *
+ */
+ public GetCountryCodesResponse createGetCountryCodesResponse() {
+ return new GetCountryCodesResponse();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link CurrencyCodeType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://jbws2718.jaxws.ws.test.jboss.org/", name = "getCurrencyResponse")
+ public JAXBElement<CurrencyCodeType> createGetCurrencyResponse(CurrencyCodeType value) {
+ return new JAXBElement<CurrencyCodeType>(_GetCurrencyResponse_QNAME, CurrencyCodeType.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link CountryCodeType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://jbws2718.jaxws.ws.test.jboss.org/", name = "getCurrency")
+ public JAXBElement<CountryCodeType> createGetCurrency(CountryCodeType value) {
+ return new JAXBElement<CountryCodeType>(_GetCurrency_QNAME, CountryCodeType.class, null, value);
+ }
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ServiceType.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ServiceType.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/ServiceType.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,77 @@
+/*
+ * 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.jbws2718.generated;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1-b03-
+ * Generated source version: 2.0
+ *
+ */
+@WebService(name = "ServiceType", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/")
+public interface ServiceType {
+
+
+ /**
+ *
+ * @return
+ * returns org.jboss.test.ws.jaxws.jbws2718.generated.GetCountryCodesResponse.Response
+ */
+ @WebMethod(action = "countryCodesAction")
+ @WebResult(name = "response", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/")
+ @RequestWrapper(localName = "getCountryCodes", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws2718.generated.GetCountryCodes")
+ @ResponseWrapper(localName = "getCountryCodesResponse", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws2718.generated.GetCountryCodesResponse")
+ public org.jboss.test.ws.jaxws.jbws2718.generated.GetCountryCodesResponse.Response getCountryCodes();
+
+ /**
+ *
+ * @param parameters
+ * @return
+ * returns org.jboss.test.ws.jaxws.jbws2718.generated.CurrencyCodeType
+ */
+ @WebMethod(action = "currencyAction")
+ @WebResult(name = "getCurrencyResponse", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", partName = "parameters")
+ @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ public CurrencyCodeType getCurrency(
+ @WebParam(name = "getCurrency", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", partName = "parameters")
+ CountryCodeType parameters);
+
+ /**
+ *
+ * @return
+ * returns org.jboss.test.ws.jaxws.jbws2718.generated.GetCurrencyCodesResponse.Response
+ */
+ @WebMethod(action = "currencyCodesAction")
+ @WebResult(name = "response", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/")
+ @RequestWrapper(localName = "getCurrencyCodes", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws2718.generated.GetCurrencyCodes")
+ @ResponseWrapper(localName = "getCurrencyCodesResponse", targetNamespace = "http://jbws2718.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws2718.generated.GetCurrencyCodesResponse")
+ public org.jboss.test.ws.jaxws.jbws2718.generated.GetCurrencyCodesResponse.Response getCurrencyCodes();
+
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/package-info.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/package-info.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2718/generated/package-info.java 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://jbws2718.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.jboss.test.ws.jaxws.jbws2718.generated;
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/web.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/web.xml 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2718.ServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Service</servlet-name>
+ <url-pattern>/Service</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/TestService.wsdl (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/TestService.wsdl 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='utf-8'?>
+<definitions name='EndpointService' targetNamespace='http://jbws2718.jaxws.ws.test.jboss.org/' xmlns:tns='http://jbws2718.jaxws.ws.test.jboss.org/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:cc="urn:CoreComponentTypes" xmlns:bc="urn:BaseComponents" xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <types>
+ <xsd:schema elementFormDefault="qualified" targetNamespace="http://jbws2718.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws2718.jaxws.ws.test.jboss.org/"
+ xmlns:xns4="http://jbws2718.jaxws.ws.test.jboss.org/java/lang/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <xsd:import namespace="urn:BaseComponents" schemaLocation="./schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/>
+
+ <xsd:element name="getCountryCodes">
+ <xsd:complexType>
+ <xsd:sequence/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="getCurrencyCodes">
+ <xsd:complexType>
+ <xsd:sequence/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="getCountryCodesResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="response" nillable="false">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="1" name="country" nillable="true" type="bc:CountryCodeType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="getCurrency" type="bc:RequestType"/>
+ <xsd:element name="getCurrencyResponse" type="bc:ResponseType"/>
+ <xsd:element name="getCurrencyCodesResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="response" nillable="false">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="1" name="currency" nillable="true" type="bc:CurrencyCodeType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ </types>
+ <message name='Service_getCountryCodes_Request_Soap'>
+ <part name='parameters' element='tns:getCountryCodes'/>
+ </message>
+ <message name='Service_getCountryCodes_Response_Soap'>
+ <part name='parameters' element='tns:getCountryCodesResponse'/>
+ </message>
+ <message name='Service_getCurrencyCodes_Request_Soap'>
+ <part name='parameters' element='tns:getCurrencyCodes'/>
+ </message>
+ <message name='Service_getCurrencyCodes_Response_Soap'>
+ <part name='parameters' element='tns:getCurrencyCodesResponse'/>
+ </message>
+ <message name='Service_getCurrency_Request_Soap'>
+ <part name='parameters' element='tns:getCurrency'/>
+ </message>
+ <message name='Service_getCurrency_Response_Soap'>
+ <part name='parameters' element='tns:getCurrencyResponse'/>
+ </message>
+ <portType name='ServiceType'>
+ <operation name='getCountryCodes'>
+ <input message='tns:Service_getCountryCodes_Request_Soap'/>
+ <output message='tns:Service_getCountryCodes_Response_Soap'/>
+ </operation>
+ <operation name='getCurrency'>
+ <input message='tns:Service_getCurrency_Request_Soap'/>
+ <output message='tns:Service_getCurrency_Response_Soap'/>
+ </operation>
+ <operation name='getCurrencyCodes'>
+ <input message='tns:Service_getCurrencyCodes_Request_Soap'/>
+ <output message='tns:Service_getCurrencyCodes_Response_Soap'/>
+ </operation>
+ </portType>
+ <binding name='ServiceBinding' type='tns:ServiceType'>
+ <soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='document'/>
+ <operation name='getCountryCodes'>
+ <soap:operation soapAction='countryCodesAction' style='document'/>
+ <input>
+ <soap:body parts='parameters' use='literal'/>
+ </input>
+ <output>
+ <soap:body parts='parameters' use='literal'/>
+ </output>
+ </operation>
+ <operation name='getCurrency'>
+ <soap:operation soapAction='currencyAction' style='document'/>
+ <input>
+ <soap:body parts='parameters' use='literal'/>
+ </input>
+ <output>
+ <soap:body parts='parameters' use='literal'/>
+ </output>
+ </operation>
+ <operation name='getCurrencyCodes'>
+ <soap:operation soapAction='currencyCodesAction' style='document'/>
+ <input>
+ <soap:body parts='parameters' use='literal'/>
+ </input>
+ <output>
+ <soap:body parts='parameters' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='EndpointService'>
+ <port name='ServicePort' binding='tns:ServiceBinding'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/common/1.0-SNAPSHOT/CoreComponentTypes.xsd 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified"
+ xmlns:bc="urn:BaseComponents"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import namespace="urn:BaseComponents" schemaLocation="../../imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/>
+ <xs:simpleType name="CountryType">
+ <xs:restriction base="bc:CountryCodeType"/>
+ </xs:simpleType>
+ <xs:simpleType name="CurrencyType">
+ <xs:restriction base="bc:CurrencyCodeType"/>
+ </xs:simpleType>
+</xs:schema>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2718/WEB-INF/wsdl1/schema/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd 2009-10-20 14:52:40 UTC (rev 10967)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:BaseComponents" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:cc="urn:CoreComponentTypes"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import namespace="urn:CoreComponentTypes" schemaLocation="../../../common/1.0-SNAPSHOT/CoreComponentTypes.xsd"/>
+ <xs:simpleType name="CountryCodeType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="DE"/>
+ <xs:enumeration value="CZ"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="CurrencyCodeType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="CZK"/>
+ <xs:enumeration value="EUR"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="RequestType">
+ <xs:restriction base="cc:CountryType"/>
+ </xs:simpleType>
+ <xs:simpleType name="ResponseType">
+ <xs:restriction base="cc:CurrencyType"/>
+ </xs:simpleType>
+</xs:schema>
\ No newline at end of file
15 years, 2 months
- 1
- 0
JBossWS SVN: r10966 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-20 08:09:12 -0400 (Tue, 20 Oct 2009)
New Revision: 10966
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws2717/
framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2717] providing test case
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-20 11:35:21 UTC (rev 10965)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-10-20 12:09:12 UTC (rev 10966)
@@ -839,6 +839,14 @@
</fileset>
</jar>
+ <!-- jaxws-jbws2717 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2717.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/jbws2717/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.class"/>
+ </classes>
+ </war>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/test-libs/jaxws-namespace.war" webxml="${tests.output.dir}/test-resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/EndpointImpl.java 2009-10-20 12:09:12 UTC (rev 10966)
@@ -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.jbws2717;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService (name="Endpoint", serviceName="EndpointService")
+public class EndpointImpl
+{
+ @WebMethod
+ public String echo(final String s)
+ {
+ return s;
+ }
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2717/JBWS2717TestCase.java 2009-10-20 12:09:12 UTC (rev 10966)
@@ -0,0 +1,57 @@
+/*
+ * 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.jbws2717;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2717] Send XML declarations with WSDL
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class JBWS2717TestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2717TestCase.class, "jaxws-jbws2717.war");
+ }
+
+ public void testXmlDeclarationInWSDL() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2717?wsdl");
+ InputStream wsdlContent = wsdlURL.openStream();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ IOUtils.copyStream(baos, wsdlContent);
+ String wsdlAsText = new String(baos.toByteArray());
+ assertTrue(wsdlAsText.startsWith("<?xml version"));
+ }
+
+}
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2717/WEB-INF/web.xml 2009-10-20 12:09:12 UTC (rev 10966)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2717.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
15 years, 2 months
- 1
- 0
JBossWS SVN: r10965 - in stack/native/trunk/modules/core/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-10-20 07:35:21 -0400 (Tue, 20 Oct 2009)
New Revision: 10965
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBWS-2717] fixing issue
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2009-10-20 09:50:46 UTC (rev 10964)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2009-10-20 11:35:21 UTC (rev 10965)
@@ -111,6 +111,7 @@
protected void appendDefinitions(StringBuilder buffer, String namespace)
{
+ buffer.append("<?xml version=\"1.0\" encoding=\"" + Constants.DEFAULT_XML_CHARSET + "\"?>");
buffer.append("<definitions");
//Append service name as done by wscompile, if there is just one
WSDLService[] services = wsdl.getServices();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-10-20 09:50:46 UTC (rev 10964)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-10-20 11:35:21 UTC (rev 10965)
@@ -704,7 +704,7 @@
Document document = wsdlRequestHandler.getDocumentForPath(reqURL, wsdlHost, resPath);
OutputStreamWriter writer = new OutputStreamWriter(outputStream);
- new DOMWriter(writer).setPrettyprint(true).print(document.getDocumentElement());
+ new DOMWriter(writer, Constants.DEFAULT_XML_CHARSET).setPrettyprint(true).print(document);
}
private void handleException(Exception ex) throws ServletException
15 years, 2 months
- 1
- 0
JBossWS SVN: r10964 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-10-20 05:50:46 -0400 (Tue, 20 Oct 2009)
New Revision: 10964
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
Log:
[JBWS-2479] Fixing ScriptTestCase hudson failure with Metro stack
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2009-10-20 09:26:48 UTC (rev 10963)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2009-10-20 09:50:46 UTC (rev 10964)
@@ -57,7 +57,7 @@
JBOSS_HOME = System.getProperty("jboss.home");
CLASSES_DIR = System.getProperty("test.classes.directory");
//JBWS-2479
- ENDPOINT_CLASS = isIntegrationMetro() ? "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBeanNoAdapter" : "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean";
+ ENDPOINT_CLASS = "org.jboss.test.ws.jaxws.smoke.tools.CalculatorBean";
TEST_DIR = createResourceFile("..").getAbsolutePath();
origJavaHome = System.getProperty("java.home");
15 years, 2 months
- 1
- 0