JBossWS SVN: r7509 - in stack/metro/trunk/modules/testsuite/metro-tests: src/test/java/org/jboss/test/ws/jaxws and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-12 15:11:59 -0400 (Thu, 12 Jun 2008)
New Revision: 7509
Added:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestException.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestFaultInfo.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/MANIFEST.MF
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.wsdl
stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.xsd
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java
Log:
Added JBWS2206 test case
Modified: stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-06-12 18:52:50 UTC (rev 7508)
+++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/metro-jars-jaxws.xml 2008-06-12 19:11:59 UTC (rev 7509)
@@ -51,6 +51,13 @@
<include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/>
</webinf>
</war>
+
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2206.jar" >
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2206/**/*"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2206/META-INF"/>
+ </jar>
</target>
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java 2008-06-12 18:52:50 UTC (rev 7508)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1869/JBWS1869TestCase.java 2008-06-12 19:11:59 UTC (rev 7509)
@@ -27,11 +27,11 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
-import java.net.URL;
-import java.net.HttpURLConnection;
-import java.io.OutputStreamWriter;
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
/**
* Support stream based RequestHandler API
@@ -70,7 +70,7 @@
* @throws Exception
*/
public void testStreamBasedInvocation() throws Exception
- {
+ {
// Send data
URL url = new URL("http://"+getServerHost()+":8080/jaxws-jbws1869/delegate");
HttpURLConnection conn = (HttpURLConnection)url.openConnection();
@@ -94,7 +94,6 @@
rd.close();
// response assertion
- assertTrue(sb.toString().indexOf(RESPONSE) != -1);
- System.out.println("FIXME [JBWS-1869] Investigate why encoding appears in processing instruction in AS 5.0.x and not in AS 4.2.x response");
+ assertTrue(sb.toString().indexOf(RESPONSE) != -1);
}
}
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.jbws2206;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.test.ws.jaxws.jbws1871.JBWS1871EndpointImplService;
+import org.jboss.test.ws.jaxws.jbws1871.JBWS1871Endpoint;
+
+import javax.xml.ws.Service;
+import javax.xml.namespace.QName;
+import java.net.URL;
+
+public class JBWS2206TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2206TestCase.class, "jaxws-jbws2206.jar");
+ }
+
+ public void testClientProxy() throws Exception
+ {
+ Service service = Service.create(
+ new URL("http://"+getServerHost()+":8080/jaxws-jbws2206/MetroTestServiceBean?wsdl"),
+ new QName("http://com.acme.metroexceptiontest/", "MetroTestService")
+ );
+ MetroTestPortType port = service.getPort(MetroTestPortType.class);
+
+ String res = port.helloWorld();
+ assertEquals("HelloWorld", res);
+
+ System.out.println("FIXME JBWS2206: WSDL imports are not replaced with absolute path");
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestException.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestException.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestException.java 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,19 @@
+package org.jboss.test.ws.jaxws.jbws2206;
+
+import javax.xml.ws.WebFault;
+
+@WebFault(name="MetroTestFault", targetNamespace="http://com.acme.metroexceptiontest/")
+public class MetroTestException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ private MetroTestFaultInfo faultInfo;
+
+ public MetroTestException(String message, MetroTestFaultInfo faultInfo) {
+ super(message);
+ this.faultInfo = faultInfo;
+ }
+
+ public MetroTestFaultInfo getFaultInfo() {
+ return faultInfo;
+ }
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestFaultInfo.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestFaultInfo.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestFaultInfo.java 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,32 @@
+package org.jboss.test.ws.jaxws.jbws2206;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(
+ name = "MetroTestFaultInfo",
+ namespace="http://com.acme.metroexceptiontest/",
+ propOrder = { "detail" }
+)
+public class MetroTestFaultInfo {
+ protected String detail;
+
+ public MetroTestFaultInfo() {
+ }
+
+ public MetroTestFaultInfo(String detail) {
+ this.detail = detail;
+ }
+
+ public String getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestFaultInfo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,15 @@
+package org.jboss.test.ws.jaxws.jbws2206;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(
+ name = "MetroTestPortType",
+ targetNamespace = "http://com.acme.metroexceptiontest/")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface MetroTestPortType {
+
+ @WebMethod
+ public String helloWorld() throws MetroTestException;
+}
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestPortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,18 @@
+package org.jboss.test.ws.jaxws.jbws2206;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+@Stateless
+@WebService(
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2206.MetroTestPortType",
+ name="MetroTestService",
+ targetNamespace = "http://com.acme.metroexceptiontest/",
+ serviceName = "MetroTestService",
+ wsdlLocation="META-INF/wsdl/mtsb.wsdl")
+public class MetroTestServiceBean implements MetroTestPortType {
+
+ public String helloWorld() throws MetroTestException {
+ return "HelloWorld";
+ }
+}
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/MetroTestServiceBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/MANIFEST.MF
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/MANIFEST.MF (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/MANIFEST.MF 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.wsdl
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.wsdl (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.wsdl 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://com.acme.metroexceptiontest/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ targetNamespace="http://com.acme.metroexceptiontest/"
+ name="MetroTestService">
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://com.acme.metroexceptiontest/"
+ schemaLocation="mtsb.xsd">
+ </xsd:import>
+ </xsd:schema>
+ </types>
+ <message name="helloWorld"></message>
+ <message name="helloWorldResponse">
+ <part name="helloWorldResponse"
+ element="tns:helloWorldResponse">
+ </part>
+ </message>
+ <message name="MetroTestException">
+ <part name="fault" element="tns:MetroTestFault"></part>
+ </message>
+ <portType name="MetroTestPortType">
+ <operation name="helloWorld">
+ <input message="tns:helloWorld"></input>
+ <output message="tns:helloWorldResponse"></output>
+
+ <fault message="tns:MetroTestException"
+ name="MetroTestException">
+ </fault>
+ </operation>
+ </portType>
+ <binding name="MetroTestServicePortBinding"
+ type="tns:MetroTestPortType">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
+ style="document"></soap:binding>
+ <operation name="helloWorld">
+ <soap:operation soapAction=""></soap:operation>
+ <input>
+ <soap:body use="literal"></soap:body>
+ </input>
+ <output>
+ <soap:body use="literal"></soap:body>
+ </output>
+ <fault name="MetroTestException">
+ <soap:fault name="MetroTestException" use="literal"></soap:fault>
+ </fault>
+ </operation>
+
+ </binding>
+ <service name="MetroTestService">
+ <port name="MetroTestServicePort"
+ binding="tns:MetroTestServicePortBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"></soap:address>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.xsd
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.xsd (rev 0)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.xsd 2008-06-12 19:11:59 UTC (rev 7509)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:tns="http://com.acme.metroexceptiontest/"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0"
+ targetNamespace="http://com.acme.metroexceptiontest/">
+
+ <xs:element name="MetroTestFault" nillable="true"
+ type="tns:MetroTestFaultInfo">
+ </xs:element>
+
+ <xs:element name="helloWorldResponse" nillable="true"
+ type="xs:string">
+ </xs:element>
+
+ <xs:complexType name="MetroTestFaultInfo">
+ <xs:sequence>
+ <xs:element name="detail" type="xs:string" minOccurs="0"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/metro-tests/src/test/resources/jaxws/jbws2206/META-INF/wsdl/mtsb.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 7 months
- 1
- 0
JBossWS SVN: r7508 - stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-12 14:52:50 -0400 (Thu, 12 Jun 2008)
New Revision: 7508
Modified:
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
Log:
Respect classloader hierarchy when building classpath
Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2008-06-12 16:23:10 UTC (rev 7507)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java 2008-06-12 18:52:50 UTC (rev 7508)
@@ -22,6 +22,7 @@
package org.jboss.wsf.stack.metro.tools;
import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.apache.tools.ant.taskdefs.Classloader;
import java.io.File;
import java.io.PrintStream;
@@ -163,18 +164,11 @@
}
// --classpath
- if(loader instanceof URLClassLoader)
+ String cp = buildClasspathString(loader);
+ if(cp!=null)
{
- StringBuilder builder = new StringBuilder();
- URLClassLoader urlLoader = (URLClassLoader)loader;
- for(URL url : urlLoader.getURLs())
- {
- builder.append(url.getPath());
- builder.append(File.pathSeparator);
- }
-
args.add("-classpath");
- args.add(builder.toString());
+ args.add(cp);
}
// the SEI
@@ -194,5 +188,30 @@
}
}
+ private String buildClasspathString(ClassLoader cl)
+ {
+ String cp = null;
+ if(cl instanceof URLClassLoader)
+ {
+ StringBuilder builder = new StringBuilder();
+ URLClassLoader urlLoader = (URLClassLoader)cl;
+ for(URL url : urlLoader.getURLs())
+ {
+ builder.append(url.getPath());
+ builder.append(File.pathSeparator);
+ }
+
+ if(cl.getParent()!=null)
+ {
+ String parentPath = buildClasspathString(cl.getParent());
+ if(parentPath!=null) builder.append(parentPath);
+ }
+
+ cp = builder.toString();
+ }
+
+ return cp;
+ }
+
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r7507 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/tools and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-12 12:23:10 -0400 (Thu, 12 Jun 2008)
New Revision: 7507
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml
Log:
[JBPAPP-874] WSDL To Java - Case of service-interface and service-endpoint-interface in JAX-RPC mapping does not match generated interface when WSDL type begins with lower case.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-06-12 15:39:16 UTC (rev 7506)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -149,7 +149,8 @@
String targetNS = wsdlDefinitions.getTargetNamespace();
String prefix = WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_SERVICE_PREFIX;
ServiceInterfaceMapping sim = new ServiceInterfaceMapping(jwm);
- sim.setServiceInterface(packageName + "." + javaServiceName);
+ String className = ToolsUtils.firstLetterUpperCase(javaServiceName);
+ sim.setServiceInterface(packageName + "." + className);
sim.setWsdlServiceName(new QName(targetNS, serviceName, prefix));
WSDLEndpoint[] endpoints = ser.getEndpoints();
@@ -195,7 +196,8 @@
javaPortName += "_PortType";
ServiceEndpointInterfaceMapping seim = new ServiceEndpointInterfaceMapping(jwm);
- seim.setServiceEndpointInterface(packageName + "." + javaPortName);
+ String className = ToolsUtils.firstLetterUpperCase(javaPortName);
+ seim.setServiceEndpointInterface(packageName + "." + className);
seim.setWsdlPortType(new QName(targetNS, portName, "portTypeNS"));
seim.setWsdlBinding(new QName(targetNS, bindName, "bindingNS"));
constructServiceEndpointMethodMapping(seim, wsdlintf);
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019 (from rev 5881, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.tools.jbws2019;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test case to test the following fix: -
- *
- * @see http://jira.jboss.com/jira/browse/JBWS-2019
- *
- * @author darran.lofthouse(a)jboss.com
- * @since Mar 3, 2008
- */
-public class JBWS2019TestCase extends JBossWSTest
-{
-
- public void testDocumentLiteral() throws Exception
- {
- generateScenario("doclit");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws2019/" + scenario;
- String toolsDir = "tools/jbws2019/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws2019/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java (from rev 5881, stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.tools.jbws2019;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case to test the following fix: -
+ *
+ * @see http://jira.jboss.com/jira/browse/JBWS-2019
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since Mar 3, 2008
+ */
+public class JBWS2019TestCase extends JBossWSTest
+{
+
+ public void testDocumentLiteral() throws Exception
+ {
+ generateScenario("doclit");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws2019/" + scenario;
+ String toolsDir = "tools/jbws2019/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws2019/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2008-06-12 15:39:16 UTC (rev 7506)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws1691/lowercase/jaxrpc-mapping.xml 2008-06-12 16:23:10 UTC (rev 7507)
@@ -4,7 +4,7 @@
<namespaceURI>http://test.jboss.org/ws/jbws1691</namespaceURI>
</package-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1691.phoneBook_Service</service-interface>
+ <service-interface>org.jboss.test.ws.jbws1691.PhoneBook_Service</service-interface>
<wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1691'>serviceNS:phoneBook</wsdl-service-name>
<port-mapping>
<port-name>PhoneBookPort</port-name>
@@ -12,7 +12,7 @@
</port-mapping>
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1691.phoneBook_PortType</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1691.PhoneBook_PortType</service-endpoint-interface>
<wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1691'>portTypeNS:phoneBook</wsdl-port-type>
<wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1691'>bindingNS:PhoneBookBinding</wsdl-binding>
<service-endpoint-method-mapping>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019 (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Mar 03 12:41:29 GMT 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws2019;
-
-
-public class Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/Person.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/Person.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Mar 03 12:41:29 GMT 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws2019;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook'
- targetNamespace='http://test.jboss.org/ws/jbws2019'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws2019/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws2019'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws2019/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws2019/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
-
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='phoneBookPort'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
-
- <binding name='phoneBookBinding' type='tns:phoneBookPort'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal' parts='parameters'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
-
- <service name='phoneBookService'>
- <port binding='tns:phoneBookBinding' name='PhoneBook'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBook.wsdl 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook'
+ targetNamespace='http://test.jboss.org/ws/jbws2019'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws2019/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws2019'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws2019/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws2019/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='phoneBookPort'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+
+ <binding name='phoneBookBinding' type='tns:phoneBookPort'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal' parts='parameters'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name='phoneBookService'>
+ <port binding='tns:phoneBookBinding' name='PhoneBook'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Mar 03 12:41:29 GMT 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws2019;
-public interface PhoneBookPort extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws2019.TelephoneNumber lookup(org.jboss.test.ws.jbws2019.Person lookup) throws java.rmi.RemoteException;
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/PhoneBookPort.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Mar 03 12:41:29 GMT 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws2019;
+public interface PhoneBookPort extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws2019.TelephoneNumber lookup(org.jboss.test.ws.jbws2019.Person lookup) throws java.rmi.RemoteException;
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Mon Mar 03 12:41:29 GMT 2008
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws2019;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/TelephoneNumber.java 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Mon Mar 03 12:41:29 GMT 2008
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws2019;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws2019</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws2019/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws2019</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws2019</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws2019.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>firstName</java-variable-name>
- <xml-element-name>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws2019.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>areaCode</java-variable-name>
- <xml-element-name>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws2019.PhoneBookService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2019'>serviceNS:phoneBookService</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBook</port-name>
- <java-port-name>PhoneBook</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws2019.PhoneBookPort</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2019'>portTypeNS:phoneBookPort</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2019'>bindingNS:phoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws2019.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws2019.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/jaxrpc-mapping.xml 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws2019</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws2019/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws2019</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws2019</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws2019.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws2019.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws2019/types'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws2019.PhoneBookService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws2019'>serviceNS:phoneBookService</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBook</port-name>
+ <java-port-name>PhoneBook</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws2019.PhoneBookPort</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws2019'>portTypeNS:phoneBookPort</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws2019'>bindingNS:phoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws2019.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws2019.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws2019'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-03-03 16:38:38 UTC (rev 5881)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-06-12 16:23:10 UTC (rev 7507)
@@ -1,6 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws2019/doclit/PhoneBook.wsdl"
- parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml (from rev 5881, stack/native/trunk/src/test/resources/tools/jbws2019/doclit/wstools-config.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/tools/jbws2019/doclit/wstools-config.xml 2008-06-12 16:23:10 UTC (rev 7507)
@@ -0,0 +1,6 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws2019/doclit/PhoneBook.wsdl"
+ parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
16 years, 7 months
- 1
- 0
JBossWS SVN: r7506 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/server and 13 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-06-12 11:39:16 -0400 (Thu, 12 Jun 2008)
New Revision: 7506
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.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/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
[JBPAPP-819] Cannot find local schema with relative urls.
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 2008-06-12 11:52:21 UTC (rev 7505)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-06-12 15:39:16 UTC (rev 7506)
@@ -379,7 +379,18 @@
<include name="org/jboss/test/ws/jaxws/jbws1762/JBWS1762Impl.class"/>
</fileset>
</copy>
-
+
+ <!-- jaxws-jbws1798 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF">
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxws-jbws1854 -->
<war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-06-12 11:52:21 UTC (rev 7505)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -102,7 +102,7 @@
/**
* Modify the location of wsdl and schema imports
*/
- private void modifyAddressReferences(URL reqURL, String wsdlHost, String resPath, Element element) throws MalformedURLException
+ private void modifyAddressReferences(URL reqURL, String wsdlHost, String resPath, Element element) throws IOException
{
// map wsdl definition imports
NodeList nlist = element.getChildNodes();
@@ -124,13 +124,34 @@
if (locationAttr != null)
{
String orgLocation = locationAttr.getNodeValue();
+
+ while (orgLocation.startsWith("./"))
+ orgLocation = orgLocation.substring(2);
+
boolean isAbsolute = orgLocation.startsWith("http://") || orgLocation.startsWith("https://");
if (isAbsolute == false && orgLocation.startsWith(reqURL.getPath()) == false)
{
String newResourcePath = orgLocation;
if (resPath != null && resPath.indexOf("/") > 0)
- newResourcePath = resPath.substring(0, resPath.lastIndexOf("/") + 1) + orgLocation;
+ {
+ String resParent = resPath.substring(0, resPath.lastIndexOf("/"));
+ while (orgLocation.startsWith("../") && resParent != null)
+ {
+ if (resParent.indexOf("/") > 0)
+ {
+ resParent = resParent.substring(0, resParent.lastIndexOf("/"));
+ orgLocation = orgLocation.substring(3);
+ newResourcePath = resParent + "/" + orgLocation;
+ }
+ else
+ {
+ orgLocation = orgLocation.substring(3);
+ newResourcePath = orgLocation;
+ resParent = null;
+ }
+ }
+ }
String reqPath = reqURL.getPath();
String completeHost = wsdlHost;
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2008-06-12 11:52:21 UTC (rev 7505)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -552,9 +552,9 @@
return tmpFile != null ? tmpFile.toURL() : null;
}
- private void handleSchemaImports(Element schemaEl, URL wsdlLoc) throws MalformedURLException, WSDLException
+ private void handleSchemaImports(Element schemaEl, URL parentURL) throws WSDLException, IOException
{
- if (wsdlLoc == null)
+ if (parentURL == null)
throw new IllegalArgumentException("Cannot process import, parent location not set");
Iterator it = DOMUtils.getChildElements(schemaEl, new QName(Constants.NS_SCHEMA_XSD, "import"));
@@ -569,8 +569,15 @@
// Skip, let the entity resolver resolve these
if (namespace != null && schemaLocation != null)
{
- URL currLoc = getLocationURL(wsdlLoc, schemaLocation);
- schemaLocationsMap.put(namespace, currLoc);
+ URL currLoc = getLocationURL(parentURL, schemaLocation);
+ if (schemaLocationsMap.get(namespace) == null)
+ {
+ schemaLocationsMap.put(namespace, currLoc);
+
+ // Recursively handle schema imports
+ Element importedSchema = DOMUtils.parse(currLoc.openStream());
+ handleSchemaImports(importedSchema, currLoc);
+ }
}
else
{
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798 (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbws1798;
-
-// $Id: $
-
-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.jbws1798.generated.CountryCodeType;
-import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType;
-import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType;
-import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-1798] JBossWS cannot find local schema with relative urls
- *
- * @author thomas.diesler(a)jboss.com
- * @since 16-Oct-2007
- */
-public class JBWS1798TestCase extends JBossWSTest
-{
- private String targetNS = "http://jbws1798.jaxws.ws.test.jboss.org/";
- private ServiceType proxy;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1798TestCase.class, "jaxws-jbws1798.war");
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- QName serviceName = new QName(targetNS, "Service");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1798/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.jbws1798.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));
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1798;
+
+// $Id: $
+
+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.jbws1798.generated.CountryCodeType;
+import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType;
+import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType;
+import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1798] JBossWS cannot find local schema with relative urls
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 16-Oct-2007
+ */
+public class JBWS1798TestCase extends JBossWSTest
+{
+ private String targetNS = "http://jbws1798.jaxws.ws.test.jboss.org/";
+ private ServiceType proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1798TestCase.class, "jaxws-jbws1798.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "Service");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1798/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.jbws1798.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));
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.jbws1798;
-
-// $Id: $
-
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType;
-import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType;
-import org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse;
-import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType;
-import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response;
-
-@WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws1798.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;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1798;
+
+// $Id: $
+
+import java.util.List;
+
+import javax.jws.WebService;
+
+import org.jboss.test.ws.jaxws.jbws1798.generated.CountryCodeType;
+import org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType;
+import org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse;
+import org.jboss.test.ws.jaxws.jbws1798.generated.ServiceType;
+import org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response;
+
+@WebService(portName = "ServicePort", serviceName = "Service", wsdlLocation = "WEB-INF/wsdl/TestService.wsdl", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", endpointInterface = "org.jboss.test.ws.jaxws.jbws1798.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;
+ }
+
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,38 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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);
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,38 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,38 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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);
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,38 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,34 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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 {
-
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,34 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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 {
+
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,136 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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;
- }
-
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,136 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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;
+ }
+
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,34 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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 {
-
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,34 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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 {
+
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,136 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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;
- }
-
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,136 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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;
+ }
+
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,103 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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.jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/", "getCurrencyResponse");
- private final static QName _GetCurrency_QNAME = new QName("http://jbws1798.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.jbws1798.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://jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/", name = "getCurrency")
- public JAXBElement<CountryCodeType> createGetCurrency(CountryCodeType value) {
- return new JAXBElement<CountryCodeType>(_GetCurrency_QNAME, CountryCodeType.class, null, value);
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,103 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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.jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/", "getCurrencyResponse");
+ private final static QName _GetCurrency_QNAME = new QName("http://jbws1798.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.jbws1798.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://jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/", name = "getCurrency")
+ public JAXBElement<CountryCodeType> createGetCurrency(CountryCodeType value) {
+ return new JAXBElement<CountryCodeType>(_GetCurrency_QNAME, CountryCodeType.class, null, value);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,58 +0,0 @@
-
-package org.jboss.test.ws.jaxws.jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/")
-public interface ServiceType {
-
-
- /**
- *
- * @return
- * returns org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response
- */
- @WebMethod(action = "countryCodesAction")
- @WebResult(name = "response", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/")
- @RequestWrapper(localName = "getCountryCodes", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodes")
- @ResponseWrapper(localName = "getCountryCodesResponse", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse")
- public org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response getCountryCodes();
-
- /**
- *
- * @param parameters
- * @return
- * returns org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType
- */
- @WebMethod(action = "currencyAction")
- @WebResult(name = "getCurrencyResponse", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", partName = "parameters")
- @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- public CurrencyCodeType getCurrency(
- @WebParam(name = "getCurrency", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", partName = "parameters")
- CountryCodeType parameters);
-
- /**
- *
- * @return
- * returns org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse.Response
- */
- @WebMethod(action = "currencyCodesAction")
- @WebResult(name = "response", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/")
- @RequestWrapper(localName = "getCurrencyCodes", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodes")
- @ResponseWrapper(localName = "getCurrencyCodesResponse", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse")
- public org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse.Response getCurrencyCodes();
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,58 @@
+
+package org.jboss.test.ws.jaxws.jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/")
+public interface ServiceType {
+
+
+ /**
+ *
+ * @return
+ * returns org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response
+ */
+ @WebMethod(action = "countryCodesAction")
+ @WebResult(name = "response", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/")
+ @RequestWrapper(localName = "getCountryCodes", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodes")
+ @ResponseWrapper(localName = "getCountryCodesResponse", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse")
+ public org.jboss.test.ws.jaxws.jbws1798.generated.GetCountryCodesResponse.Response getCountryCodes();
+
+ /**
+ *
+ * @param parameters
+ * @return
+ * returns org.jboss.test.ws.jaxws.jbws1798.generated.CurrencyCodeType
+ */
+ @WebMethod(action = "currencyAction")
+ @WebResult(name = "getCurrencyResponse", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", partName = "parameters")
+ @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ public CurrencyCodeType getCurrency(
+ @WebParam(name = "getCurrency", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", partName = "parameters")
+ CountryCodeType parameters);
+
+ /**
+ *
+ * @return
+ * returns org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse.Response
+ */
+ @WebMethod(action = "currencyCodesAction")
+ @WebResult(name = "response", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/")
+ @RequestWrapper(localName = "getCurrencyCodes", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodes")
+ @ResponseWrapper(localName = "getCurrencyCodesResponse", targetNamespace = "http://jbws1798.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse")
+ public org.jboss.test.ws.jaxws.jbws1798.generated.GetCurrencyCodesResponse.Response getCurrencyCodes();
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,2 +0,0 @@
-(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://jbws1798.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.jboss.test.ws.jaxws.jbws1798.generated;
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java (from rev 4776, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://jbws1798.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.jboss.test.ws.jaxws.jbws1798.generated;
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798 (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,18 +0,0 @@
-<?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.jbws1798.ServiceImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Service</servlet-name>
- <url-pattern>/Service</url-pattern>
- </servlet-mapping>
-
-</web-app>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml 2008-06-12 15:39:16 UTC (rev 7506)
@@ -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.jbws1798.ServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Service</servlet-name>
+ <url-pattern>/Service</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<definitions name='Service' targetNamespace='http://jbws1798.jaxws.ws.test.jboss.org/' xmlns:tns='http://jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws1798.jaxws.ws.test.jboss.org/"
- xmlns:xns4="http://jbws1798.jaxws.ws.test.jboss.org/java/lang/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:import namespace="urn:BaseComponents" schemaLocation="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='Service'>
- <port name='ServicePort' binding='tns:ServiceBinding'>
- <soap:address location='http:unknown-location-uri'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl 2008-06-12 15:39:16 UTC (rev 7506)
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='utf-8'?>
+<definitions name='Service' targetNamespace='http://jbws1798.jaxws.ws.test.jboss.org/' xmlns:tns='http://jbws1798.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://jbws1798.jaxws.ws.test.jboss.org/" xmlns:tns="http://jbws1798.jaxws.ws.test.jboss.org/"
+ xmlns:xns4="http://jbws1798.jaxws.ws.test.jboss.org/java/lang/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <xsd:import namespace="urn:BaseComponents" schemaLocation="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='Service'>
+ <port name='ServicePort' binding='tns:ServiceBinding'>
+ <soap:address location='http:unknown-location-uri'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,12 +0,0 @@
-<?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>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/CoreComponentTypes.xsd 2008-06-12 15:39:16 UTC (rev 7506)
@@ -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>
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd 2008-06-12 15:39:16 UTC (rev 7506)
@@ -1,23 +0,0 @@
-<?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
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd (from rev 4776, stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd 2008-06-12 15:39:16 UTC (rev 7506)
@@ -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
16 years, 7 months
- 1
- 0
JBossWS SVN: r7505 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-06-12 07:52:21 -0400 (Thu, 12 Jun 2008)
New Revision: 7505
Modified:
stack/native/trunk/.classpath
Log:
Fix eclipse classpath
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-06-12 09:57:09 UTC (rev 7504)
+++ stack/native/trunk/.classpath 2008-06-12 11:52:21 UTC (rev 7505)
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="modules/saaj/src/main/java"/>
+ <classpathentry kind="src" path="modules/testsuite/framework-tests/target/wsconsume/java"/>
+ <classpathentry kind="src" path="modules/testsuite/native-tests/target/wsconsume/java"/>
+ <classpathentry kind="src" path="modules/testsuite/framework-tests/src/test/java"/>
+ <classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/>
+ <classpathentry kind="src" path="modules/jaxrpc/src/main/java"/>
+ <classpathentry kind="src" path="modules/jaxws/src/main/java"/>
+ <classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/>
+ <classpathentry kind="src" path="modules/core/src/main/java"/>
+ <classpathentry kind="src" path="modules/embedded/src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path=""/>
+ <classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
16 years, 7 months
- 1
- 0
JBossWS SVN: r7504 - stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-12 05:57:09 -0400 (Thu, 12 Jun 2008)
New Revision: 7504
Modified:
stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt
stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt
Log:
[JBWS-2219] reviewed excludes
Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt 2008-06-12 09:46:46 UTC (rev 7503)
+++ stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt 2008-06-12 09:57:09 UTC (rev 7504)
@@ -11,7 +11,7 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-1674] Fix @WebServiceRef with Metro
+# [JBWS-1684] Fix @WebServiceRef with Metro
org/jboss/test/ws/jaxws/samples/webserviceref/**
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt 2008-06-12 09:46:46 UTC (rev 7503)
+++ stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt 2008-06-12 09:57:09 UTC (rev 7504)
@@ -11,7 +11,7 @@
# [JBWS-1673] Fix JAXR samples for Metro
org/jboss/test/ws/jaxws/samples/jaxr/**
-# [JBWS-1674] Fix @WebServiceRef with Metro
+# [JBWS-1684] Fix @WebServiceRef with Metro
org/jboss/test/ws/jaxws/samples/webserviceref/**
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
16 years, 7 months
- 1
- 0
JBossWS SVN: r7503 - stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-12 05:46:46 -0400 (Thu, 12 Jun 2008)
New Revision: 7503
Modified:
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt
Log:
correct jira number
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt 2008-06-12 09:35:25 UTC (rev 7502)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt 2008-06-12 09:46:46 UTC (rev 7503)
@@ -103,5 +103,5 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt 2008-06-12 09:35:25 UTC (rev 7502)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt 2008-06-12 09:46:46 UTC (rev 7503)
@@ -103,5 +103,5 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt 2008-06-12 09:35:25 UTC (rev 7502)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt 2008-06-12 09:46:46 UTC (rev 7503)
@@ -125,5 +125,5 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt 2008-06-12 09:35:25 UTC (rev 7502)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt 2008-06-12 09:46:46 UTC (rev 7503)
@@ -113,5 +113,5 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
org/jboss/test/ws/jaxws/jbws1178/**
16 years, 7 months
- 1
- 0
JBossWS SVN: r7502 - stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-12 05:35:25 -0400 (Thu, 12 Jun 2008)
New Revision: 7502
Modified:
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2075] reviewed errata
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt 2008-06-11 21:08:50 UTC (rev 7501)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss422.txt 2008-06-12 09:35:25 UTC (rev 7502)
@@ -69,9 +69,6 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
@@ -99,9 +96,12 @@
# [JBWS-2119] WebServiceRef injection from DD doesn't work
org/jboss/test/ws/jaxws/jbws1841/**
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+
# [JBWS-2223] wsconsume for cxf build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
+# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt 2008-06-11 21:08:50 UTC (rev 7501)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss423.txt 2008-06-12 09:35:25 UTC (rev 7502)
@@ -69,9 +69,6 @@
# [CXF-1624] XmlSchemaException: Schema name conflict in collection
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-# [JBWS-1178] Multiple virtual host and soap:address problem
-org/jboss/test/ws/jaxws/jbws1178/**
-
# [JBWS-1683] Fix JAXR samples for CXF
org/jboss/test/ws/jaxws/samples/jaxr/**
@@ -99,9 +96,12 @@
# [JBWS-2119] WebServiceRef injection from DD doesn't work
org/jboss/test/ws/jaxws/jbws1841/**
+# [JBWS-2165] Fix xop tests with maven build
+org/jboss/test/ws/jaxws/samples/xop/**
+
# [JBWS-2223] wsconsume for cxf build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
+# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt 2008-06-11 21:08:50 UTC (rev 7501)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss500.txt 2008-06-12 09:35:25 UTC (rev 7502)
@@ -103,10 +103,6 @@
# [JBWS-2120] @WebWservice does not work with class isolation
org/jboss/test/ws/jaxws/jbws1556/**
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
@@ -124,3 +120,10 @@
org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
org/jboss/test/ws/projectGenerator/**
+
+# [JBWS-2223] wsconsume for cxf build
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt 2008-06-11 21:08:50 UTC (rev 7501)
+++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/testsuite/test-excludes-jboss501.txt 2008-06-12 09:35:25 UTC (rev 7502)
@@ -103,12 +103,15 @@
# [JBWS-2119] WebServiceRef injection from DD doesn't work
org/jboss/test/ws/jaxws/jbws1841/**
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-2194] request requires HTTP authentication: Unauthorized
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
+
+# [JBWS-2223] wsconsume for cxf build
+org/jboss/test/ws/jaxws/complex/**
+org/jboss/test/ws/jaxws/holder/**
+
+# [JBWS-2226] Investigate why multiple virtual hosts test fails on CXF
+org/jboss/test/ws/jaxws/jbws1178/**
16 years, 7 months
- 1
- 0
JBossWS SVN: r7501 - in framework/trunk: testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-11 17:08:50 -0400 (Wed, 11 Jun 2008)
New Revision: 7501
Modified:
framework/trunk/framework.iml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Log:
Update wsprovider tests to use correct classloader hierarchy
Modified: framework/trunk/framework.iml
===================================================================
--- framework/trunk/framework.iml 2008-06-11 21:04:01 UTC (rev 7500)
+++ framework/trunk/framework.iml 2008-06-11 21:08:50 UTC (rev 7501)
@@ -8,6 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/testsuite/test/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2008-06-11 21:04:01 UTC (rev 7500)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2008-06-11 21:08:50 UTC (rev 7501)
@@ -35,10 +35,11 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class PluginBase extends JBossWSTest
+public abstract class PluginBase extends JBossWSTest
{
protected Object delegate = null;
protected ClassLoader origClassLoader;
+ protected String oldCPProp;
protected void dispatch(String methodName) throws Exception
{
@@ -53,7 +54,7 @@
}
}
- protected void maskClasspath() throws Exception
+ protected void setupClasspath() throws Exception
{
String classpath = System.getProperty("surefire.test.class.path");
List<URL> jarURLs = new LinkedList<URL>();
@@ -68,6 +69,8 @@
String s = st.nextToken();
if(s.endsWith(".jar")) // JBWS-2175: skip target/classes and target/test-classes
{
+ if( filtered(s) )
+ continue;
jarURLs.add( new File(s).toURL() );
jarURLString.append( s ).append(File.pathSeparator);
}
@@ -89,15 +92,19 @@
this.origClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(jarFirstClassLoader);
+ this.oldCPProp = System.getProperty("java.class.path");
System.setProperty("java.class.path", jarURLString.toString());
}
- protected void unmaskClasspath()
+ protected abstract boolean filtered(String jarName);
+
+ protected void restoreClasspath()
{
if(this.origClassLoader !=null)
{
Thread.currentThread().setContextClassLoader(this.origClassLoader);
this.origClassLoader = null;
+ System.setProperty("java.class.path", oldCPProp);
}
}
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-06-11 21:04:01 UTC (rev 7500)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-06-11 21:08:50 UTC (rev 7501)
@@ -40,7 +40,7 @@
{
// JBWS-2175
- maskClasspath();
+ setupClasspath();
Class wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
delegate = wscClass.newInstance();
@@ -49,7 +49,7 @@
protected void tearDown() throws Exception
{
- unmaskClasspath();
+ restoreClasspath();
}
/**
@@ -160,4 +160,8 @@
dispatch("testSOAP12Extension");
}
+ protected boolean filtered(String jarName)
+ {
+ return false;
+ }
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2008-06-11 21:04:01 UTC (rev 7500)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2008-06-11 21:08:50 UTC (rev 7501)
@@ -48,7 +48,6 @@
// relative to test execution
File outputDirectory;
-
public WSProviderPlugin()
{
// create a new consumer for every test case
@@ -56,16 +55,16 @@
if(toogleMessageOut) provider.setMessageStream(System.out);
// shared output directory, relative to test execution
- outputDirectory = createResourceFile("../test-classes");
+ outputDirectory = createResourceFile("../wsprovide/java");
}
private ClassLoader getArtefactClassLoader() throws Exception {
- /*URLClassLoader loader = new URLClassLoader(new URL[] {
- new URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/") }
+ URLClassLoader loader = new URLClassLoader(
+ new URL[] { outputDirectory.toURL() },
+ Thread.currentThread().getContextClassLoader()
);
- return loader;*/
- return Thread.currentThread().getContextClassLoader();
+ return loader;
}
/**
@@ -180,7 +179,7 @@
new URL("file:"+targetDir+"/test-libs/jaxws-classloading-types.jar"),
new URL("file:"+jdkHome+"/lib/tools.jar")
},
- Thread.currentThread().getContextClassLoader()
+ getArtefactClassLoader()
);
provider.setClassLoader(loader);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-06-11 21:04:01 UTC (rev 7500)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-06-11 21:08:50 UTC (rev 7501)
@@ -33,9 +33,8 @@
*/
protected void setUp() throws Exception
{
-
- maskClasspath();
+ setupClasspath();
Class wspClass = Thread.currentThread().getContextClassLoader()
.loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin");
@@ -45,7 +44,7 @@
protected void tearDown() throws Exception
{
- unmaskClasspath();
+ restoreClasspath();
}
public void testGenerateWsdl() throws Exception
@@ -82,4 +81,17 @@
{
dispatch("testMessageStream");
}
+
+ /**
+ * Filter sun jaxws implementation because it clashes
+ * with the native one (ServiceLoader...)
+ * @param jarName
+ * @return
+ */
+ protected boolean filtered(String jarName)
+ {
+ return (isIntegrationNative() &&
+ (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1)
+ );
+ }
}
16 years, 7 months
- 1
- 0
JBossWS SVN: r7500 - framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-11 17:04:01 -0400 (Wed, 11 Jun 2008)
New Revision: 7500
Modified:
framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Log:
Setup classloader hierarchy for wsprovider tests
Modified: framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2008-06-11 21:00:07 UTC (rev 7499)
+++ framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2008-06-11 21:04:01 UTC (rev 7500)
@@ -35,10 +35,11 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
-public class PluginBase extends JBossWSTest
+public abstract class PluginBase extends JBossWSTest
{
protected Object delegate = null;
protected ClassLoader origClassLoader;
+ protected String oldCPProp;
protected void dispatch(String methodName) throws Exception
{
@@ -53,7 +54,7 @@
}
}
- protected void maskClasspath() throws Exception
+ protected void setupClasspath() throws Exception
{
String classpath = System.getProperty("surefire.test.class.path");
List<URL> jarURLs = new LinkedList<URL>();
@@ -68,6 +69,8 @@
String s = st.nextToken();
if(s.endsWith(".jar")) // JBWS-2175: skip target/classes and target/test-classes
{
+ if( filtered(s) )
+ continue;
jarURLs.add( new File(s).toURL() );
jarURLString.append( s ).append(File.pathSeparator);
}
@@ -89,15 +92,19 @@
this.origClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(jarFirstClassLoader);
+ this.oldCPProp = System.getProperty("java.class.path");
System.setProperty("java.class.path", jarURLString.toString());
}
- protected void unmaskClasspath()
+ protected abstract boolean filtered(String jarName);
+
+ protected void restoreClasspath()
{
if(this.origClassLoader !=null)
{
Thread.currentThread().setContextClassLoader(this.origClassLoader);
this.origClassLoader = null;
+ System.setProperty("java.class.path", oldCPProp);
}
}
}
Modified: framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-06-11 21:00:07 UTC (rev 7499)
+++ framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-06-11 21:04:01 UTC (rev 7500)
@@ -40,7 +40,7 @@
{
// JBWS-2175
- maskClasspath();
+ setupClasspath();
Class wscClass = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSConsumerPlugin");
delegate = wscClass.newInstance();
@@ -49,7 +49,7 @@
protected void tearDown() throws Exception
{
- unmaskClasspath();
+ restoreClasspath();
}
/**
@@ -160,4 +160,8 @@
dispatch("testSOAP12Extension");
}
+ protected boolean filtered(String jarName)
+ {
+ return false;
+ }
}
Modified: framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2008-06-11 21:00:07 UTC (rev 7499)
+++ framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2008-06-11 21:04:01 UTC (rev 7500)
@@ -48,7 +48,6 @@
// relative to test execution
File outputDirectory;
-
public WSProviderPlugin()
{
// create a new consumer for every test case
@@ -56,16 +55,16 @@
if(toogleMessageOut) provider.setMessageStream(System.out);
// shared output directory, relative to test execution
- outputDirectory = createResourceFile("../test-classes");
+ outputDirectory = createResourceFile("../wsprovide/java");
}
private ClassLoader getArtefactClassLoader() throws Exception {
- /*URLClassLoader loader = new URLClassLoader(new URL[] {
- new URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/") }
+ URLClassLoader loader = new URLClassLoader(
+ new URL[] { outputDirectory.toURL() },
+ Thread.currentThread().getContextClassLoader()
);
- return loader;*/
- return Thread.currentThread().getContextClassLoader();
+ return loader;
}
/**
@@ -180,7 +179,7 @@
new URL("file:"+targetDir+"/test-libs/jaxws-classloading-types.jar"),
new URL("file:"+jdkHome+"/lib/tools.jar")
},
- Thread.currentThread().getContextClassLoader()
+ getArtefactClassLoader()
);
provider.setClassLoader(loader);
Modified: framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
===================================================================
--- framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-06-11 21:00:07 UTC (rev 7499)
+++ framework/branches/jbossws-framework-3.0.2/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2008-06-11 21:04:01 UTC (rev 7500)
@@ -33,9 +33,8 @@
*/
protected void setUp() throws Exception
{
-
- maskClasspath();
+ setupClasspath();
Class wspClass = Thread.currentThread().getContextClassLoader()
.loadClass("org.jboss.test.ws.jaxws.smoke.tools.WSProviderPlugin");
@@ -45,7 +44,7 @@
protected void tearDown() throws Exception
{
- unmaskClasspath();
+ restoreClasspath();
}
public void testGenerateWsdl() throws Exception
@@ -82,4 +81,17 @@
{
dispatch("testMessageStream");
}
+
+ /**
+ * Filter sun jaxws implementation because it clashes
+ * with the native one (ServiceLoader...)
+ * @param jarName
+ * @return
+ */
+ protected boolean filtered(String jarName)
+ {
+ return (isIntegrationNative() &&
+ (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1)
+ );
+ }
}
16 years, 7 months
- 1
- 0