JBossWS SVN: r1956 - branches/dlofthouse.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-13 11:20:06 -0500 (Sat, 13 Jan 2007)
New Revision: 1956
Removed:
branches/dlofthouse/JBWS-1231/
Log:
Branch no longer required.
18 years
JBossWS SVN: r1955 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-13 11:18:13 -0500 (Sat, 13 Jan 2007)
New Revision: 1955
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
trunk/jbossws-tests/src/main/java/org/…
[View More]jboss/test/ws/tools/jbws1231/TestEndpoint.java
trunk/jbossws-tests/src/main/resources/tools/jbws1231/
trunk/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml
Removed:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java
trunk/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
JBWS-1231 - Java To WSDL, handle self referencing exceptions.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-01-13 16:18:13 UTC (rev 1955)
@@ -308,7 +308,7 @@
}
else
{
- name = utils.getJustClassName(javaType);
+ name = WSDLUtils.getJustClassName(javaType);
namespace = getNamespace(javaType);
}
@@ -705,21 +705,27 @@
else
{
namespace = getNamespace(javaType);
- name = utils.getJustClassName(javaType);
+ name = WSDLUtils.getJustClassName(javaType);
}
- JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
+ List<XSParticle> particles = new ArrayList<XSParticle>(0);
+ List<Class> types = new ArrayList<Class>(0);
+ JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
complexType.setName(name);
complexType.setNamespace(namespace);
+ xsModel.addXSComplexTypeDefinition(complexType);
+ xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace));
+ typeMapping.register(javaType, new QName(namespace, name), null, null);
+ registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null);
+
Class superClass = javaType.getSuperclass();
if (!Exception.class.equals(superClass) || Throwable.class.equals(superClass))
{
JBossXSTypeDefinition baseType = generateType(null, superClass);
complexType.setBaseType(baseType);
}
- List<Class> types = new ArrayList<Class>(0);
- List<XSParticle> particles = new ArrayList<XSParticle>(0);
+
generateExceptionParticles(namespace, javaType, types, particles);
boolean found = hasConstructor(javaType, types);
@@ -744,13 +750,8 @@
}
}
- complexType.setParticle(createGroupParticle(namespace, particles));
+ complexType.setParticle(createGroupParticle(namespace, particles));
- xsModel.addXSComplexTypeDefinition(complexType);
- xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace));
- typeMapping.register(javaType, new QName(namespace, name), null, null);
- registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null);
-
return complexType;
}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231 (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,52 +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.jbws1231;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13 Jan 2007
- */
-public class CustomException extends Exception
-{
-
- private static final long serialVersionUID = 1L;
-
- private CustomException wrappedException;
-
- public CustomException(CustomException wrapped)
- {
- super();
- this.wrappedException = wrapped;
- }
-
- public CustomException getWrappedException()
- {
- return wrappedException;
- }
-
- public void setWrappedException(CustomException wrappedException)
- {
- this.wrappedException = wrappedException;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,56 +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.jbws1231;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13 Jan 2007
- */
-public class DataObject
-{
-
- private String message;
-
- private DataObject parent;
-
- public String getMessage()
- {
- return message;
- }
-
- public void setMessage(String message)
- {
- this.message = message;
- }
-
- public DataObject getParent()
- {
- return parent;
- }
-
- public void setParent(DataObject parent)
- {
- this.parent = parent;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,50 +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.jbws1231;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13 Jan 2007
- */
-public class JBWS1231TestCase extends WSToolsTest
-{
-
- public final void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1231";
- String toolsDir = "tools/jbws1231";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
-
- new WSTools().generate(args);
-
- semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,37 +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.jbws1231;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13 Jan 2007
- */
-public interface TestEndpoint extends Remote
-{
-
- public DataObject echoDataObject(final DataObject parameter) throws RemoteException, CustomException;
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java)
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1231 (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231)
Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1231' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1231/type' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1231' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1231/type' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1231/type' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='CustomException'>
- <sequence>
- <element name='wrappedException' nillable='true' type='tns:CustomException'/>
- </sequence>
- </complexType>
- <complexType name='echoDataObject'>
- <sequence>
- <element name='DataObject_1' nillable='true' type='tns:DataObject'/>
- </sequence>
- </complexType>
- <complexType name='DataObject'>
- <sequence>
- <element name='message' nillable='true' type='string'/>
- <element name='parent' nillable='true' type='tns:DataObject'/>
- </sequence>
- </complexType>
- <complexType name='echoDataObjectResponse'>
- <sequence>
- <element name='result' nillable='true' type='tns:DataObject'/>
- </sequence>
- </complexType>
- <element name='CustomException' type='tns:CustomException'/>
- <element name='echoDataObject' type='tns:echoDataObject'/>
- <element name='echoDataObjectResponse' type='tns:echoDataObjectResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_echoDataObject'>
- <part element='ns1:echoDataObject' name='echoDataObject'/>
- </message>
- <message name='TestEndpoint_echoDataObjectResponse'>
- <part element='ns1:echoDataObjectResponse' name='echoDataObjectResponse'/>
- </message>
- <message name='CustomException'>
- <part element='ns1:CustomException' name='CustomException'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoDataObject' parameterOrder='echoDataObject'>
- <input message='tns:TestEndpoint_echoDataObject'/>
- <output message='tns:TestEndpoint_echoDataObjectResponse'/>
- <fault message='tns:CustomException' name='CustomException'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echoDataObject'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- <fault name='CustomException'>
- <soap:fault name='CustomException' use='literal'/>
- </fault>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl)
Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,78 +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.tools.jbws1231</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1231/type</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1231.DataObject</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:DataObject</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>parent</java-variable-name>
- <xml-element-name>parent</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1231.TestEndpoint_echoDataObject_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:echoDataObject</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>dataObject_1</java-variable-name>
- <xml-element-name>DataObject_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1231.CustomException</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:CustomException</root-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1231.TestEndpoint_echoDataObject_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:echoDataObjectResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <exception-mapping>
- <exception-type>org.jboss.test.ws.tools.jbws1231.CustomException</exception-type>
- <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1231'>exMsgNS:CustomException</wsdl-message>
- </exception-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.tools.jbws1231.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1231'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.tools.jbws1231.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1231'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1231'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoDataObject</java-method-name>
- <wsdl-operation>echoDataObject</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.tools.jbws1231.DataObject</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1231'>wsdlMsgNS:TestEndpoint_echoDataObject</wsdl-message>
- <wsdl-message-part-name>DataObject_1</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.tools.jbws1231.DataObject</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1231'>wsdlMsgNS:TestEndpoint_echoDataObjectResponse</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: trunk/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml)
Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml 2007-01-13 15:22:38 UTC (rev 1954)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml 2007-01-13 16:18:13 UTC (rev 1955)
@@ -1,14 +0,0 @@
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <java-wsdl>
- <service name="TestService"
- endpoint="org.jboss.test.ws.tools.jbws1231.TestEndpoint" style="document" />
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1231"
- type-namespace="http://org.jboss.test.ws/jbws1231/type" />
- <mapping file="jaxrpc-mapping.xml" />
- <webservices servlet-link="TestService"/>
- </java-wsdl>
-
-</configuration>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml (from rev 1954, branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml)
[View Less]
18 years
JBossWS SVN: r1954 - in branches/dlofthouse/JBWS-1231: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-13 10:22:38 -0500 (Sat, 13 Jan 2007)
New Revision: 1954
Added:
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/…
[View More]jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1231/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
JBWS-1231 - Java to WSDL, support for recursive exception references.
Modified: branches/dlofthouse/JBWS-1231/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-01-13 15:22:38 UTC (rev 1954)
@@ -308,7 +308,7 @@
}
else
{
- name = utils.getJustClassName(javaType);
+ name = WSDLUtils.getJustClassName(javaType);
namespace = getNamespace(javaType);
}
@@ -705,21 +705,27 @@
else
{
namespace = getNamespace(javaType);
- name = utils.getJustClassName(javaType);
+ name = WSDLUtils.getJustClassName(javaType);
}
- JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
+ List<XSParticle> particles = new ArrayList<XSParticle>(0);
+ List<Class> types = new ArrayList<Class>(0);
+ JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
complexType.setName(name);
complexType.setNamespace(namespace);
+ xsModel.addXSComplexTypeDefinition(complexType);
+ xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace));
+ typeMapping.register(javaType, new QName(namespace, name), null, null);
+ registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null);
+
Class superClass = javaType.getSuperclass();
if (!Exception.class.equals(superClass) || Throwable.class.equals(superClass))
{
JBossXSTypeDefinition baseType = generateType(null, superClass);
complexType.setBaseType(baseType);
}
- List<Class> types = new ArrayList<Class>(0);
- List<XSParticle> particles = new ArrayList<XSParticle>(0);
+
generateExceptionParticles(namespace, javaType, types, particles);
boolean found = hasConstructor(javaType, types);
@@ -744,13 +750,8 @@
}
}
- complexType.setParticle(createGroupParticle(namespace, particles));
+ complexType.setParticle(createGroupParticle(namespace, particles));
- xsModel.addXSComplexTypeDefinition(complexType);
- xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace));
- typeMapping.register(javaType, new QName(namespace, name), null, null);
- registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null);
-
return complexType;
}
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,52 @@
+/*
+ * 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.jbws1231;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13 Jan 2007
+ */
+public class CustomException extends Exception
+{
+
+ private static final long serialVersionUID = 1L;
+
+ private CustomException wrappedException;
+
+ public CustomException(CustomException wrapped)
+ {
+ super();
+ this.wrappedException = wrapped;
+ }
+
+ public CustomException getWrappedException()
+ {
+ return wrappedException;
+ }
+
+ public void setWrappedException(CustomException wrappedException)
+ {
+ this.wrappedException = wrappedException;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/CustomException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,56 @@
+/*
+ * 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.jbws1231;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13 Jan 2007
+ */
+public class DataObject
+{
+
+ private String message;
+
+ private DataObject parent;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
+
+ public DataObject getParent()
+ {
+ return parent;
+ }
+
+ public void setParent(DataObject parent)
+ {
+ this.parent = parent;
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/DataObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,50 @@
+/*
+ * 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.jbws1231;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13 Jan 2007
+ */
+public class JBWS1231TestCase extends WSToolsTest
+{
+
+ public final void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1231";
+ String toolsDir = "tools/jbws1231";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+
+ new WSTools().generate(args);
+
+ semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,37 @@
+/*
+ * 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.jbws1231;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13 Jan 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public DataObject echoDataObject(final DataObject parameter) throws RemoteException, CustomException;
+
+}
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1231/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1231' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1231/type' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1231' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1231/type' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1231/type' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='CustomException'>
+ <sequence>
+ <element name='wrappedException' nillable='true' type='tns:CustomException'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoDataObject'>
+ <sequence>
+ <element name='DataObject_1' nillable='true' type='tns:DataObject'/>
+ </sequence>
+ </complexType>
+ <complexType name='DataObject'>
+ <sequence>
+ <element name='message' nillable='true' type='string'/>
+ <element name='parent' nillable='true' type='tns:DataObject'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoDataObjectResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='tns:DataObject'/>
+ </sequence>
+ </complexType>
+ <element name='CustomException' type='tns:CustomException'/>
+ <element name='echoDataObject' type='tns:echoDataObject'/>
+ <element name='echoDataObjectResponse' type='tns:echoDataObjectResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echoDataObject'>
+ <part element='ns1:echoDataObject' name='echoDataObject'/>
+ </message>
+ <message name='TestEndpoint_echoDataObjectResponse'>
+ <part element='ns1:echoDataObjectResponse' name='echoDataObjectResponse'/>
+ </message>
+ <message name='CustomException'>
+ <part element='ns1:CustomException' name='CustomException'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoDataObject' parameterOrder='echoDataObject'>
+ <input message='tns:TestEndpoint_echoDataObject'/>
+ <output message='tns:TestEndpoint_echoDataObjectResponse'/>
+ <fault message='tns:CustomException' name='CustomException'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoDataObject'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ <fault name='CustomException'>
+ <soap:fault name='CustomException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,78 @@
+<?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.tools.jbws1231</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1231/type</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1231.DataObject</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:DataObject</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>parent</java-variable-name>
+ <xml-element-name>parent</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1231.TestEndpoint_echoDataObject_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:echoDataObject</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>dataObject_1</java-variable-name>
+ <xml-element-name>DataObject_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1231.CustomException</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:CustomException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1231.TestEndpoint_echoDataObject_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1231/type'>typeNS:echoDataObjectResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>org.jboss.test.ws.tools.jbws1231.CustomException</exception-type>
+ <wsdl-message xmlns:exMsgNS='http://org.jboss.test.ws/jbws1231'>exMsgNS:CustomException</wsdl-message>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.tools.jbws1231.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1231'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.tools.jbws1231.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1231'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1231'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoDataObject</java-method-name>
+ <wsdl-operation>echoDataObject</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.tools.jbws1231.DataObject</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1231'>wsdlMsgNS:TestEndpoint_echoDataObject</wsdl-message>
+ <wsdl-message-part-name>DataObject_1</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.tools.jbws1231.DataObject</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1231'>wsdlMsgNS:TestEndpoint_echoDataObjectResponse</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
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml 2007-01-13 15:14:17 UTC (rev 1953)
+++ branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml 2007-01-13 15:22:38 UTC (rev 1954)
@@ -0,0 +1,14 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService"
+ endpoint="org.jboss.test.ws.tools.jbws1231.TestEndpoint" style="document" />
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1231"
+ type-namespace="http://org.jboss.test.ws/jbws1231/type" />
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices servlet-link="TestService"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1231/jbossws-tests/src/main/resources/tools/jbws1231/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
[View Less]
18 years
JBossWS SVN: r1953 - branches/dlofthouse.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-13 10:14:17 -0500 (Sat, 13 Jan 2007)
New Revision: 1953
Added:
branches/dlofthouse/JBWS-1231/
Log:
JBWS-1231 Working branch.
Copied: branches/dlofthouse/JBWS-1231 (from rev 1952, trunk)
18 years
JBossWS SVN: r1952 - in branches/dlofthouse/JBWS-1452/jbossws-tests/src/main: java/org/jboss/test/ws/tools/jbws1452 and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-12 18:12:59 -0500 (Fri, 12 Jan 2007)
New Revision: 1952
Added:
branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1452/
branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1452/JBWS1452TestCase.java
branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/
branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/…
[View More]
branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/TestEndpoint.wsdl
branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/wstools-config.xml
Log:
JBWS-1452 - First test case.
Added: branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1452/JBWS1452TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1452/JBWS1452TestCase.java 2007-01-12 23:12:01 UTC (rev 1951)
+++ branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1452/JBWS1452TestCase.java 2007-01-12 23:12:59 UTC (rev 1952)
@@ -0,0 +1,88 @@
+/*
+ * 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.jbws1452;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 12 Jan 2007
+ */
+public class JBWS1452TestCase extends JBossWSTest
+{
+
+ public void testScenario_A() throws Exception
+ {
+ generateScenario("A");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1452/scenario_" + scenario;
+ String toolsDir = "tools/jbws1452/scenario_" + 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/jbws1452/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ //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();
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1452/JBWS1452TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/TestEndpoint.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/TestEndpoint.wsdl 2007-01-12 23:12:01 UTC (rev 1951)
+++ branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/TestEndpoint.wsdl 2007-01-12 23:12:59 UTC (rev 1952)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1452' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1452/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1452' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1452/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1452/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='testMethod'>
+ <sequence>
+ <element name='request' nillable='true' type='tns:RequestStringArray'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='RequestStringArray'>
+ <sequence>
+ <element name='TheStrings' type='string' maxOccurs='unbounded'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='testMethodResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='tns:ResponseStringArray'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='ResponseStringArray'>
+ <sequence>
+ <element name='TheStrings' type='string' maxOccurs='unbounded'/>
+ </sequence>
+ </complexType>
+
+ <element name='testMethod' type='tns:testMethod'/>
+ <element name='testMethodResponse' type='tns:testMethodResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_testMethod'>
+ <part element='ns1:testMethod' name='testMethod'/>
+ </message>
+ <message name='TestEndpoint_testMethodResponse'>
+ <part element='ns1:testMethodResponse' name='testMethodResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='testMethod' parameterOrder='testMethod'>
+ <input message='tns:TestEndpoint_testMethod'/>
+ <output message='tns:TestEndpoint_testMethodResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testMethod'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/wstools-config.xml 2007-01-12 23:12:01 UTC (rev 1951)
+++ branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/wstools-config.xml 2007-01-12 23:12:59 UTC (rev 1952)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1452/scenario_A/TestEndpoint.wsdl" parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1452/jbossws-tests/src/main/resources/tools/jbws1452/scenario_A/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
[View Less]
18 years
JBossWS SVN: r1951 - branches/dlofthouse.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-12 18:12:01 -0500 (Fri, 12 Jan 2007)
New Revision: 1951
Added:
branches/dlofthouse/JBWS-1452/
Log:
Working branch for JBWS-1452.
Copied: branches/dlofthouse/JBWS-1452 (from rev 1950, trunk)
18 years
JBossWS SVN: r1950 - in trunk/jbossws-tests/src/main: resources/tools/jbws-211/jbosswsConfig/OneWay and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-12 13:48:46 -0500 (Fri, 12 Jan 2007)
New Revision: 1950
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java
trunk/jbossws-tests/src/main/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml
Log:
JBWS-1394 - Added parameters to OneWayJava2WSDLTestCase configuration so method would be correctly identified.
Modified: trunk/jbossws-tests/src/main/java/org/jboss/…
[View More]test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2007-01-12 17:20:08 UTC (rev 1949)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws_211/tests/OneWay/OneWayJava2WSDLTestCase.java 2007-01-12 18:48:46 UTC (rev 1950)
@@ -36,16 +36,8 @@
public String getBase()
{
return base;
- }
+ }
- protected String getFixMe()
- {
- if (isTargetJBoss())
- return "FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase";
- else
- return null;
- }
-
public String getWSDLName()
{
return base + "Service.wsdl";
Modified: trunk/jbossws-tests/src/main/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2007-01-12 17:20:08 UTC (rev 1949)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws-211/jbosswsConfig/OneWay/OneWayConfig.xml 2007-01-12 18:48:46 UTC (rev 1950)
@@ -2,7 +2,9 @@
xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
<java-wsdl>
<service name="OneWayService" endpoint="org.jboss.test.ws.tools.jbws_211.sei.OneWay.TestOneWaySEI" style="rpc">
- <operation name="oneWayOperation" one-way="true"/>
+ <operation name="oneWayOperation" one-way="true">
+ <parameter type="java.lang.String" />
+ </operation>
</service>
<namespaces target-namespace="http://org.jboss.ws" type-namespace="http://org.jboss.ws/types"/>
</java-wsdl>
[View Less]
18 years
JBossWS SVN: r1949 - in trunk: jbossws-core/src/main/java/org/jboss/ws/tools/helpers and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-12 12:20:08 -0500 (Fri, 12 Jan 2007)
New Revision: 1949
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
trunk/jbossws-tests/src/main/resources/tools/jbws1450/
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl
trunk/…
[View More]jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
Log:
JBWS-1450 - WSDL to Java, parameter unwrapping and the handling of primitive types.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -418,8 +418,8 @@
String elementName = in.getElement().getLocalPart();
if (elementName.equals(operationName) == false)
- throw new WSException("[JAX-RPC - 2.3.1.2] Unable to unwrap parameters, wrapper element name must match operation name. operationName=" + operationName + " elementName="
- + elementName);
+ throw new WSException("[JAX-RPC - 2.3.1.2] Unable to unwrap parameters, wrapper element name must match operation name. operationName=" + operationName
+ + " elementName=" + elementName);
wrapped = unwrapElementParameters(buf, containingElement, xt);
}
@@ -507,7 +507,8 @@
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
- generateParameter(buf, tempContainingElement, xmlType, xsmodel, type, array, !element.getNillable(), false);
+ boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
+ generateParameter(buf, tempContainingElement, xmlType, xsmodel, type, array, primitive, false);
String paramName;
if (type.getAnonymous())
@@ -623,6 +624,7 @@
{
String containingElement = xmlName.getLocalPart();
String arraySuffix = "";
+ boolean primitive = true;
JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
@@ -636,7 +638,9 @@
if (unwrapper.unwrappedElement != null)
{
- xt = unwrapper.unwrappedElement.getTypeDefinition();
+ XSElementDeclaration element = unwrapper.unwrappedElement;
+ xt = element.getTypeDefinition();
+ primitive = unwrapper.primitive;
if (unwrapper.xmlType != null)
xmlType = unwrapper.xmlType;
@@ -648,7 +652,6 @@
}
}
- boolean primitive = true;
WrappedArray wrappedArray = new WrappedArray(xt);
if (wrappedArray.unwrap())
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -259,6 +259,7 @@
{
QName xmlName = output.getElement();
QName xmlType = output.getXMLType();
+ boolean primitive = true;
String targetNS = wsdlDefinitions.getTargetNamespace();
QName messageName = new QName(targetNS, output.getMessageName().getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS);
@@ -275,6 +276,7 @@
{
XSElementDeclaration element = unwrapper.unwrappedElement;
xt = element.getTypeDefinition();
+ primitive = unwrapper.primitive;
partName = element.getName();
containingElement = containingElement + unwrapper.unwrappedElement.getName();
array = unwrapper.array;
@@ -296,7 +298,7 @@
if (xt instanceof XSSimpleTypeDefinition)
xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
- String javaType = getJavaTypeAsString(xmlName, xmlType, array, true);
+ String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
if (isDocStyle() == false && "void".equals(javaType))
return;
@@ -512,9 +514,10 @@
}
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
+ boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
MethodParamPartsMapping part = getMethodParamPartsMapping(methodMapping, xmlName, xmlType, partsMappings.size(), messageName, "IN", xmlName.getLocalPart(),
- array, !element.getNillable());
+ array, primitive);
partsMappings.add(part);
}
}
@@ -542,7 +545,7 @@
throw new WSException("Only a sequence type can be unwrapped.");
XSObjectList particles = group.getParticles();
- String returnType = null;
+
for (int i = 0; i < particles.getLength(); i++)
{
XSParticle particle = (XSParticle)particles.item(i);
@@ -558,9 +561,9 @@
QName xmlName = new QName(element.getNamespace(), element.getName());
QName xmlType = new QName(element.getTypeDefinition().getNamespace(), element.getTypeDefinition().getName());
boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
- StringBuilder buf = new StringBuilder();
+ boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
- String javaType = getJavaTypeAsString(xmlName, xmlType, array, !element.getNillable());
+ String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(methodMapping);
wrvm.setMethodReturnValue(javaType);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -46,6 +46,7 @@
public QName xmlType;
public XSElementDeclaration unwrappedElement;
public boolean array = false;
+ public boolean primitive = false;
private boolean wrapped;
public ReturnTypeUnwrapper(QName xmlType, JBossXSModel xsmodel, boolean wrapped)
@@ -110,6 +111,7 @@
xmlType = new QName(unwrappedElement.getTypeDefinition().getNamespace(), unwrappedElement.getTypeDefinition().getName());
this.array = array;
+ primitive = !(unwrappedElement.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
}
}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,166 @@
+/*
+ * 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.jbws1450;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 12 Jan 2007
+ */
+public class JBWS1450TestCase extends JBossWSTest
+{
+
+ /**
+ * Test unwrapping with nillable='true'.
+ *
+ * <complexType name='testBoolean'>
+ * <sequence>
+ * <element name='Boolean_1' nillable='true' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ *
+ * <complexType name='testBooleanResponse'>
+ * <sequence>
+ * <element name='result' nillable='true' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ *
+ */
+ public void testScenario_A() throws Exception
+ {
+ generateScenario("A");
+ }
+
+ /**
+ * Test unwrapping with minOccurs='0' and no maxOccurs.
+ *
+ * <complexType name='testBoolean'>
+ * <sequence>
+ * <element name='Boolean_1' minOccurs='0' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ *
+ * <complexType name='testBooleanResponse'>
+ * <sequence>
+ * <element name='result' minOccurs='0' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ */
+ public void testScenario_B() throws Exception
+ {
+ generateScenario("B");
+ }
+
+ /**
+ * Test unwrapping with minOccurs='0' and maxOccurs='1'.
+ *
+ * <complexType name='testBoolean'>
+ * <sequence>
+ * <element name='Boolean_1' minOccurs='0' maxOccurs='1' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ *
+ * <complexType name='testBooleanResponse'>
+ * <sequence>
+ * <element name='result' minOccurs='0' maxOccurs='1' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ *
+ */
+ public void testScenario_C() throws Exception
+ {
+ generateScenario("C");
+ }
+
+ /**
+ * Test unwrapping with no nillable, no minOccurs and no maxOccurs.
+ *
+ *
+ * <complexType name='testBoolean'>
+ * <sequence>
+ * <element name='Boolean_1' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ *
+ * <complexType name='testBooleanResponse'>
+ * <sequence>
+ * <element name='result' type='boolean'/>
+ * </sequence>
+ * </complexType>
+ */
+ public void testScenario_D() throws Exception
+ {
+ generateScenario("D");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1450/scenario_" + scenario;
+ String toolsDir = "tools/jbws1450/scenario_" + 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/jbws1450/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ 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();
+ }
+
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='testBoolean'>
+ <sequence>
+ <element name='Boolean_1' nillable='true' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testBooleanResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByte'>
+ <sequence>
+ <element name='Byte_1' nillable='true' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByteResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloat'>
+ <sequence>
+ <element name='Float_1' nillable='true' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloatResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testInteger'>
+ <sequence>
+ <element name='Integer_1' nillable='true' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testIntegerResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLong'>
+ <sequence>
+ <element name='Long_1' nillable='true' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLongResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShort'>
+ <sequence>
+ <element name='Short_1' nillable='true' type='short'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShortResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='short'/>
+ </sequence>
+ </complexType>
+ <element name='testBoolean' type='tns:testBoolean'/>
+ <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
+ <element name='testByte' type='tns:testByte'/>
+ <element name='testByteResponse' type='tns:testByteResponse'/>
+ <element name='testFloat' type='tns:testFloat'/>
+ <element name='testFloatResponse' type='tns:testFloatResponse'/>
+ <element name='testInteger' type='tns:testInteger'/>
+ <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
+ <element name='testLong' type='tns:testLong'/>
+ <element name='testLongResponse' type='tns:testLongResponse'/>
+ <element name='testShort' type='tns:testShort'/>
+ <element name='testShortResponse' type='tns:testShortResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_testBoolean'>
+ <part element='ns1:testBoolean' name='testBoolean'/>
+ </message>
+ <message name='TestEndpoint_testBooleanResponse'>
+ <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
+ </message>
+ <message name='TestEndpoint_testByte'>
+ <part element='ns1:testByte' name='testByte'/>
+ </message>
+ <message name='TestEndpoint_testByteResponse'>
+ <part element='ns1:testByteResponse' name='testByteResponse'/>
+ </message>
+ <message name='TestEndpoint_testFloat'>
+ <part element='ns1:testFloat' name='testFloat'/>
+ </message>
+ <message name='TestEndpoint_testFloatResponse'>
+ <part element='ns1:testFloatResponse' name='testFloatResponse'/>
+ </message>
+ <message name='TestEndpoint_testInteger'>
+ <part element='ns1:testInteger' name='testInteger'/>
+ </message>
+ <message name='TestEndpoint_testIntegerResponse'>
+ <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
+ </message>
+ <message name='TestEndpoint_testLong'>
+ <part element='ns1:testLong' name='testLong'/>
+ </message>
+ <message name='TestEndpoint_testLongResponse'>
+ <part element='ns1:testLongResponse' name='testLongResponse'/>
+ </message>
+ <message name='TestEndpoint_testShort'>
+ <part element='ns1:testShort' name='testShort'/>
+ </message>
+ <message name='TestEndpoint_testShortResponse'>
+ <part element='ns1:testShortResponse' name='testShortResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='testBoolean' parameterOrder='testBoolean'>
+ <input message='tns:TestEndpoint_testBoolean'/>
+ <output message='tns:TestEndpoint_testBooleanResponse'/>
+ </operation>
+ <operation name='testByte' parameterOrder='testByte'>
+ <input message='tns:TestEndpoint_testByte'/>
+ <output message='tns:TestEndpoint_testByteResponse'/>
+ </operation>
+ <operation name='testFloat' parameterOrder='testFloat'>
+ <input message='tns:TestEndpoint_testFloat'/>
+ <output message='tns:TestEndpoint_testFloatResponse'/>
+ </operation>
+ <operation name='testInteger' parameterOrder='testInteger'>
+ <input message='tns:TestEndpoint_testInteger'/>
+ <output message='tns:TestEndpoint_testIntegerResponse'/>
+ </operation>
+ <operation name='testLong' parameterOrder='testLong'>
+ <input message='tns:TestEndpoint_testLong'/>
+ <output message='tns:TestEndpoint_testLongResponse'/>
+ </operation>
+ <operation name='testShort' parameterOrder='testShort'>
+ <input message='tns:TestEndpoint_testShort'/>
+ <output message='tns:TestEndpoint_testShortResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testBoolean'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testByte'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testFloat'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testInteger'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testLong'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testShort'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,21 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1450;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public java.lang.Boolean testBoolean(java.lang.Boolean boolean_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Byte testByte(java.lang.Byte byte_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Float testFloat(java.lang.Float float_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Integer testInteger(java.lang.Integer integer_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Long testLong(java.lang.Long long_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Short testShort(java.lang.Short short_1) throws
+ java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>long_1</java-variable-name>
+ <xml-element-name>Long_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>integer_1</java-variable-name>
+ <xml-element-name>Integer_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShortResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloatResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloat</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>float_1</java-variable-name>
+ <xml-element-name>Float_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>boolean_1</java-variable-name>
+ <xml-element-name>Boolean_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByte</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>byte_1</java-variable-name>
+ <xml-element-name>Byte_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestIntegerResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShort</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>short_1</java-variable-name>
+ <xml-element-name>Short_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testBoolean</java-method-name>
+ <wsdl-operation>testBoolean</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Boolean</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
+ <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Boolean</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testByte</java-method-name>
+ <wsdl-operation>testByte</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Byte</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
+ <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Byte</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testFloat</java-method-name>
+ <wsdl-operation>testFloat</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Float</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
+ <wsdl-message-part-name>Float_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Float</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testInteger</java-method-name>
+ <wsdl-operation>testInteger</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Integer</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
+ <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Integer</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testLong</java-method-name>
+ <wsdl-operation>testLong</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Long</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
+ <wsdl-message-part-name>Long_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Long</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testShort</java-method-name>
+ <wsdl-operation>testShort</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Short</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
+ <wsdl-message-part-name>Short_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Short</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</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>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1450/scenario_A/TestEndpoint.wsdl" parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_A/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='testBoolean'>
+ <sequence>
+ <element name='Boolean_1' minOccurs='0' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testBooleanResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByte'>
+ <sequence>
+ <element name='Byte_1' minOccurs='0' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByteResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloat'>
+ <sequence>
+ <element name='Float_1' minOccurs='0' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloatResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testInteger'>
+ <sequence>
+ <element name='Integer_1' minOccurs='0' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testIntegerResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLong'>
+ <sequence>
+ <element name='Long_1' minOccurs='0' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLongResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShort'>
+ <sequence>
+ <element name='Short_1' minOccurs='0' type='short'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShortResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' type='short'/>
+ </sequence>
+ </complexType>
+ <element name='testBoolean' type='tns:testBoolean'/>
+ <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
+ <element name='testByte' type='tns:testByte'/>
+ <element name='testByteResponse' type='tns:testByteResponse'/>
+ <element name='testFloat' type='tns:testFloat'/>
+ <element name='testFloatResponse' type='tns:testFloatResponse'/>
+ <element name='testInteger' type='tns:testInteger'/>
+ <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
+ <element name='testLong' type='tns:testLong'/>
+ <element name='testLongResponse' type='tns:testLongResponse'/>
+ <element name='testShort' type='tns:testShort'/>
+ <element name='testShortResponse' type='tns:testShortResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_testBoolean'>
+ <part element='ns1:testBoolean' name='testBoolean'/>
+ </message>
+ <message name='TestEndpoint_testBooleanResponse'>
+ <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
+ </message>
+ <message name='TestEndpoint_testByte'>
+ <part element='ns1:testByte' name='testByte'/>
+ </message>
+ <message name='TestEndpoint_testByteResponse'>
+ <part element='ns1:testByteResponse' name='testByteResponse'/>
+ </message>
+ <message name='TestEndpoint_testFloat'>
+ <part element='ns1:testFloat' name='testFloat'/>
+ </message>
+ <message name='TestEndpoint_testFloatResponse'>
+ <part element='ns1:testFloatResponse' name='testFloatResponse'/>
+ </message>
+ <message name='TestEndpoint_testInteger'>
+ <part element='ns1:testInteger' name='testInteger'/>
+ </message>
+ <message name='TestEndpoint_testIntegerResponse'>
+ <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
+ </message>
+ <message name='TestEndpoint_testLong'>
+ <part element='ns1:testLong' name='testLong'/>
+ </message>
+ <message name='TestEndpoint_testLongResponse'>
+ <part element='ns1:testLongResponse' name='testLongResponse'/>
+ </message>
+ <message name='TestEndpoint_testShort'>
+ <part element='ns1:testShort' name='testShort'/>
+ </message>
+ <message name='TestEndpoint_testShortResponse'>
+ <part element='ns1:testShortResponse' name='testShortResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='testBoolean' parameterOrder='testBoolean'>
+ <input message='tns:TestEndpoint_testBoolean'/>
+ <output message='tns:TestEndpoint_testBooleanResponse'/>
+ </operation>
+ <operation name='testByte' parameterOrder='testByte'>
+ <input message='tns:TestEndpoint_testByte'/>
+ <output message='tns:TestEndpoint_testByteResponse'/>
+ </operation>
+ <operation name='testFloat' parameterOrder='testFloat'>
+ <input message='tns:TestEndpoint_testFloat'/>
+ <output message='tns:TestEndpoint_testFloatResponse'/>
+ </operation>
+ <operation name='testInteger' parameterOrder='testInteger'>
+ <input message='tns:TestEndpoint_testInteger'/>
+ <output message='tns:TestEndpoint_testIntegerResponse'/>
+ </operation>
+ <operation name='testLong' parameterOrder='testLong'>
+ <input message='tns:TestEndpoint_testLong'/>
+ <output message='tns:TestEndpoint_testLongResponse'/>
+ </operation>
+ <operation name='testShort' parameterOrder='testShort'>
+ <input message='tns:TestEndpoint_testShort'/>
+ <output message='tns:TestEndpoint_testShortResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testBoolean'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testByte'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testFloat'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testInteger'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testLong'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testShort'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,21 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1450;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public java.lang.Boolean testBoolean(java.lang.Boolean boolean_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Byte testByte(java.lang.Byte byte_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Float testFloat(java.lang.Float float_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Integer testInteger(java.lang.Integer integer_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Long testLong(java.lang.Long long_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Short testShort(java.lang.Short short_1) throws
+ java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>long_1</java-variable-name>
+ <xml-element-name>Long_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>integer_1</java-variable-name>
+ <xml-element-name>Integer_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShortResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloatResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloat</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>float_1</java-variable-name>
+ <xml-element-name>Float_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>boolean_1</java-variable-name>
+ <xml-element-name>Boolean_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByte</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>byte_1</java-variable-name>
+ <xml-element-name>Byte_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestIntegerResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShort</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>short_1</java-variable-name>
+ <xml-element-name>Short_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testBoolean</java-method-name>
+ <wsdl-operation>testBoolean</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Boolean</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
+ <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Boolean</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testByte</java-method-name>
+ <wsdl-operation>testByte</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Byte</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
+ <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Byte</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testFloat</java-method-name>
+ <wsdl-operation>testFloat</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Float</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
+ <wsdl-message-part-name>Float_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Float</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testInteger</java-method-name>
+ <wsdl-operation>testInteger</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Integer</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
+ <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Integer</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testLong</java-method-name>
+ <wsdl-operation>testLong</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Long</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
+ <wsdl-message-part-name>Long_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Long</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testShort</java-method-name>
+ <wsdl-operation>testShort</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Short</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
+ <wsdl-message-part-name>Short_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Short</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</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>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1450/scenario_B/TestEndpoint.wsdl" parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_B/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='testBoolean'>
+ <sequence>
+ <element name='Boolean_1' minOccurs='0' maxOccurs='1' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testBooleanResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' maxOccurs='1' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByte'>
+ <sequence>
+ <element name='Byte_1' minOccurs='0' maxOccurs='1' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByteResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' maxOccurs='1' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloat'>
+ <sequence>
+ <element name='Float_1' minOccurs='0' maxOccurs='1' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloatResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' maxOccurs='1' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testInteger'>
+ <sequence>
+ <element name='Integer_1' minOccurs='0' maxOccurs='1' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testIntegerResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' maxOccurs='1' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLong'>
+ <sequence>
+ <element name='Long_1' minOccurs='0' maxOccurs='1' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLongResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' maxOccurs='1' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShort'>
+ <sequence>
+ <element name='Short_1' minOccurs='0' maxOccurs='1' type='short'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShortResponse'>
+ <sequence>
+ <element name='result' minOccurs='0' maxOccurs='1' type='short'/>
+ </sequence>
+ </complexType>
+ <element name='testBoolean' type='tns:testBoolean'/>
+ <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
+ <element name='testByte' type='tns:testByte'/>
+ <element name='testByteResponse' type='tns:testByteResponse'/>
+ <element name='testFloat' type='tns:testFloat'/>
+ <element name='testFloatResponse' type='tns:testFloatResponse'/>
+ <element name='testInteger' type='tns:testInteger'/>
+ <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
+ <element name='testLong' type='tns:testLong'/>
+ <element name='testLongResponse' type='tns:testLongResponse'/>
+ <element name='testShort' type='tns:testShort'/>
+ <element name='testShortResponse' type='tns:testShortResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_testBoolean'>
+ <part element='ns1:testBoolean' name='testBoolean'/>
+ </message>
+ <message name='TestEndpoint_testBooleanResponse'>
+ <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
+ </message>
+ <message name='TestEndpoint_testByte'>
+ <part element='ns1:testByte' name='testByte'/>
+ </message>
+ <message name='TestEndpoint_testByteResponse'>
+ <part element='ns1:testByteResponse' name='testByteResponse'/>
+ </message>
+ <message name='TestEndpoint_testFloat'>
+ <part element='ns1:testFloat' name='testFloat'/>
+ </message>
+ <message name='TestEndpoint_testFloatResponse'>
+ <part element='ns1:testFloatResponse' name='testFloatResponse'/>
+ </message>
+ <message name='TestEndpoint_testInteger'>
+ <part element='ns1:testInteger' name='testInteger'/>
+ </message>
+ <message name='TestEndpoint_testIntegerResponse'>
+ <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
+ </message>
+ <message name='TestEndpoint_testLong'>
+ <part element='ns1:testLong' name='testLong'/>
+ </message>
+ <message name='TestEndpoint_testLongResponse'>
+ <part element='ns1:testLongResponse' name='testLongResponse'/>
+ </message>
+ <message name='TestEndpoint_testShort'>
+ <part element='ns1:testShort' name='testShort'/>
+ </message>
+ <message name='TestEndpoint_testShortResponse'>
+ <part element='ns1:testShortResponse' name='testShortResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='testBoolean' parameterOrder='testBoolean'>
+ <input message='tns:TestEndpoint_testBoolean'/>
+ <output message='tns:TestEndpoint_testBooleanResponse'/>
+ </operation>
+ <operation name='testByte' parameterOrder='testByte'>
+ <input message='tns:TestEndpoint_testByte'/>
+ <output message='tns:TestEndpoint_testByteResponse'/>
+ </operation>
+ <operation name='testFloat' parameterOrder='testFloat'>
+ <input message='tns:TestEndpoint_testFloat'/>
+ <output message='tns:TestEndpoint_testFloatResponse'/>
+ </operation>
+ <operation name='testInteger' parameterOrder='testInteger'>
+ <input message='tns:TestEndpoint_testInteger'/>
+ <output message='tns:TestEndpoint_testIntegerResponse'/>
+ </operation>
+ <operation name='testLong' parameterOrder='testLong'>
+ <input message='tns:TestEndpoint_testLong'/>
+ <output message='tns:TestEndpoint_testLongResponse'/>
+ </operation>
+ <operation name='testShort' parameterOrder='testShort'>
+ <input message='tns:TestEndpoint_testShort'/>
+ <output message='tns:TestEndpoint_testShortResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testBoolean'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testByte'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testFloat'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testInteger'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testLong'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testShort'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,21 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1450;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public java.lang.Boolean testBoolean(java.lang.Boolean boolean_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Byte testByte(java.lang.Byte byte_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Float testFloat(java.lang.Float float_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Integer testInteger(java.lang.Integer integer_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Long testLong(java.lang.Long long_1) throws
+ java.rmi.RemoteException;
+ public java.lang.Short testShort(java.lang.Short short_1) throws
+ java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>long_1</java-variable-name>
+ <xml-element-name>Long_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>integer_1</java-variable-name>
+ <xml-element-name>Integer_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShortResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloatResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloat</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>float_1</java-variable-name>
+ <xml-element-name>Float_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>boolean_1</java-variable-name>
+ <xml-element-name>Boolean_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByte</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>byte_1</java-variable-name>
+ <xml-element-name>Byte_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestIntegerResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShort</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>short_1</java-variable-name>
+ <xml-element-name>Short_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testBoolean</java-method-name>
+ <wsdl-operation>testBoolean</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Boolean</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
+ <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Boolean</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testByte</java-method-name>
+ <wsdl-operation>testByte</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Byte</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
+ <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Byte</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testFloat</java-method-name>
+ <wsdl-operation>testFloat</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Float</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
+ <wsdl-message-part-name>Float_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Float</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testInteger</java-method-name>
+ <wsdl-operation>testInteger</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Integer</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
+ <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Integer</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testLong</java-method-name>
+ <wsdl-operation>testLong</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Long</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
+ <wsdl-message-part-name>Long_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Long</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testShort</java-method-name>
+ <wsdl-operation>testShort</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.Short</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
+ <wsdl-message-part-name>Short_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.Short</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</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>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1450/scenario_C/TestEndpoint.wsdl" parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_C/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1450' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1450/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1450' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1450/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1450/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='testBoolean'>
+ <sequence>
+ <element name='Boolean_1' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testBooleanResponse'>
+ <sequence>
+ <element name='result' type='boolean'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByte'>
+ <sequence>
+ <element name='Byte_1' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testByteResponse'>
+ <sequence>
+ <element name='result' type='byte'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloat'>
+ <sequence>
+ <element name='Float_1' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testFloatResponse'>
+ <sequence>
+ <element name='result' type='float'/>
+ </sequence>
+ </complexType>
+ <complexType name='testInteger'>
+ <sequence>
+ <element name='Integer_1' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testIntegerResponse'>
+ <sequence>
+ <element name='result' type='int'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLong'>
+ <sequence>
+ <element name='Long_1' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testLongResponse'>
+ <sequence>
+ <element name='result' type='long'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShort'>
+ <sequence>
+ <element name='Short_1' type='short'/>
+ </sequence>
+ </complexType>
+ <complexType name='testShortResponse'>
+ <sequence>
+ <element name='result' type='short'/>
+ </sequence>
+ </complexType>
+ <element name='testBoolean' type='tns:testBoolean'/>
+ <element name='testBooleanResponse' type='tns:testBooleanResponse'/>
+ <element name='testByte' type='tns:testByte'/>
+ <element name='testByteResponse' type='tns:testByteResponse'/>
+ <element name='testFloat' type='tns:testFloat'/>
+ <element name='testFloatResponse' type='tns:testFloatResponse'/>
+ <element name='testInteger' type='tns:testInteger'/>
+ <element name='testIntegerResponse' type='tns:testIntegerResponse'/>
+ <element name='testLong' type='tns:testLong'/>
+ <element name='testLongResponse' type='tns:testLongResponse'/>
+ <element name='testShort' type='tns:testShort'/>
+ <element name='testShortResponse' type='tns:testShortResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_testBoolean'>
+ <part element='ns1:testBoolean' name='testBoolean'/>
+ </message>
+ <message name='TestEndpoint_testBooleanResponse'>
+ <part element='ns1:testBooleanResponse' name='testBooleanResponse'/>
+ </message>
+ <message name='TestEndpoint_testByte'>
+ <part element='ns1:testByte' name='testByte'/>
+ </message>
+ <message name='TestEndpoint_testByteResponse'>
+ <part element='ns1:testByteResponse' name='testByteResponse'/>
+ </message>
+ <message name='TestEndpoint_testFloat'>
+ <part element='ns1:testFloat' name='testFloat'/>
+ </message>
+ <message name='TestEndpoint_testFloatResponse'>
+ <part element='ns1:testFloatResponse' name='testFloatResponse'/>
+ </message>
+ <message name='TestEndpoint_testInteger'>
+ <part element='ns1:testInteger' name='testInteger'/>
+ </message>
+ <message name='TestEndpoint_testIntegerResponse'>
+ <part element='ns1:testIntegerResponse' name='testIntegerResponse'/>
+ </message>
+ <message name='TestEndpoint_testLong'>
+ <part element='ns1:testLong' name='testLong'/>
+ </message>
+ <message name='TestEndpoint_testLongResponse'>
+ <part element='ns1:testLongResponse' name='testLongResponse'/>
+ </message>
+ <message name='TestEndpoint_testShort'>
+ <part element='ns1:testShort' name='testShort'/>
+ </message>
+ <message name='TestEndpoint_testShortResponse'>
+ <part element='ns1:testShortResponse' name='testShortResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='testBoolean' parameterOrder='testBoolean'>
+ <input message='tns:TestEndpoint_testBoolean'/>
+ <output message='tns:TestEndpoint_testBooleanResponse'/>
+ </operation>
+ <operation name='testByte' parameterOrder='testByte'>
+ <input message='tns:TestEndpoint_testByte'/>
+ <output message='tns:TestEndpoint_testByteResponse'/>
+ </operation>
+ <operation name='testFloat' parameterOrder='testFloat'>
+ <input message='tns:TestEndpoint_testFloat'/>
+ <output message='tns:TestEndpoint_testFloatResponse'/>
+ </operation>
+ <operation name='testInteger' parameterOrder='testInteger'>
+ <input message='tns:TestEndpoint_testInteger'/>
+ <output message='tns:TestEndpoint_testIntegerResponse'/>
+ </operation>
+ <operation name='testLong' parameterOrder='testLong'>
+ <input message='tns:TestEndpoint_testLong'/>
+ <output message='tns:TestEndpoint_testLongResponse'/>
+ </operation>
+ <operation name='testShort' parameterOrder='testShort'>
+ <input message='tns:TestEndpoint_testShort'/>
+ <output message='tns:TestEndpoint_testShortResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='testBoolean'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testByte'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testFloat'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testInteger'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testLong'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='testShort'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,21 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1450;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public boolean testBoolean(boolean boolean_1) throws
+ java.rmi.RemoteException;
+ public byte testByte(byte byte_1) throws
+ java.rmi.RemoteException;
+ public float testFloat(float float_1) throws
+ java.rmi.RemoteException;
+ public int testInteger(int integer_1) throws
+ java.rmi.RemoteException;
+ public long testLong(long long_1) throws
+ java.rmi.RemoteException;
+ public short testShort(short short_1) throws
+ java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1450</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1450/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLong</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLong</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>long_1</java-variable-name>
+ <xml-element-name>Long_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestInteger</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testInteger</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>integer_1</java-variable-name>
+ <xml-element-name>Integer_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestLongResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testLongResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShortResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShortResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloatResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloatResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestFloat</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testFloat</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>float_1</java-variable-name>
+ <xml-element-name>Float_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBoolean</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBoolean</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>boolean_1</java-variable-name>
+ <xml-element-name>Boolean_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestBooleanResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testBooleanResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByte</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByte</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>byte_1</java-variable-name>
+ <xml-element-name>Byte_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestByteResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testByteResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestIntegerResponse</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testIntegerResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1450.TestShort</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1450/types">typeNS:testShort</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>short_1</java-variable-name>
+ <xml-element-name>Short_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1450.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1450">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1450.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1450">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1450">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>testBoolean</java-method-name>
+ <wsdl-operation>testBoolean</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>boolean</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBoolean</wsdl-message>
+ <wsdl-message-part-name>Boolean_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>boolean</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testBooleanResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testByte</java-method-name>
+ <wsdl-operation>testByte</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>byte</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByte</wsdl-message>
+ <wsdl-message-part-name>Byte_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>byte</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testByteResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testFloat</java-method-name>
+ <wsdl-operation>testFloat</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>float</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloat</wsdl-message>
+ <wsdl-message-part-name>Float_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>float</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testFloatResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testInteger</java-method-name>
+ <wsdl-operation>testInteger</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>int</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testInteger</wsdl-message>
+ <wsdl-message-part-name>Integer_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>int</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testIntegerResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testLong</java-method-name>
+ <wsdl-operation>testLong</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>long</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLong</wsdl-message>
+ <wsdl-message-part-name>Long_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>long</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testLongResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>testShort</java-method-name>
+ <wsdl-operation>testShort</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>short</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShort</wsdl-message>
+ <wsdl-message-part-name>Short_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>short</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1450">wsdlMsgNS:TestEndpoint_testShortResponse</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>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml 2007-01-12 16:47:53 UTC (rev 1948)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml 2007-01-12 17:20:08 UTC (rev 1949)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1450/scenario_D/TestEndpoint.wsdl" parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1450/scenario_D/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
[View Less]
18 years
JBossWS SVN: r1948 - trunk/jbossws-tests/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-12 11:47:53 -0500 (Fri, 12 Jan 2007)
New Revision: 1948
Modified:
trunk/jbossws-tests/ant-import/build-interop-jars.xml
trunk/jbossws-tests/ant-import/build-interop.xml
Log:
More interop fixes
Modified: trunk/jbossws-tests/ant-import/build-interop-jars.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-interop-jars.xml 2007-01-12 16:39:05 UTC (rev 1947)
+++ trunk/jbossws-tests/ant-…
[View More]import/build-interop-jars.xml 2007-01-12 16:47:53 UTC (rev 1948)
@@ -10,7 +10,7 @@
<project name="JBossWS">
- <description>JBossWS test archive builder</description>
+ <description>JBossWS test archive builder</description>
<!-- ================================================================== -->
<!-- Building -->
Modified: trunk/jbossws-tests/ant-import/build-interop.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-interop.xml 2007-01-12 16:39:05 UTC (rev 1947)
+++ trunk/jbossws-tests/ant-import/build-interop.xml 2007-01-12 16:47:53 UTC (rev 1948)
@@ -16,6 +16,11 @@
<property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/>
<property name="jbossws.client.jar" value="jbossws-client.jar"/>
+ <property name="test.java.dir" value="src/main/java"/>
+ <property name="test.resources.dir" value="src/main/resources"/>
+ <property name="build.tests.dir" value="output"/>
+ <property name="build.test.dir" value="output"/>
+
<path id="jwsdp.classpath">
<!--fileset dir="${jwsdp.home}/jaxrpc/lib"/>
<fileset dir="${jwsdp.home}/jwsdp-shared/lib">
@@ -306,7 +311,7 @@
<target name="interop.build" depends="interop.prepare, copy-resources, interop.compile"
description="Compiles and builds the interop clients and endpoints">
- <ant antfile="${test.dir}/ant/build-interop-jars.xml" target="build-interop-jars"/>
+ <ant antfile="ant-import/build-interop-jars.xml" target="build-interop-jars"/>
</target>
<target name="interop.compile" depends="interop.prepare, init" description="Compiles the interop clients and endpoints">
[View Less]
18 years
JBossWS SVN: r1947 - in trunk/jbossws-tests: ant-import and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-12 11:39:05 -0500 (Fri, 12 Jan 2007)
New Revision: 1947
Modified:
trunk/jbossws-tests/ant-import/build-interop.xml
trunk/jbossws-tests/build.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/…
[View More]AddressingTestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java
Log:
Fix interop build
Modified: trunk/jbossws-tests/ant-import/build-interop.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-interop.xml 2007-01-12 14:57:54 UTC (rev 1946)
+++ trunk/jbossws-tests/ant-import/build-interop.xml 2007-01-12 16:39:05 UTC (rev 1947)
@@ -8,7 +8,7 @@
<!-- $Id$ -->
-<project name="JBossWS-Interop" default="interop.build" basedir="../../../">
+<project name="JBossWS-Interop" default="interop.build" basedir="../">
<import file="../build.xml"/>
@@ -17,14 +17,14 @@
<property name="jbossws.client.jar" value="jbossws-client.jar"/>
<path id="jwsdp.classpath">
- <fileset dir="${jwsdp.home}/jaxrpc/lib"/>
+ <!--fileset dir="${jwsdp.home}/jaxrpc/lib"/>
<fileset dir="${jwsdp.home}/jwsdp-shared/lib">
<include name="activation.jar"/>
<include name="mail.jar"/>
<include name="jax-qname.jar"/>
</fileset>
<fileset dir="${jwsdp.home}/saaj/lib"/>
- <fileset dir="${jwsdp.home}/jaxp/lib"/>
+ <fileset dir="${jwsdp.home}/jaxp/lib"/-->
</path>
<path id="wscompile.tools.classpath">
@@ -37,14 +37,14 @@
<path refid="javac.classpath"/>
</path>
- <taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile">
+ <!--taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile">
<classpath refid="jwsdp.classpath"/>
</taskdef>
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="javac.classpath"/>
<classpath path="${build.test.dir}/classes"/>
- </taskdef>
+ </taskdef-->
<!--
BUILD MACROS
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-12 14:57:54 UTC (rev 1946)
+++ trunk/jbossws-tests/build.xml 2007-01-12 16:39:05 UTC (rev 1947)
@@ -207,7 +207,7 @@
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
+ <!--exclude name="org/jboss/test/ws/interop/**"/-->
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
<classpath refid="javac.classpath"/>
</javac>
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2007-01-12 14:57:54 UTC (rev 1946)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2007-01-12 16:39:05 UTC (rev 1947)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.ws.interop.microsoft;
-import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
import java.net.URL;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2007-01-12 14:57:54 UTC (rev 1946)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2007-01-12 16:39:05 UTC (rev 1947)
@@ -22,7 +22,7 @@
package org.jboss.test.ws.interop.microsoft;
import org.jboss.logging.Logger;
-import org.jboss.ws.utils.DOMUtils;
+import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Element;
import java.io.IOException;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java 2007-01-12 14:57:54 UTC (rev 1946)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java 2007-01-12 16:39:05 UTC (rev 1947)
@@ -25,9 +25,9 @@
import org.jboss.test.ws.interop.microsoft.ClientScenario;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.utils.DOMUtils;
-import org.jboss.ws.addressing.AddressingClientUtil;
-import org.jboss.ws.jaxrpc.StubExt;
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.core.jaxrpc.StubExt;
+import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.w3c.dom.Element;
import javax.xml.ws.addressing.*;
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2007-01-12 14:57:54 UTC (rev 1946)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2007-01-12 16:39:05 UTC (rev 1947)
@@ -5,9 +5,10 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.interop.microsoft.ClientScenario;
import org.jboss.test.ws.interop.microsoft.InteropConfigFactory;
-import org.jboss.ws.utils.DOMUtils;
-import org.jboss.ws.addressing.AddressingClientUtil;
-import org.jboss.ws.jaxrpc.StubExt;
+
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.core.jaxrpc.StubExt;
+import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.w3c.dom.Element;
import javax.naming.InitialContext;
[View Less]
18 years