January 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1896 - in branches/dlofthouse/JBWS-810: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-01-10 09:33:30 -0500 (Wed, 10 Jan 2007) New Revision: 1896 Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml Modified: branches/dlofthouse/JBWS-810/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-810 - WSDL to Java handling for simple types. Modified: branches/dlofthouse/JBWS-810/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-10 14:33:30 UTC (rev 1896) @@ -234,17 +234,20 @@ QName xmlType = win.getXMLType(); String partName = win.getPartName(); String wsdlMessageName = win.getMessageName().getLocalPart(); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); boolean wrapped = isWrapped(); if (wrapped) { - XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); wrapped = unwrapRequest(semm, wsdlMessageName, xmlName.getLocalPart(), xt); } if (wrapped == false) { + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, paramPosition, wsdlMessageName, "IN", partName, false, true); semm.addMethodParamPartsMapping(mpin); } @@ -331,6 +334,7 @@ if (win == null) throw new WSException("RPC endpoints require an input message"); String wsdlMessageName = win.getMessageName().getLocalPart(); + JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); RPCSignature signature = new RPCSignature(wiop); int i = 0; @@ -340,6 +344,10 @@ QName xmlName = new QName(partName); QName xmlType = part.getType(); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, i++, wsdlMessageName, getMode(wiop, part.getName()), partName, false, true); semm.addMethodParamPartsMapping(mpin); @@ -352,6 +360,10 @@ QName xmlName = new QName(partName); QName xmlType = returnParameter.getType(); + XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); + if (xt instanceof XSSimpleTypeDefinition) + xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); + WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,76 @@ +/* + * 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.jbws810; + +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; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 10 Jan 2007 + */ +public class JBWS810TestCase extends JBossWSTest +{ + + private static final String resourceDir = "resources/tools/jbws810"; + private static final String toolsDir = "tools/jbws810"; + + public void testDocument() throws Exception + { + runTest("document"); + } + + public void testRPC() throws Exception + { + runTest("rpc"); + } + + public void runTest(final String type) throws Exception + { + String testToolsDir = toolsDir + "/" + type; + String testResourceDir = resourceDir + "/" + type; + + String[] args = new String[] { "-dest", testToolsDir, "-config", testResourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + + compareSource(type, "PhoneBook_PortType.java"); + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(testResourceDir + "/jaxrpc-mapping.xml", testToolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String type, final String fileName) throws Exception + { + File expected = new File(resourceDir + "/" + type + "/" + fileName); + File generated = new File(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws810' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws810/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws810' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws810/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws810/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <simpleType name="Person"> + <restriction base="string"> + <maxLength value="20"/> + </restriction> + </simpleType> + + <simpleType name="TelephoneNumber"> + <restriction base="string"> + <maxLength value="20"/> + </restriction> + </simpleType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,11 @@ +// 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.jbws810; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,38 @@ +<?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.jbws810</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws810</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws810">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws810.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws810">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws810">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws810/document/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws810' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws810/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws810' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws810/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws810/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <simpleType name="Person"> + <restriction base="string"> + <maxLength value="20"/> + </restriction> + </simpleType> + + <simpleType name="TelephoneNumber"> + <restriction base="string"> + <maxLength value="20"/> + </restriction> + </simpleType> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part name='Person_1' type='ns1:Person'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://test.jboss.org/ws/jbws810' use='literal'/> + </input> + <output> + <soap:body namespace='http://test.jboss.org/ws/jbws810' use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,11 @@ +// 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.jbws810; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String person_1) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,38 @@ +<?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.jbws810</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws810</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws810.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws810">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws810.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws810">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws810">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_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.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws810">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml 2007-01-10 14:19:14 UTC (rev 1895) +++ branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml 2007-01-10 14:33:30 UTC (rev 1896) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws810/rpc/PhoneBook.wsdl" parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years

1
0
0 / 0

JBossWS SVN: r1895 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-01-10 09:19:14 -0500 (Wed, 10 Jan 2007) New Revision: 1895 Added: branches/dlofthouse/JBWS-810/ Log: JBWS-810 - Working branch. Copied: branches/dlofthouse/JBWS-810 (from rev 1894, trunk)

18 years

1
0
0 / 0

JBossWS SVN: r1894 - in trunk/jbossws-core/src/main/java/org/jboss/ws/core: jaxrpc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-10 09:16:55 -0500 (Wed, 10 Jan 2007) New Revision: 1894 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java Log: rollback Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-10 12:58:52 UTC (rev 1893) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-10 14:16:55 UTC (rev 1894) @@ -331,10 +331,9 @@ log.debug("Handler modified body payload, unbind message again"); SOAPMessage resMessage = msgContext.getSOAPMessage(); binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders); - - retObj = syncOutputParams(inputParams, epInv); } - + + retObj = syncOutputParams(inputParams, epInv); } return retObj; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-01-10 12:58:52 UTC (rev 1893) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-01-10 14:16:55 UTC (rev 1894) @@ -230,7 +230,7 @@ { Class targetType = targetTypes[param.getIndex()]; if (HolderUtils.isHolderType(targetType)) - HolderUtils.setHolderValue(methodParams[param.getIndex()], value); + value = HolderUtils.createHolderInstance(value, targetType); methodParams[param.getIndex()] = value; } }

18 years

1
0
0 / 0

JBossWS SVN: r1893 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-01-10 07:58:52 -0500 (Wed, 10 Jan 2007) New Revision: 1893 Removed: branches/dlofthouse/JBWS-1441/ Log: Branch no longer required.

18 years

1
0
0 / 0

JBossWS SVN: r1892 - 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-10 07:51:04 -0500 (Wed, 10 Jan 2007) New Revision: 1892 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/ trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java Log: JBWS-1441 - WSDL to Java, extension of complex types with empty base type. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-10 12:34:14 UTC (rev 1891) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-10 12:51:04 UTC (rev 1892) @@ -310,7 +310,18 @@ return; } - XSParticle xspar = (XSParticle)xparts.item(length - 1); + XSParticle xspar; + + if (baseType instanceof XSComplexTypeDefinition && ((XSComplexTypeDefinition)baseType).getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY) + { + // If the base type is empty there will not have been a particle to ignore. + xspar = xsparticle; + } + else + { + xspar = (XSParticle)xparts.item(length - 1); + } + XSTerm xsparTerm = xspar.getTerm(); if (xsparTerm instanceof XSModelGroup) { @@ -319,6 +330,7 @@ } else if (xsparTerm instanceof XSElementDeclaration) vars.addAll(createVARforXSElementDeclaration(xsparTerm, schemautils.isArrayType(xspar), schema, type)); + } } } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441 (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,65 +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.jbws1441; - -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; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 5 Jan 2007 - */ -public class JBWS1441TestCase extends JBossWSTest -{ - - private static final String resourceDir = "resources/tools/jbws1441"; - private static final String toolsDir = "tools/jbws1441"; - - public void testGenerate() throws Exception - { - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - - compareSource("AbstractType.java"); - compareSource("Person.java"); - compareSource("PhoneBook_PortType.java"); - compareSource("TelephoneNumber.java"); - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String fileName) throws Exception - { - File expected = new File(resourceDir + "/" + fileName); - File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java) Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441 (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,13 +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.jbws1441; - - -public class AbstractType { - - public AbstractType() { - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,36 +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.jbws1441; - - -public class Person extends org.jboss.test.ws.jbws1441.AbstractType { - protected java.lang.String firstName; - protected java.lang.String surname; - - public Person() { - } - - public Person(java.lang.String firstName, java.lang.String surname) { - this.firstName = firstName; - this.surname = surname; - } - - public java.lang.String getFirstName() { - return firstName; - } - - public void setFirstName(java.lang.String firstName) { - this.firstName = firstName; - } - - public java.lang.String getSurname() { - return surname; - } - - public void setSurname(java.lang.String surname) { - this.surname = surname; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1441' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1441/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1441' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1441/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1441/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='AbstractType'> - <sequence/> - </complexType> - - <complexType name='Person'> - <complexContent> - <extension base='tns:AbstractType'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name='TelephoneNumber'> - <complexContent> - <extension base='tns:AbstractType'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </extension> - </complexContent> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - - </schema> - </types> - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-10 12:51:04 UTC (rev 1892) @@ -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.jbws1441; - -public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1441.TelephoneNumber lookup(org.jboss.test.ws.jbws1441.Person parameters) throws - java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,36 +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.jbws1441; - - -public class TelephoneNumber extends org.jboss.test.ws.jbws1441.AbstractType { - protected java.lang.String areaCode; - protected java.lang.String number; - - public TelephoneNumber() { - } - - public TelephoneNumber(java.lang.String areaCode, java.lang.String number) { - this.areaCode = areaCode; - this.number = number; - } - - public java.lang.String getAreaCode() { - return areaCode; - } - - public void setAreaCode(java.lang.String areaCode) { - this.areaCode = areaCode; - } - - public java.lang.String getNumber() { - return number; - } - - public void setNumber(java.lang.String number) { - this.number = number; - } -} Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java) Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,68 +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.jbws1441</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1441</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1441.Person</java-type> - <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1441.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1441.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1441.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1441.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml) =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-10 12:51:04 UTC (rev 1892) @@ -0,0 +1,68 @@ +<?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.jbws1441</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1441</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1441</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1441/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1441.Person</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1441.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1441">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1441.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1441">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1441">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1441.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1441.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml 2007-01-10 12:51:04 UTC (rev 1892) @@ -1,5 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml (from rev 1820, branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml)

18 years

1
0
0 / 0

JBossWS SVN: r1891 - branches/tdiesler.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-10 07:34:14 -0500 (Wed, 10 Jan 2007) New Revision: 1891 Added: branches/tdiesler/trunk/ Log: recreate userbranch Copied: branches/tdiesler/trunk (from rev 1890, trunk)

18 years

1
0
0 / 0

JBossWS SVN: r1890 - branches/tdiesler.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-10 07:33:58 -0500 (Wed, 10 Jan 2007) New Revision: 1890 Removed: branches/tdiesler/trunk/ Log: recreate userbranch

18 years

1
0
0 / 0

JBossWS SVN: r1889 - in trunk: build/ant-import and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-01-10 07:07:49 -0500 (Wed, 10 Jan 2007) New Revision: 1889 Removed: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1427/ trunk/jbossws-tests/src/main/resources/tools/jbws1427/ Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/etc/jbossws-component-info.xml trunk/build/version.properties trunk/integration-tomcat/build.xml trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml trunk/jbossws-tests/build.xml Log: Fix test classpath issues - All pass Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/ant-import/build-release.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -210,7 +210,7 @@ <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> <include name="activation.jar"/> - <include name="mailapi.jar"/> + <include name="mail.jar"/> </fileset> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -57,7 +57,7 @@ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> @@ -71,61 +71,53 @@ <target name="thirdparty-classpath" > -  - <path id="jbossws.thirdparty.classpath"> - <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/concurrent.jar"/> +  + <path id="core.classpath"> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-container.jar"/> + <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> + <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> <pathelement location="${thirdparty.dir}/xalan.jar"/> </path> - -  - <path id="core.classpath"> - <path refid="jbossws.thirdparty.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> - <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/> - </path>  <path id="jboss50.integration.classpath"> - <path refid="core.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/jboss-deployers.jar"/> - <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <path refid="core.classpath"/> </path>  <path id="jboss42.integration.classpath"> - <path refid="core.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + <path refid="core.classpath"/> </path>  Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/etc/jbossws-component-info.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -25,6 +25,7 @@ </import> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb@"/> + <compatible version="snapshot"/> </import> <import componentref="jboss/microcontainer"> <compatible version="1.0.2"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/build/version.properties 2007-01-10 12:07:49 UTC (rev 1889) @@ -17,7 +17,7 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.4.GA -jboss-jbossxb=snapshot +jboss-jbossxb=1.0.0.CR8 jboss-microcontainer=snapshot jboss-remoting=2.0.0.GA sun-jaxb=2.0.3 @@ -28,9 +28,9 @@ apache-logging=1.0.5.GA-jboss apache-xalan=j_2.7.0 apache-xerces=2.7.1 -hibernate=3.2.0.CR2 +hibernate=3.2.1.GA jboss-backport-concurrent=2.1.0.GA -jboss-common-core=2.0.2.CR1 +jboss-common-core=2.0.4.Alpha jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 @@ -41,10 +41,10 @@ jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4 -qdox=1.4 +qdox=1.6 stax-api=1.0 -sun-jaf=1.0.2 -sun-javamail=1.3.1 +sun-jaf=1.1 +sun-javamail=1.4 sun-servlet=2.4 woodstox=2.0.6 wscommons-policy=1.0 Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/integration-tomcat/build.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -142,7 +142,7 @@ <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/> + <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mail.jar"/> <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/> <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> <copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -42,7 +42,7 @@ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> @@ -66,7 +66,7 @@ <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> @@ -83,7 +83,7 @@ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> - <pathelement location="${thirdparty.dir}/mailapi.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> </path> <path id="tests.classpath"> Modified: trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml =================================================================== --- trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/jbossws-docs/user-guide/project/en/modules/installation/install-tomcat.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -34,7 +34,7 @@ <listitem>jboss-jaxrpc.jar</listitem> <listitem>jboss-jaxws.jar</listitem> <listitem>jboss-saaj.jar</listitem> - <listitem>mailapi.jar</listitem> + <listitem>mail.jar</listitem> </itemizedlist> </para> </listitem> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-10 11:33:49 UTC (rev 1888) +++ trunk/jbossws-tests/build.xml 2007-01-10 12:07:49 UTC (rev 1889) @@ -104,13 +104,6 @@ <target name="prepare"> - <echo message="-----------------------------------------------"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="endorsed.dirs = ${endorsed.dirs}"/> - <echo message="-----------------------------------------------"/> - <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/> <available property="installer.setup" file="jboss-ejb3-client.jar"/> @@ -121,13 +114,6 @@ <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - </target> - -  - <target name="init" depends="prepare,thirdparty"> -  <condition property="jbossws.build" value="jbossws14"> <not> @@ -146,22 +132,33 @@ </condition> <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> <property name="tests.excludefile" value="${tests.resources.dir}/${excludes-short-name}"/> + + <echo/> + <echo message="-----------------------------------------------"/> + <echo message="jboss.home = ${jboss.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="java.home = ${java.home}"/> + <echo message="endorsed = ${endorsed.dirs}"/> <echo message="excludefile = ${excludes-short-name}"/> + <echo message="-----------------------------------------------"/> -  - <path id="jbossws.client.classpath"> - <path refid="jbossws.thirdparty.classpath"/> + </target> + +  + <target name="init" depends="prepare,thirdparty,init-jboss50-classpath"> + </target> + + <target name="init-jboss50-classpath" depends="prepare"> + +  + <path id="javac.classpath"> + <path refid="core.classpath"/> <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - </path> - -  - <path id="javac.classpath"> - <path refid="jbossws.client.classpath"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> @@ -172,13 +169,14 @@  <path id="test.client.classpath"> - <path refid="jbossws.client.classpath"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/>  - <pathelement location="${basedir}/../integration-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}-integration.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.jar"/> + <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-jboss50-integration.jar"/> + <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-jboss42-integration.jar"/> <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> <path refid="javac.classpath"/> </path> @@ -259,7 +257,9 @@ --> <target name="generate-sources" depends="compile" description="Generate the deployment resources."> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="jbossws.client.classpath"/> + <classpath refid="core.classpath"/> + <classpath location="${core.output.lib.dir}/jbossws-client.jar"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef>

18 years

1
0
0 / 0

JBossWS SVN: r1888 - trunk/build.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-10 06:33:49 -0500 (Wed, 10 Jan 2007) New Revision: 1888 Modified: trunk/build/build.xml Log: Test Hudson integration, ignore Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-10 10:44:34 UTC (rev 1887) +++ trunk/build/build.xml 2007-01-10 11:33:49 UTC (rev 1888) @@ -24,8 +24,7 @@ <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/../jbossws-tests/build.xml"/> - <target name="init" depends="prepare, thirdparty"> - </target> + <target name="init" depends="prepare, thirdparty"/>   @@ -62,4 +61,4 @@ <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> </target> -</project> \ No newline at end of file +</project>

18 years

1
0
0 / 0

JBossWS SVN: r1887 - in trunk/jbossws-core/src/main/java/org/jboss/ws: core/jaxrpc and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-01-10 05:44:34 -0500 (Wed, 10 Jan 2007) New Revision: 1887 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/WebServiceRefDeployer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java Log: Fix JBCTS-454 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -331,9 +331,10 @@ log.debug("Handler modified body payload, unbind message again"); SOAPMessage resMessage = msgContext.getSOAPMessage(); binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders); + + retObj = syncOutputParams(inputParams, epInv); } - retObj = syncOutputParams(inputParams, epInv); } return retObj; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -304,7 +304,7 @@ if (opMetaData.isRPCEncoded()) XOPContext.setMTOMEnabled(false); else - XOPContext.setMTOMEnabled( isMTOMEnabled() ); // TODO: shouldn't this depend on the request encoding? + XOPContext.setMTOMEnabled( isMTOMEnabled() ); // Associate current message with message context SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -337,7 +337,7 @@ { try { - if (param.getIndex() >= 0) + if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex()) ) outParameters.put(param.getIndex(), targetParameterTypes[param.getIndex()].newInstance()); } catch (Exception e) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -230,7 +230,7 @@ { Class targetType = targetTypes[param.getIndex()]; if (HolderUtils.isHolderType(targetType)) - value = HolderUtils.createHolderInstance(value, targetType); + HolderUtils.setHolderValue(methodParams[param.getIndex()], value); methodParams[param.getIndex()] = value; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/WebServiceRefDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/WebServiceRefDeployer.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/WebServiceRefDeployer.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -80,6 +80,6 @@ if (sref.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) sref.setWsdlLocation(wsref.wsdlLocation()); - Util.bind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, sref)); + Util.rebind(ctx, jndiName, new ServiceReferenceable(serviceTypeName, portTypeName, sref)); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -175,7 +175,7 @@ // Set the outbound property if (epMetaData.getType() == EndpointMetaData.Type.JAXWS) - msgContext.setProperty(MessageContext.MESSAGE_OUTBOUND_PROPERTY, new Boolean(true)); + msgContext.setProperty(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); if(binding instanceof CommonSOAPBinding) XOPContext.setMTOMEnabled( ((CommonSOAPBinding)binding).isMTOMEnabled()); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2007-01-10 10:19:51 UTC (rev 1886) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2007-01-10 10:44:34 UTC (rev 1887) @@ -30,16 +30,23 @@ super(); } - public String addMtomAttachment(DataHandler dataHandler, String string, String string1) + /** + * @param data - represents the data to be attached. Must be non-null. + * @param elementNamespace - the namespace URI of the element that encloses the base64Binary data. Can be empty but never null. + * @param elementLocalName - The local name of the element. Always a non-null valid string. + * + * @return content-id URI, cid, to the attachment containing data or null if data should be inlined. + */ + public String addMtomAttachment(DataHandler data, String elementNamespace, String elementLocalName) { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); - QName xmlName = new QName(string, string1); + QName xmlName = new QName(elementNamespace, elementLocalName); log.debug("serialize: [xmlName=" + xmlName + "]"); String cid = soapMessage.getCidGenerator().generateFromName(xmlName.getLocalPart()); - AttachmentPart xopPart = soapMessage.createAttachmentPart(dataHandler); + AttachmentPart xopPart = soapMessage.createAttachmentPart(data); xopPart.addMimeHeader(MimeConstants.CONTENT_ID, '<' + cid + '>'); // RFC2392 requirement soapMessage.addAttachmentPart(xopPart); @@ -48,9 +55,26 @@ return "cid:" + cid; } - public String addMtomAttachment(byte[] bytes, int i, int i1, String string, String string1, String string2) + /** + * @param data - represents the data to be attached. Must be non-null. The actual data region is specified by (data,offset,length) tuple. + * @param offset - The offset within the array of the first byte to be read; must be non-negative and no larger than array.length + * @param length - The number of bytes to be read from the given array; must be non-negative and no larger than array.length + * @param mimeType - If the data has an associated MIME type known to JAXB, that is passed as this parameter. If none is known, "application/octet-stream". This parameter may never be null. + * @param elementNamespace - the namespace URI of the element that encloses the base64Binary data. Can be empty but never null. + * @param elementLocalName - The local name of the element. Always a non-null valid string. + * + * @return content-id URI, cid, to the attachment containing data or null if data should be inlined. + */ + public String addMtomAttachment(byte[] data, int offset, int length, + String mimeType, String elementNamespace, String elementLocalName) { - throw new WSException("Not yet implemented"); + + if(true) + mimeType = null; // ignore the mime type. otherwise the content handlers will fail + + String contentType = mimeType != null ? mimeType : "application/octet-stream"; + DataHandler dh = new DataHandler(data, contentType); + return addMtomAttachment(dh, elementNamespace, elementLocalName); } public String addSwaRefAttachment(DataHandler dataHandler)

18 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2007