JBossWS SVN: r4778 - stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-17 03:51:25 -0400 (Wed, 17 Oct 2007)
New Revision: 4778
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
Log:
[JBWS-1799] rollbacking my fix because it's not JAX-WS compliant
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-10-17 07:45:19 UTC (rev 4777)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-10-17 07:51:25 UTC (rev 4778)
@@ -60,8 +60,8 @@
private void checkWrapperSource(File outputDir, boolean shouldExist)
{
- File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/generated_978001231/SubmitPO.java");
- File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/generated_978001231/SubmitPOResponse.java");
+ File file1 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPO.java");
+ File file2 = new File(outputDir, "org/jboss/test/ws/tools/jaxws/jaxws/SubmitPOResponse.java");
assertEquals(shouldExist, file1.exists());
assertEquals(shouldExist, file2.exists());
}
@@ -72,12 +72,12 @@
URLClassLoader classLoader = new URLClassLoader(new URL[]{outputDir.toURL()}, Thread.currentThread().getContextClassLoader());
// Check request wrapper
- Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.generated_978001231.SubmitPO", classLoader);
+ Class wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.SubmitPO", classLoader);
wrapper.getMethod("setPurchaseOrder", PurchaseOrder.class);
assertEquals(PurchaseOrder.class.getName(), wrapper.getMethod("getPurchaseOrder").getReturnType().getName());
// Check response wrapper
- wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.generated_978001231.SubmitPOResponse", classLoader);
+ wrapper = JavaUtils.loadJavaType("org.jboss.test.ws.tools.jaxws.jaxws.SubmitPOResponse", classLoader);
wrapper.getMethod("setPurchaseOrderAck", PurchaseOrderAck.class);
assertEquals(PurchaseOrderAck.class.getName(), wrapper.getMethod("getPurchaseOrderAck").getReturnType().getName());
}
17 years, 2 months
JBossWS SVN: r4777 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxws/jbws1799 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-17 03:45:19 -0400 (Wed, 17 Oct 2007)
New Revision: 4777
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java
Log:
[JBWS-1799] rollbacking my fix because it's not JAX-WS compliant
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-10-17 07:45:19 UTC (rev 4777)
@@ -108,7 +108,7 @@
{
protected static final Logger log = Logger.getLogger(JAXWSWebServiceMetaDataBuilder.class);
- protected List<Class> javaTypes = new ArrayList<Class>();
+ protected List<Class<?>> javaTypes = new ArrayList<Class<?>>();
protected JAXBRIContext jaxbCtx;
protected List<TypeReference> typeRefs = new ArrayList<TypeReference>();
protected WrapperGenerator wrapperGenerator;
@@ -283,7 +283,7 @@
String namespace = xmlType.getNamespaceURI();
String faultBean = null;
- Class faultBeanClass = getFaultInfo(exception);
+ Class<?> faultBeanClass = getFaultInfo(exception);
if (faultBeanClass != null)
faultBean = faultBeanClass.getName();
@@ -325,7 +325,7 @@
return JAXBRIContext.mangleNameToVariableName(localName.intern());
}
- private String[] convertTypeArguments(Class rawType, Type type)
+ private String[] convertTypeArguments(Class<?> rawType, Type type)
{
if (!Collection.class.isAssignableFrom(rawType) && !Map.class.isAssignableFrom(rawType))
return null;
@@ -363,7 +363,7 @@
if (requestWrapperType == null)
{
String packageName = JavaUtils.getPackageName(method.getDeclaringClass());
- requestWrapperType = packageName + ".jaxws." + generateId(method) + "." + JavaUtils.capitalize(method.getName());
+ requestWrapperType = packageName + ".jaxws." + JavaUtils.capitalize(method.getName());
}
// JAX-WS p.37 pg.1, the annotation only affects the element name, not the type name
@@ -374,28 +374,6 @@
return wrapperParameter;
}
- /**
- * Generates unique string used for package name creation
- */
- private static String generateId(Method method)
- {
- int hashCode = 17;
- hashCode = 37 * hashCode + method.getDeclaringClass().getName().hashCode();
- hashCode = 37 * hashCode + method.getName().hashCode();
- hashCode = 37 * hashCode + generateId(method.getParameterTypes());
- return ("generated_" + hashCode).replace('-', '_');
- }
-
- private static int generateId(Class<?>[] args)
- {
- int result = 17;
- for (int i = 0; i < args.length; i++)
- {
- result = 37 * result + args[i].getName().hashCode();
- }
- return result;
- }
-
private ParameterMetaData createResponseWrapper(OperationMetaData operation, Method method)
{
QName operationQName = operation.getQName();
@@ -418,7 +396,7 @@
if (responseWrapperType == null)
{
String packageName = JavaUtils.getPackageName(method.getDeclaringClass());
- responseWrapperType = packageName + ".jaxws." + generateId(method) + "." + JavaUtils.capitalize(method.getName()) + "Response";
+ responseWrapperType = packageName + ".jaxws." + JavaUtils.capitalize(method.getName()) + "Response";
}
ParameterMetaData retMetaData = new ParameterMetaData(operation, xmlName, xmlType, responseWrapperType);
@@ -428,12 +406,12 @@
return retMetaData;
}
- private Class getFaultInfo(Class exception)
+ private Class<?> getFaultInfo(Class<?> exception)
{
try
{
Method method = exception.getMethod("getFaultInfo");
- Class returnType = method.getReturnType();
+ Class<?> returnType = method.getReturnType();
if (returnType == void.class)
return null;
@@ -449,7 +427,7 @@
}
}
- private ParameterMode getParameterMode(WebParam anWebParam, Class javaType)
+ private ParameterMode getParameterMode(WebParam anWebParam, Class<?> javaType)
{
if (anWebParam != null)
{
@@ -612,7 +590,7 @@
// Attachment annotations on SEI parameters
List<AttachmentScanResult> scanResult = ReflectiveAttachmentRefScanner.scanMethod(method);
- Class[] parameterTypes = method.getParameterTypes();
+ Class<?>[] parameterTypes = method.getParameterTypes();
Type[] genericTypes = method.getGenericParameterTypes();
Annotation[][] parameterAnnotations = method.getParameterAnnotations();
ParameterMetaData wrapperParameter = null, wrapperOutputParameter = null;
@@ -640,7 +618,7 @@
for (int i = 0; i < parameterTypes.length; i++)
{
- Class javaType = parameterTypes[i];
+ Class<?> javaType = parameterTypes[i];
Type genericType = genericTypes[i];
String javaTypeName = javaType.getName();
WebParam anWebParam = getWebParamAnnotation(method, i);
@@ -716,7 +694,7 @@
}
// Build result meta data
- Class returnType = method.getReturnType();
+ Class<?> returnType = method.getReturnType();
Type genericReturnType = method.getGenericReturnType();
String returnTypeName = returnType.getName();
if (!(returnType == void.class))
@@ -781,7 +759,7 @@
if (wrapperParameter.loadWrapperBean() == null)
wrapperGenerator.generate(wrapperParameter);
- Class wrapperClass = wrapperParameter.getJavaType();
+ Class<?> wrapperClass = wrapperParameter.getJavaType();
javaTypes.add(wrapperClass);
// In case there is no @XmlRootElement
@@ -800,7 +778,7 @@
}
// Add faults
- for (Class exClass : method.getExceptionTypes())
+ for (Class<?> exClass : method.getExceptionTypes())
if (!RemoteException.class.isAssignableFrom(exClass))
addFault(opMetaData, exClass);
@@ -882,7 +860,7 @@
}
- protected void processWebMethods(EndpointMetaData epMetaData, Class wsClass)
+ protected void processWebMethods(EndpointMetaData epMetaData, Class<?> wsClass)
{
epMetaData.clearOperations();
@@ -985,7 +963,7 @@
QName xmlName = paramMetaData.getXmlName();
QName xmlType = paramMetaData.getXmlType();
- Class javaType = paramMetaData.getJavaType();
+ Class<?> javaType = paramMetaData.getJavaType();
String javaName = paramMetaData.getJavaTypeName();
if (xmlType == null)
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/IUserAccountServiceExt.java 2007-10-17 07:45:19 UTC (rev 4777)
@@ -24,6 +24,8 @@
import javax.ejb.Remote;
import javax.jws.WebParam;
import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
/**
* Second service interface
@@ -36,6 +38,8 @@
@WebService
public interface IUserAccountServiceExt
{
+ @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1")
+ @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response")
public boolean authenticate
(
@WebParam(name="username") String username,
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2007-10-16 13:50:20 UTC (rev 4776)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1799/UserAccountServiceExt.java 2007-10-17 07:45:19 UTC (rev 4777)
@@ -27,6 +27,8 @@
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
import org.jboss.wsf.spi.annotation.WebContext;
@@ -59,6 +61,8 @@
{
@WebMethod
@TransactionAttribute(javax.ejb.TransactionAttributeType.SUPPORTS)
+ @RequestWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1")
+ @ResponseWrapper(className="org.jboss.test.ws.jaxws.jbws1799.jaxws.Authenticate1Response")
public boolean authenticate
(
@WebParam(name="username") String username,
17 years, 2 months
JBossWS SVN: r4776 - in stack/native/trunk/src/test: java/org/jboss/test/ws/jaxws/jbws1798 and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-16 09:50:20 -0400 (Tue, 16 Oct 2007)
New Revision: 4776
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/
stack/native/trunk/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/CurrencyCodeType.java
stack/native/trunk/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/GetCountryCodesResponse.java
stack/native/trunk/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/GetCurrencyCodesResponse.java
stack/native/trunk/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/ServiceType.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/package-info.java
stack/native/trunk/src/test/resources/jaxws/jbws1798/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/common/1.0-SNAPSHOT/
stack/native/trunk/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/imported/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/
stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd
Log:
[JBWS-1798] JBossWS cannot find local schema with relative urls
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/JBWS1798TestCase.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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));
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/ServiceImpl.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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;
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CountryCodeType.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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);
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/CurrencyCodeType.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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);
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodes.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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 {
+
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCountryCodesResponse.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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;
+ }
+
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodes.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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 {
+
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/GetCurrencyCodesResponse.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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;
+ }
+
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ObjectFactory.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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);
+ }
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1798/generated/ServiceType.java 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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();
+
+}
Added: stack/native/trunk/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 (rev 0)
+++ 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)
@@ -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;
Added: stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/web.xml 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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>
Added: stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1798/WEB-INF/wsdl/TestService.wsdl 2007-10-16 13:50:20 UTC (rev 4776)
@@ -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
Added: stack/native/trunk/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 (rev 0)
+++ 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)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified"
+ xmlns:bc="urn:BaseComponents"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import namespace="urn:BaseComponents" schemaLocation="../../imported/my-service/1.0-SNAPSHOT/BaseComponents.xsd"/>
+ <xs:simpleType name="CountryType">
+ <xs:restriction base="bc:CountryCodeType"/>
+ </xs:simpleType>
+ <xs:simpleType name="CurrencyType">
+ <xs:restriction base="bc:CurrencyCodeType"/>
+ </xs:simpleType>
+</xs:schema>
Added: stack/native/trunk/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 (rev 0)
+++ 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)
@@ -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
17 years, 2 months
JBossWS SVN: r4775 - stack/native/trunk/ant-import-tests.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-16 09:42:52 -0400 (Tue, 16 Oct 2007)
New Revision: 4775
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
Log:
[JBWS-1798] JBossWS cannot find local schema with relative urls
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-16 13:40:59 UTC (rev 4774)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-16 13:42:52 UTC (rev 4775)
@@ -380,6 +380,17 @@
</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-jbws1799 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws1799.jar">
<fileset dir="${tests.output.dir}/classes">
17 years, 2 months
JBossWS SVN: r4771 - in stack/native/trunk/src: test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-16 08:21:30 -0400 (Tue, 16 Oct 2007)
New Revision: 4771
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
Log:
[JBWS-1802] RemotingConnectionImpl.addURLParameter() doesn't guarantee a URL as expected by the JBossRemoting InvokerLocator
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-10-16 08:29:19 UTC (rev 4770)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java 2007-10-16 12:21:30 UTC (rev 4771)
@@ -207,11 +207,11 @@
}
}
- private String addURLParameter(String url, String key, String value)
+ private String addURLParameter(String urlStr, String key, String value) throws MalformedURLException
{
- int qmIndex = url.indexOf("?");
- url += (qmIndex < 0 ? "?" : "&") + key + "=" + value;
- return url;
+ URL url = new URL(urlStr);
+ urlStr += (url.getQuery() == null ? "?" : "&") + key + "=" + value;
+ return urlStr;
}
private Client createRemotingClient(Object endpoint, String targetAddress, boolean oneway)
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-10-16 08:29:19 UTC (rev 4770)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/common/soap/SOAPConnectionTestCase.java 2007-10-16 12:21:30 UTC (rev 4771)
@@ -31,6 +31,7 @@
import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
@@ -65,6 +66,27 @@
runEndpointTest(new URL(TARGET_ENDPOINT_ADDRESS));
}
+ // [JBWS-1802] RemotingConnectionImpl.addURLParameter() doesn't guarantee a URL as expected by the JBossRemoting InvokerLocator
+ public void testNullContext() throws Exception
+ {
+ SOAPMessage request = buildValidMessage();
+ SOAPConnection connection = SOAPConnectionFactory.newInstance().createConnection();
+ try
+ {
+ connection.call(request, "http://" + getServerHost() + ":8080");
+ }
+ catch (Exception ex)
+ {
+ while (ex != null)
+ {
+ if(ex instanceof SOAPException && ex.getMessage().equals("Unsupported content type: text/html"))
+ break;
+ else
+ ex = (Exception)ex.getCause();
+ }
+ }
+ }
+
private void runEndpointTest(Object endPoint) throws Exception
{
SOAPMessage request = buildValidMessage();
17 years, 2 months
JBossWS SVN: r4770 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-16 04:29:19 -0400 (Tue, 16 Oct 2007)
New Revision: 4770
Added:
stack/native/branches/Branch_2_0_1_SOA_4_2/
Log:
Create SOA branch from jbossws-2.0.1.SP2
Copied: stack/native/branches/Branch_2_0_1_SOA_4_2 (from rev 4769, stack/native/tags/jbossws-native-2.0.1.SP2)
17 years, 2 months
JBossWS SVN: r4769 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1803: jbossws-tests/src/java/org/jboss/test/ws/common/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-10-16 03:40:29 -0400 (Tue, 16 Oct 2007)
New Revision: 4769
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
Log:
[JBWS-1803] Fixed test cases that failed after the update
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-10-16 07:22:47 UTC (rev 4768)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-10-16 07:40:29 UTC (rev 4769)
@@ -39,8 +39,13 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.HTTPMessageImpl;
import org.jboss.ws.core.MessageAbstraction;
+import org.jboss.ws.core.soap.EnvelopeBuilder;
+import org.jboss.ws.core.soap.EnvelopeBuilderDOM;
+import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.core.soap.SOAPBodyImpl;
+import org.jboss.ws.core.soap.SOAPContentElement;
import org.jboss.ws.core.jaxrpc.Style;
-import org.jboss.ws.core.soap.*;
+import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
@@ -103,6 +108,7 @@
{
if (style == Style.RPC)
{
+ soapBody.removeContents();
EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style);
Element domBodyElement = DOMUtils.sourceToElement(source);
builder.buildBodyElementRpc(soapBody, domBodyElement);
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-10-16 07:22:47 UTC (rev 4768)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-10-16 07:40:29 UTC (rev 4769)
@@ -184,7 +184,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
soapMessage.writeTo(baos);
- String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>";
+ String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Body><ns1:hello xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>world::SOAP header was added</String_1></ns1:hello></env:Body></env:Envelope>";
assertEquals(expEnv, baos.toString());
}
}
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-10-16 07:22:47 UTC (rev 4768)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-10-16 07:40:29 UTC (rev 4769)
@@ -41,7 +41,7 @@
*/
public class ExceptionTestCase extends JBossWSTest
{
- private String targetNS = "http://exception.jaxws.ws.test.jboss.org/";
+ private String targetNS = "http://exception.samples.jaxws.ws.test.jboss.org/";
private ExceptionEndpoint proxy;
public static Test suite()
17 years, 2 months