Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 10:03:28 -0500 (Mon, 15 Jan 2007)
New Revision: 1968
Added:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
Log:
JBWS-1454 - WSDL to Java - maps required xsd:double attribute to java.lang.Double.
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 14:49:30
UTC (rev 1967)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 15:03:28
UTC (rev 1968)
@@ -30,7 +30,11 @@
WSDL To Java - Parameter unwrapping not handling nillable types correctly.
-
http://jira.jboss.com/jira/browse/JBWS-1450
+
http://jira.jboss.com/jira/browse/JBWS-1450
+
+ WSDL to Java - maps required xsd:double attribute to java.lang.Double
+
+
http://jira.jboss.com/jira/browse/JBWS-1184
MANUAL INSTALL INSTRUCTIONS:
If you require the Java 1.4 version: -
1.) Copy lib/jbossws14-client.jar to $JBOSS_HOME/client/
Modified:
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
---
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-15
14:49:30 UTC (rev 1967)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-15
15:03:28 UTC (rev 1968)
@@ -410,7 +410,8 @@
XSAttributeDeclaration att = obj.getAttrDeclaration();
XSSimpleTypeDefinition xstype = att.getTypeDefinition();
QName qn = SchemaUtils.handleSimpleType(xstype);
- VAR v = createVAR(qn, att.getName(), pkgname);
+ boolean primitive = obj.getRequired();
+ VAR v = createVAR(qn, att.getName(), pkgname, primitive);
if (vars == null)
vars = new ArrayList();
vars.add(v);
@@ -471,7 +472,7 @@
return vars;
}
- private VAR createVAR(QName qn, String varstr, String pkgname)
+ private VAR createVAR(QName qn, String varstr, String pkgname, boolean primitive)
{
String clname = "";
Class cls = typeMapping.getJavaType(qn);
@@ -479,6 +480,13 @@
if (cls != null)
{
clname = cls.getName();
+ if (primitive)
+ {
+ String primName = utils.getPrimitive(clname);
+ if (primName != null)
+ clname = primName;
+ }
+
}
else
{
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184
(from rev 1957, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
---
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,100 +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.jbws1184;
-
-import java.io.File;
-
-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;
-
-/**
- * JBWS-1184 - Test the use of wrapper jave type for generated source
- * with attributes with use of required or optional.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13 Jan 2007
- */
-public class JBWS1184TestCase extends JBossWSTest
-{
-
- /**
- * Test attributes with use set to required.
- *
- * <complexType name='DataObject'>
- * <attribute name='booleanValue' use='required'
type='boolean'/>
- * <attribute name='byteValue' use='required'
type='byte'/>
- * <attribute name='floatValue' use='required'
type='float'/>
- * <attribute name='integerValue' use='required'
type='int'/>
- * <attribute name='longValue' use='required'
type='long'/>
- * <attribute name='shortValue' use='required'
type='short'/>
- * </complexType>
- *
- */
- public void testUseRequired() throws Exception
- {
- generateScenario("A");
- }
-
- /**
- * Test attributes with use set to optional.
- *
- * <complexType name='DataObject'>
- * <attribute name='booleanValue' use='optional'
type='boolean'/>
- * <attribute name='byteValue' use='optional'
type='byte'/>
- * <attribute name='floatValue' use='optional'
type='float'/>
- * <attribute name='integerValue' use='optional'
type='int'/>
- * <attribute name='longValue' use='optional'
type='long'/>
- * <attribute name='shortValue' use='optional'
type='short'/>
- * </complexType>
- *
- */
- public void testUseOptional() throws Exception
- {
- generateScenario("B");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws1184/scenario_" + scenario;
- String toolsDir = "tools/jbws1184/scenario_" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config",
resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- compareSource(resourceDir + "/DataObject.java", toolsDir +
"/org/jboss/test/ws/jbws1184/DataObject.java");
- compareSource(resourceDir + "/TestEndpoint_PortType.java", toolsDir +
"/org/jboss/test/ws/jbws1184/TestEndpoint_PortType.java");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir +
"/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String
generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
(from rev 1957,
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184 (from rev
1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A
(from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,76 +0,0 @@
-// 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.jbws1184;
-
-
-public class DataObject {
- protected boolean booleanValue;
- protected byte byteValue;
- protected float floatValue;
- protected int integerValue;
- protected long longValue;
- protected short shortValue;
-
- public DataObject() {
- }
-
- public DataObject(boolean booleanValue, byte byteValue, float floatValue, int
integerValue, long longValue, short shortValue) {
- this.booleanValue = booleanValue;
- this.byteValue = byteValue;
- this.floatValue = floatValue;
- this.integerValue = integerValue;
- this.longValue = longValue;
- this.shortValue = shortValue;
- }
-
- public boolean isBooleanValue() {
- return booleanValue;
- }
-
- public void setBooleanValue(boolean booleanValue) {
- this.booleanValue = booleanValue;
- }
-
- public byte getByteValue() {
- return byteValue;
- }
-
- public void setByteValue(byte byteValue) {
- this.byteValue = byteValue;
- }
-
- public float getFloatValue() {
- return floatValue;
- }
-
- public void setFloatValue(float floatValue) {
- this.floatValue = floatValue;
- }
-
- public int getIntegerValue() {
- return integerValue;
- }
-
- public void setIntegerValue(int integerValue) {
- this.integerValue = integerValue;
- }
-
- public long getLongValue() {
- return longValue;
- }
-
- public void setLongValue(long longValue) {
- this.longValue = longValue;
- }
-
- public short getShortValue() {
- return shortValue;
- }
-
- public void setShortValue(short shortValue) {
- this.shortValue = shortValue;
- }
-}
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/DataObject.java
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint'
targetNamespace='http://test.jboss.org/ws/jbws1184'
xmlns='http://schemas.xmlsoap.org/wsdl/'
xmlns:ns1='http://test.jboss.org/ws/jbws1184/types'
xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
xmlns:tns='http://test.jboss.org/ws/jbws1184'
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema
targetNamespace='http://test.jboss.org/ws/jbws1184/types'
xmlns='http://www.w3.org/2001/XMLSchema'
xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
xmlns:tns='http://test.jboss.org/ws/jbws1184/types'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='DataObject'>
- <attribute name='booleanValue' use='required'
type='boolean'/>
- <attribute name='byteValue' use='required'
type='byte'/>
- <attribute name='floatValue' use='required'
type='float'/>
- <attribute name='integerValue' use='required'
type='int'/>
- <attribute name='longValue' use='required'
type='long'/>
- <attribute name='shortValue' use='required'
type='short'/>
- </complexType>
- <element name='echoDataObject' type='tns:DataObject'/>
- <element name='echoDataObjectResponse' type='tns:DataObject'/>
- </schema>
- </types>
- <message name='TestEndpoint_echoDataObject'>
- <part element='ns1:echoDataObject' name='echoDataObject'/>
- </message>
- <message name='TestEndpoint_echoDataObjectResponse'>
- <part element='ns1:echoDataObjectResponse'
name='echoDataObjectResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoDataObject'
parameterOrder='echoDataObject'>
- <input message='tns:TestEndpoint_echoDataObject'/>
- <output message='tns:TestEndpoint_echoDataObjectResponse'/>
- </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>
- </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
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,11 +0,0 @@
-// 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.jbws1184;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public org.jboss.test.ws.jbws1184.DataObject
echoDataObject(org.jboss.test.ws.jbws1184.DataObject echoDataObject) throws
- java.rmi.RemoteException;
-}
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,71 +0,0 @@
-<?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.jbws1184</package-type>
- <
namespaceURI>http://test.jboss.org/ws/jbws1184</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1184</package-type>
- <
namespaceURI>http://test.jboss.org/ws/jbws1184/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1184.DataObject</java-type>
- <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1184/types">typeN...
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>booleanValue</java-variable-name>
- <xml-attribute-name>booleanValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>byteValue</java-variable-name>
- <xml-attribute-name>byteValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>floatValue</java-variable-name>
- <xml-attribute-name>floatValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>integerValue</java-variable-name>
- <xml-attribute-name>integerValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>longValue</java-variable-name>
- <xml-attribute-name>longValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>shortValue</java-variable-name>
- <xml-attribute-name>shortValue</xml-attribute-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-
<service-interface>org.jboss.test.ws.jbws1184.TestEndpoint_Service</service-interface>
- <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1184">serviceN...
- <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.jbws1184.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1184">portTyp...
- <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1184">bindingN...
- <service-endpoint-method-mapping>
- <java-method-name>echoDataObject</java-method-name>
- <wsdl-operation>echoDataObject</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1184.DataObject</param-type>
- <wsdl-message-mapping>
- <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgN...
- <wsdl-message-part-name>echoDataObject</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.jbws1184.DataObject</method-return-value>
- <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgN...
-
<wsdl-message-part-name>echoDataObjectResponse</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java
location="resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl"
parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_A/wstools-config.xml
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B
(from rev 1957, trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,76 +0,0 @@
-// 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.jbws1184;
-
-
-public class DataObject {
- protected java.lang.Boolean booleanValue;
- protected java.lang.Byte byteValue;
- protected java.lang.Float floatValue;
- protected java.lang.Integer integerValue;
- protected java.lang.Long longValue;
- protected java.lang.Short shortValue;
-
- public DataObject() {
- }
-
- public DataObject(java.lang.Boolean booleanValue, java.lang.Byte byteValue,
java.lang.Float floatValue, java.lang.Integer integerValue, java.lang.Long longValue,
java.lang.Short shortValue) {
- this.booleanValue = booleanValue;
- this.byteValue = byteValue;
- this.floatValue = floatValue;
- this.integerValue = integerValue;
- this.longValue = longValue;
- this.shortValue = shortValue;
- }
-
- public java.lang.Boolean getBooleanValue() {
- return booleanValue;
- }
-
- public void setBooleanValue(java.lang.Boolean booleanValue) {
- this.booleanValue = booleanValue;
- }
-
- public java.lang.Byte getByteValue() {
- return byteValue;
- }
-
- public void setByteValue(java.lang.Byte byteValue) {
- this.byteValue = byteValue;
- }
-
- public java.lang.Float getFloatValue() {
- return floatValue;
- }
-
- public void setFloatValue(java.lang.Float floatValue) {
- this.floatValue = floatValue;
- }
-
- public java.lang.Integer getIntegerValue() {
- return integerValue;
- }
-
- public void setIntegerValue(java.lang.Integer integerValue) {
- this.integerValue = integerValue;
- }
-
- public java.lang.Long getLongValue() {
- return longValue;
- }
-
- public void setLongValue(java.lang.Long longValue) {
- this.longValue = longValue;
- }
-
- public java.lang.Short getShortValue() {
- return shortValue;
- }
-
- public void setShortValue(java.lang.Short shortValue) {
- this.shortValue = shortValue;
- }
-}
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/DataObject.java
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestEndpoint'
targetNamespace='http://test.jboss.org/ws/jbws1184'
xmlns='http://schemas.xmlsoap.org/wsdl/'
xmlns:ns1='http://test.jboss.org/ws/jbws1184/types'
xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
xmlns:tns='http://test.jboss.org/ws/jbws1184'
xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema
targetNamespace='http://test.jboss.org/ws/jbws1184/types'
xmlns='http://www.w3.org/2001/XMLSchema'
xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
xmlns:tns='http://test.jboss.org/ws/jbws1184/types'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='DataObject'>
- <attribute name='booleanValue' use='optional'
type='boolean'/>
- <attribute name='byteValue' use='optional'
type='byte'/>
- <attribute name='floatValue' use='optional'
type='float'/>
- <attribute name='integerValue' use='optional'
type='int'/>
- <attribute name='longValue' use='optional'
type='long'/>
- <attribute name='shortValue' use='optional'
type='short'/>
- </complexType>
- <element name='echoDataObject' type='tns:DataObject'/>
- <element name='echoDataObjectResponse' type='tns:DataObject'/>
- </schema>
- </types>
- <message name='TestEndpoint_echoDataObject'>
- <part element='ns1:echoDataObject' name='echoDataObject'/>
- </message>
- <message name='TestEndpoint_echoDataObjectResponse'>
- <part element='ns1:echoDataObjectResponse'
name='echoDataObjectResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echoDataObject'
parameterOrder='echoDataObject'>
- <input message='tns:TestEndpoint_echoDataObject'/>
- <output message='tns:TestEndpoint_echoDataObjectResponse'/>
- </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>
- </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
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,11 +0,0 @@
-// 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.jbws1184;
-
-public interface TestEndpoint_PortType extends java.rmi.Remote {
- public org.jboss.test.ws.jbws1184.DataObject
echoDataObject(org.jboss.test.ws.jbws1184.DataObject echoDataObject) throws
- java.rmi.RemoteException;
-}
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,71 +0,0 @@
-<?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.jbws1184</package-type>
- <
namespaceURI>http://test.jboss.org/ws/jbws1184</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1184</package-type>
- <
namespaceURI>http://test.jboss.org/ws/jbws1184/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1184.DataObject</java-type>
- <root-type-qname
xmlns:typeNS="http://test.jboss.org/ws/jbws1184/types">typeN...
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>booleanValue</java-variable-name>
- <xml-attribute-name>booleanValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>byteValue</java-variable-name>
- <xml-attribute-name>byteValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>floatValue</java-variable-name>
- <xml-attribute-name>floatValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>integerValue</java-variable-name>
- <xml-attribute-name>integerValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>longValue</java-variable-name>
- <xml-attribute-name>longValue</xml-attribute-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>shortValue</java-variable-name>
- <xml-attribute-name>shortValue</xml-attribute-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
-
<service-interface>org.jboss.test.ws.jbws1184.TestEndpoint_Service</service-interface>
- <wsdl-service-name
xmlns:serviceNS="http://test.jboss.org/ws/jbws1184">serviceN...
- <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.jbws1184.TestEndpoint_PortType</service-endpoint-interface>
- <wsdl-port-type
xmlns:portTypeNS="http://test.jboss.org/ws/jbws1184">portTyp...
- <wsdl-binding
xmlns:bindingNS="http://test.jboss.org/ws/jbws1184">bindingN...
- <service-endpoint-method-mapping>
- <java-method-name>echoDataObject</java-method-name>
- <wsdl-operation>echoDataObject</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1184.DataObject</param-type>
- <wsdl-message-mapping>
- <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgN...
- <wsdl-message-part-name>echoDataObject</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.jbws1184.DataObject</method-return-value>
- <wsdl-message
xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgN...
-
<wsdl-message-part-name>echoDataObjectResponse</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml)
Deleted:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
===================================================================
---
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-01-13
18:07:01 UTC (rev 1957)
+++
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-01-15
15:03:28 UTC (rev 1968)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java
location="resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl"
parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1184/scenario_B/wstools-config.xml
(from rev 1957,
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml)