JBossWS SVN: r2499 - in trunk/jbossws-tests/src/main: java/org/jboss/test/ws/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2007-03-02 06:16:52 -0500 (Fri, 02 Mar 2007)
New Revision: 2499
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1553/
trunk/jbossws-tests/src/main/resources/tools/jbws1553/
Removed:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java
Log:
JBWS-1553 moving test case from jaxrpc to tools
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1553 (from rev 2498, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553)
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/JBWS1553TestCase.java 2007-03-02 11:02:35 UTC (rev 2498)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1553/JBWS1553TestCase.java 2007-03-02 11:16:52 UTC (rev 2499)
@@ -19,7 +19,7 @@
* 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.jaxrpc.jbws1553;
+package org.jboss.test.ws.tools.jbws1553;
import java.io.File;
import java.net.URL;
@@ -46,7 +46,7 @@
protected void setUp() throws Exception
{
- URL wsdlLocation = new File("resources/jaxrpc/jbws1553/atm-service.wsdl").toURL();
+ URL wsdlLocation = new File("resources/tools/jbws1553/atm-service.wsdl").toURL();
definitions = definitionsFactory.parse(wsdlLocation);
}
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1553 (from rev 2498, trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2498 - in trunk/jbossws-tests/src/main: java/org/jboss/test/ws/jaxrpc/jbws1553 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2007-03-02 06:02:35 -0500 (Fri, 02 Mar 2007)
New Revision: 2498
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/JBWS1553TestCase.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-binding-1.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-service.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/account.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/frontend.wsdl
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/ticket.wsdl
Log:
JBWS-1553 handling of transitive wsdl imports
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/JBWS1553TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/JBWS1553TestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/JBWS1553TestCase.java 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1553;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.ws.metadata.wsdl.NCName;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
+import org.jboss.ws.metadata.wsdl.WSDLInterface;
+import org.jboss.ws.metadata.wsdl.WSDLService;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:alex.guizar@jboss.com">Alejandro Guizar</a>
+ * @version $Revision$
+ */
+public class JBWS1553TestCase extends TestCase
+{
+ private WSDLDefinitions definitions;
+ private static WSDLDefinitionsFactory definitionsFactory = WSDLDefinitionsFactory.newInstance();
+
+ protected void setUp() throws Exception
+ {
+ URL wsdlLocation = new File("resources/jaxrpc/jbws1553/atm-service.wsdl").toURL();
+ definitions = definitionsFactory.parse(wsdlLocation);
+ }
+
+ public void testPortType()
+ {
+ WSDLService atmService = definitions.getService(new NCName("AtmFrontEndService"));
+ WSDLEndpoint endpoint = atmService.getEndpoint(new QName("urn:samples:atm", "FrontEndPort"));
+ WSDLInterface _interface = endpoint.getInterface();
+ assertEquals(new QName("urn:samples:frontend", "FrontEnd"), _interface.getQName());
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1553/JBWS1553TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-binding-1.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-binding-1.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-binding-1.wsdl 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace="urn:samples:frontend"
+ xmlns:tns="urn:samples:frontend"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+ <import namespace="urn:samples:frontend" location="interface/frontend.wsdl" />
+
+ <binding name="FrontEndBinding" type="tns:FrontEnd">
+
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
+
+ <operation name="connect">
+ <soap:operation soapAction="urn:samples:frontend:connect" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </output>
+ </operation>
+
+ <operation name="disconnect">
+ <soap:operation soapAction="urn:samples:frontend:disconnect" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ </operation>
+
+ <operation name="status">
+ <soap:operation soapAction="urn:samples:frontend:status" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </output>
+ </operation>
+
+ <operation name="logOn">
+ <soap:operation soapAction="urn:samples:frontend:logOn" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </output>
+ <fault name="unauthorizedAccess">
+ <soap:fault name="unauthorizedAccess" use="literal" />
+ </fault>
+ </operation>
+
+ <operation name="logOff">
+ <soap:operation soapAction="urn:samples:frontend:logOff" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ </operation>
+
+ <operation name="getBalance">
+ <soap:operation soapAction="urn:samples:frontend:getBalance" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </output>
+ </operation>
+
+ <operation name="deposit">
+ <soap:operation soapAction="urn:samples:frontend:deposit" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </output>
+ </operation>
+
+ <operation name="withdraw">
+ <soap:operation soapAction="urn:samples:frontend:withdraw" />
+ <input>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="urn:samples:frontend" />
+ </output>
+ <fault name="insufficientFunds">
+ <soap:fault name="insufficientFunds" use="literal" />
+ </fault>
+ </operation>
+
+ </binding>
+
+</definitions>
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-binding-1.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-service.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-service.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-service.wsdl 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace="urn:samples:atm" xmlns:tns="urn:samples:atm"
+ xmlns:front="urn:samples:frontend"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+ <import namespace="urn:samples:frontend" location="atm-binding-1.wsdl" />
+
+ <service name="AtmFrontEndService">
+ <port name="FrontEndPort" binding="front:FrontEndBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URI" />
+ </port>
+ </service>
+
+</definitions>
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm-service.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm.wsdl 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace="urn:samples:atm"
+ xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:samples:atm"
+ xmlns:front="urn:samples:frontend" xmlns:tic="urn:samples:ticket"
+ xmlns:acc="urn:samples:account"
+ xmlns:bpel="http://schemas.xmlsoap.org/ws/2003/03/business-process/"
+ xmlns:plt="http://schemas.xmlsoap.org/ws/2003/05/partner-link/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <import namespace="urn:samples:frontend" location="interface/frontend.wsdl" />
+ <import namespace="urn:samples:ticket" location="interface/ticket.wsdl" />
+ <import namespace="urn:samples:account" location="interface/account.wsdl" />
+
+ <!-- customer name property -->
+ <bpel:property name="customerId" type="xsd:string" />
+
+ <!-- location of costumerId inside messages -->
+ <bpel:propertyAlias propertyName="tns:customerId"
+ messageType="front:logOnRequest" part="customerName" />
+ <bpel:propertyAlias propertyName="tns:customerId"
+ messageType="front:balanceChange" part="customerName" />
+ <bpel:propertyAlias propertyName="tns:customerId"
+ messageType="acc:customerMessage" part="customerName" />
+ <bpel:propertyAlias propertyName="tns:customerId"
+ messageType="acc:accountOperation" part="body" query="/body/customerName" />
+
+ <!-- ticket number property -->
+ <bpel:property name="ticketId" type="xsd:int" />
+
+ <!-- location of ticketId inside messages -->
+ <bpel:propertyAlias propertyName="tns:ticketId"
+ messageType="tic:ticketMessage" part="ticketNo" />
+ <bpel:propertyAlias propertyName="tns:ticketId"
+ messageType="front:logOnRequest" part="ticketNo" />
+
+ <!-- relationship between the ATM and the process -->
+ <plt:partnerLinkType name="Atm-Front">
+ <plt:role name="FrontEnd">
+ <plt:portType name="front:FrontEnd" />
+ </plt:role>
+ </plt:partnerLinkType>
+
+ <!-- relationship between the process and the ticket issuer -->
+ <plt:partnerLinkType name="Front-Ticket">
+ <plt:role name="TicketIssuer">
+ <plt:portType name="tic:TicketIssuer" />
+ </plt:role>
+ </plt:partnerLinkType>
+
+ <!-- relationship between the process and the account system -->
+ <plt:partnerLinkType name="Front-Account">
+ <plt:role name="AccountSystem">
+ <plt:portType name="acc:AccountSystem" />
+ </plt:role>
+ </plt:partnerLinkType>
+
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/atm.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/account.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/account.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/account.wsdl 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace="urn:samples:account"
+ xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:samples:account"
+ xmlns:typ="urn:samples:account" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/
+ http://schemas.xmlsoap.org/wsdl/">
+
+ <types>
+
+ <schema targetNamespace="urn:samples:account"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+
+ <!-- account data transfer type -->
+ <complexType name="AccountOperation">
+ <sequence>
+ <element name="customerName" type="xsd:string" />
+ <element name="amount" type="xsd:double" />
+ </sequence>
+ </complexType>
+
+ </schema>
+
+ </types>
+
+ <!-- customer name wrapper -->
+ <message name="customerMessage">
+ <part name="customerName" type="xsd:string" />
+ </message>
+
+ <!-- access check response -->
+ <message name="accessMessage">
+ <part name="granted" type="xsd:boolean" />
+ </message>
+
+ <!-- account balance wrapper -->
+ <message name="balanceMessage">
+ <part name="balance" type="xsd:double" />
+ </message>
+
+ <!-- account operation request -->
+ <message name="accountOperation">
+ <part name="body" type="typ:AccountOperation" />
+ </message>
+
+ <!-- published account functions -->
+ <portType name="AccountSystem">
+
+ <!-- tell whether a customer has an active account -->
+ <operation name="checkAccess">
+ <input message="tns:customerMessage" />
+ <output message="tns:accessMessage" />
+ </operation>
+
+ <!-- retrieve the balance of an account -->
+ <operation name="queryBalance">
+ <input message="tns:customerMessage" />
+ <output message="tns:balanceMessage" />
+ </operation>
+
+ <!-- increase/decrease the balance of an account -->
+ <operation name="updateBalance">
+ <input message="tns:accountOperation" />
+ <output message="tns:balanceMessage" />
+ </operation>
+
+ </portType>
+
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/account.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/frontend.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/frontend.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/frontend.wsdl 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace="urn:samples:frontend"
+ xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:samples:frontend"
+ xmlns:typ="urn:samples:frontend" xmlns:tic="urn:samples:ticket"
+ xmlns:acc="urn:samples:account" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/
+ http://schemas.xmlsoap.org/wsdl/">
+
+ <import namespace="urn:samples:ticket" location="ticket.wsdl" />
+ <import namespace="urn:samples:account" location="account.wsdl" />
+
+ <types>
+
+ <schema targetNamespace="urn:samples:frontend"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+
+ <complexType name="UnauthorizedAccess">
+ <sequence>
+ <element name="customerName" type="xsd:string" />
+ </sequence>
+ </complexType>
+
+ <element name="unauthorizedAccess" type="typ:UnauthorizedAccess" />
+
+ <complexType name="InsufficientFunds">
+ <sequence>
+ <element name="customerName" type="xsd:string" />
+ <element name="amount" type="xsd:double" />
+ </sequence>
+ </complexType>
+
+ <element name="insufficientFunds" type="typ:InsufficientFunds" />
+
+ </schema>
+
+ </types>
+
+ <message name="connectRequest" />
+
+ <message name="logOnRequest">
+ <part name="ticketNo" type="xsd:int" />
+ <part name="customerName" type="xsd:string" />
+ </message>
+
+ <message name="logOnResponse" />
+
+ <message name="statusResponse">
+ <part name="status" type="xsd:string" />
+ </message>
+
+ <message name="balanceChange">
+ <part name="customerName" type="xsd:string" />
+ <part name="amount" type="xsd:double" />
+ </message>
+
+ <message name="unauthorizedAccess">
+ <part name="detail" element="typ:unauthorizedAccess" />
+ </message>
+
+ <message name="insufficientFunds">
+ <part name="detail" element="typ:insufficientFunds" />
+ </message>
+
+ <message name="mymessage">
+ <part name="body" type="xsd:string" />
+ </message>
+
+ <!-- bank functions available to ATMs -->
+ <portType name="FrontEnd">
+
+ <!-- initiate bank connection -->
+ <operation name="connect">
+ <input message="tns:connectRequest" />
+ <output message="tic:ticketMessage" />
+ </operation>
+
+ <!-- terminate bank connection -->
+ <operation name="disconnect">
+ <input message="tic:ticketMessage" />
+ </operation>
+
+ <!-- retrieve bank connection status -->
+ <operation name="status">
+ <input message="tic:ticketMessage" />
+ <output message="tns:statusResponse" />
+ </operation>
+
+ <!-- initiate customer session -->
+ <operation name="logOn">
+ <input message="tns:logOnRequest" />
+ <output message="tns:logOnResponse" />
+ <fault name="unauthorizedAccess" message="tns:unauthorizedAccess" />
+ </operation>
+
+ <!-- terminate customer session -->
+ <operation name="logOff">
+ <input message="acc:customerMessage" />
+ </operation>
+
+ <!-- retrieve account balance -->
+ <operation name="getBalance">
+ <input message="acc:customerMessage" />
+ <output message="acc:balanceMessage" />
+ </operation>
+
+ <!-- increase account balance -->
+ <operation name="deposit">
+ <input message="tns:balanceChange" />
+ <output message="acc:balanceMessage" />
+ </operation>
+
+ <!-- decrease account balance -->
+ <operation name="withdraw">
+ <input message="tns:balanceChange" />
+ <output message="acc:balanceMessage" />
+ <fault name="insufficientFunds" message="tns:insufficientFunds" />
+ </operation>
+
+ </portType>
+
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/frontend.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/ticket.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/ticket.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/ticket.wsdl 2007-03-02 11:02:35 UTC (rev 2498)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions targetNamespace="urn:samples:ticket" xmlns:tns="urn:samples:ticket"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/
+ http://schemas.xmlsoap.org/wsdl/">
+
+ <!-- ticket creation request -->
+ <message name="ticketRequest" />
+
+ <!-- ticket number wrapper -->
+ <message name="ticketMessage">
+ <part name="ticketNo" type="xsd:int" />
+ </message>
+
+ <!-- interface to ticket issuer service -->
+ <portType name="TicketIssuer">
+
+ <!-- generate a ticket number, distinct from previous calls -->
+ <operation name="createTicket">
+ <input message="tns:ticketRequest" />
+ <output message="tns:ticketMessage" />
+ </operation>
+
+ </portType>
+
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1553/interface/ticket.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 9 months
- 1
- 0
JBossWS SVN: r2497 - tags/jbossws-1.2.0.GA/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-02 03:53:49 -0500 (Fri, 02 Mar 2007)
New Revision: 2497
Modified:
tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml
Log:
Add jaxb-*.jar
Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml
===================================================================
--- tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-02 08:03:04 UTC (rev 2496)
+++ tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-02 08:53:49 UTC (rev 2497)
@@ -195,6 +195,7 @@
<fileset dir="${thirdparty.dir}">
<include name="jbossws-wsconsume-impl.jar"/>
<include name="jboss-xml-binding.jar"/>
+ <include name="jaxb-*.jar"/>
</fileset>
</copy>
<mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2496 - trunk/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-02 03:03:04 -0500 (Fri, 02 Mar 2007)
New Revision: 2496
Modified:
trunk/build/version.properties
Log:
2.0.0.DEV
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-03-01 22:55:55 UTC (rev 2495)
+++ trunk/build/version.properties 2007-03-02 08:03:04 UTC (rev 2496)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.2
-version.id=2.0.0.CR5
+version.id=2.0.0.DEV
repository.id=snapshot
implementation.title=JBoss Web Services (JBossWS)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2495 - tags/jbossws-1.2.0.GA/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-01 17:55:55 -0500 (Thu, 01 Mar 2007)
New Revision: 2495
Modified:
tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml
Log:
Include jboss-xml-binding.jar
Modified: tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml
===================================================================
--- tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-01 18:49:26 UTC (rev 2494)
+++ tags/jbossws-1.2.0.GA/build/ant-import/build-release.xml 2007-03-01 22:55:55 UTC (rev 2495)
@@ -194,6 +194,7 @@
</fileset>
<fileset dir="${thirdparty.dir}">
<include name="jbossws-wsconsume-impl.jar"/>
+ <include name="jboss-xml-binding.jar"/>
</fileset>
</copy>
<mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/>
@@ -214,6 +215,9 @@
<fileset dir="${jboss40.output.lib.dir}">
<include name="jbossws14-client.jar"/>
</fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
</copy>
<mkdir dir="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar"/>
<unzip dest="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>
17 years, 10 months
- 1
- 0
JBossWS SVN: r2494 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-03-01 13:49:26 -0500 (Thu, 01 Mar 2007)
New Revision: 2494
Removed:
branches/dlofthouse/JBWS-1538/
Log:
Branch no longer required.
17 years, 10 months
- 1
- 0
JBossWS SVN: r2493 - 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-03-01 13:47:56 -0500 (Thu, 01 Mar 2007)
New Revision: 2493
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
trunk/jbossws-tests/src/main/resources/tools/jbws1538/
trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml
Removed:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
JBWS-1538 - Prevent properties being added multiple times to generated JAX-RPC mapping.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-03-01 17:57:31 UTC (rev 2492)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -347,7 +347,8 @@
JBossXSModelGroup group = (JBossXSModelGroup)complexType.getParticle().getTerm();
group.setParticles(particles);
- if(log.isDebugEnabled()) log.debug("generateNewType: " + sutils.write(complexType));
+ if (log.isDebugEnabled())
+ log.debug("generateNewType: " + sutils.write(complexType));
return complexType;
}
@@ -485,10 +486,9 @@
continue;
}
-
String name = term.getName();
- String variableName = name;
- if (reversedNames != null && reversedNames.get(name) != null)
+ String variableName = name;
+ if (reversedNames != null && reversedNames.get(name) != null)
variableName = reversedNames.get(name);
VariableMapping mapping = new VariableMapping(javaXmlTypeMapping);
@@ -497,10 +497,42 @@
mapping.setXmlElementName(name);
mapping.setDataMember(utils.doesPublicFieldExist(javaType, variableName));
- javaXmlTypeMapping.addVariableMapping(mapping);
+ if (isAlreadyMapped(javaXmlTypeMapping, mapping) == false)
+ {
+ javaXmlTypeMapping.addVariableMapping(mapping);
+ }
}
}
+ private boolean isAlreadyMapped(JavaXmlTypeMapping jxtm, VariableMapping vm)
+ {
+ String javaVariableName = vm.getJavaVariableName();
+ String attributeName = vm.getXmlAttributeName();
+ String elementName = vm.getXmlElementName();
+
+ for (VariableMapping current : jxtm.getVariableMappings())
+ {
+ boolean matched = checkStringEquality(javaVariableName, current.getJavaVariableName());
+
+ if (matched)
+ {
+ matched = checkStringEquality(attributeName, current.getXmlAttributeName());
+ }
+
+ if (matched)
+ {
+ matched = checkStringEquality(elementName, current.getXmlElementName());
+ }
+
+ if (matched)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private List<XSParticle> getXSParticlesForPublicFields(String typeNamespace, Class javaType, Map<String, QName> elementNames)
{
List<XSParticle> particles = new ArrayList<XSParticle>();
@@ -579,10 +611,10 @@
String fieldname = prop.getName();
Class fieldType = prop.getPropertyType();
- if (prop instanceof IndexedPropertyDescriptor && fieldType==null)
+ if (prop instanceof IndexedPropertyDescriptor && fieldType == null)
{
- log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname);
- continue;
+ log.warn("Indexed Properties without non-indexed accessors are not supported skipping: " + javaType.getName() + "." + fieldname);
+ continue;
}
// Skip magic work around property used in ParameterWrapping
@@ -710,7 +742,7 @@
List<XSParticle> particles = new ArrayList<XSParticle>(0);
List<Class> types = new ArrayList<Class>(0);
- JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
+ JBossXSComplexTypeDefinition complexType = new JBossXSComplexTypeDefinition();
complexType.setName(name);
complexType.setNamespace(namespace);
@@ -718,14 +750,14 @@
xsModel.addXSElementDeclaration(sutils.createGlobalXSElementDeclaration(name, complexType, namespace));
typeMapping.register(javaType, new QName(namespace, name), null, null);
registerJavaTypeMapping(new QName(namespace, name), javaType, "complexType", particles, null);
-
+
Class superClass = javaType.getSuperclass();
if (!Exception.class.equals(superClass) || Throwable.class.equals(superClass))
{
JBossXSTypeDefinition baseType = generateType(null, superClass);
complexType.setBaseType(baseType);
}
-
+
generateExceptionParticles(namespace, javaType, types, particles);
boolean found = hasConstructor(javaType, types);
@@ -750,7 +782,7 @@
}
}
- complexType.setParticle(createGroupParticle(namespace, particles));
+ complexType.setParticle(createGroupParticle(namespace, particles));
return complexType;
}
@@ -876,4 +908,15 @@
return sutils.createXSParticle(targetNS, isArray, xsel);
}
+
+ private boolean checkStringEquality(String str1, String str2)
+ {
+ if (str1 == null && str2 == null)
+ return true;
+ if (str1 == null && str2 != null)
+ return false;
+ if (str1 != null && str2 == null)
+ return false;
+ return str1.equals(str2);
+ }
}
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538 (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538)
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1538;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 28 Feb 2007
- */
-public class JBWS1538TestCase extends WSToolsTest
-{
-
- public final void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1538";
- String toolsDir = "tools/jbws1538";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
-
- new WSTools().generate(args);
-
- semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1538;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 28 Feb 2007
+ */
+public class JBWS1538TestCase extends WSToolsTest
+{
+
+ public final void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1538";
+ String toolsDir = "tools/jbws1538";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+
+ new WSTools().generate(args);
+
+ semanticallyValidateWSDL(resourceDir + "/TestService.wsdl", toolsDir + "/wsdl/TestService.wsdl");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,44 +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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelFour extends LevelThree
-{
-
- private String fieldFour;
-
- public String getFieldFour()
- {
- return fieldFour;
- }
-
- public void setFieldFour(String fieldFour)
- {
- this.fieldFour = fieldFour;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelFour.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelFour extends LevelThree
+{
+
+ private String fieldFour;
+
+ public String getFieldFour()
+ {
+ return fieldFour;
+ }
+
+ public void setFieldFour(String fieldFour)
+ {
+ this.fieldFour = fieldFour;
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,44 +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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelOne
-{
-
- private String fieldOne;
-
- public String getFieldOne()
- {
- return fieldOne;
- }
-
- public void setFieldOne(String fieldOne)
- {
- this.fieldOne = fieldOne;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelOne.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelOne
+{
+
+ private String fieldOne;
+
+ public String getFieldOne()
+ {
+ return fieldOne;
+ }
+
+ public void setFieldOne(String fieldOne)
+ {
+ this.fieldOne = fieldOne;
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,44 +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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelThree extends LevelTwo
-{
-
- private String fieldThree;
-
- public String getFieldThree()
- {
- return fieldThree;
- }
-
- public void setFieldThree(String fieldThree)
- {
- this.fieldThree = fieldThree;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelThree.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelThree extends LevelTwo
+{
+
+ private String fieldThree;
+
+ public String getFieldThree()
+ {
+ return fieldThree;
+ }
+
+ public void setFieldThree(String fieldThree)
+ {
+ this.fieldThree = fieldThree;
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,44 +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.jbws1538;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public class LevelTwo extends LevelOne
-{
-
- private String fieldTwo;
-
- public String getFieldTwo()
- {
- return fieldTwo;
- }
-
- public void setFieldTwo(String fieldTwo)
- {
- this.fieldTwo = fieldTwo;
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/LevelTwo.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1538;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public class LevelTwo extends LevelOne
+{
+
+ private String fieldTwo;
+
+ public String getFieldTwo()
+ {
+ return fieldTwo;
+ }
+
+ public void setFieldTwo(String fieldTwo)
+ {
+ this.fieldTwo = fieldTwo;
+ }
+
+}
Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1538;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 27 Feb 2007
- */
-public interface TestEndpoint extends Remote
-{
-
- public LevelFour echo(final LevelFour levelFour) throws RemoteException;
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java (rev 0)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1538/TestEndpoint.java 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1538;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 27 Feb 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public LevelFour echo(final LevelFour levelFour) throws RemoteException;
+
+}
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538 (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538)
Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='echoResponse'>
- <sequence>
- <element name='result' nillable='true' type='tns:LevelFour'/>
- </sequence>
- </complexType>
- <complexType name='LevelFour'>
- <complexContent>
- <extension base='tns:LevelThree'>
- <sequence>
- <element name='fieldFour' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name='LevelOne'>
- <sequence>
- <element name='fieldOne' nillable='true' type='string'/>
- </sequence>
- </complexType>
- <complexType name='LevelThree'>
- <complexContent>
- <extension base='tns:LevelTwo'>
- <sequence>
- <element name='fieldThree' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <complexType name='echo'>
- <sequence>
- <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/>
- </sequence>
- </complexType>
- <complexType name='LevelTwo'>
- <complexContent>
- <extension base='tns:LevelOne'>
- <sequence>
- <element name='fieldTwo' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
- <element name='echo' type='tns:echo'/>
- <element name='echoResponse' type='tns:echoResponse'/>
- </schema>
- </types>
- <message name='TestEndpoint_echo'>
- <part element='ns1:echo' name='echo'/>
- </message>
- <message name='TestEndpoint_echoResponse'>
- <part element='ns1:echoResponse' name='echoResponse'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='echo'>
- <input message='tns:TestEndpoint_echo'/>
- <output message='tns:TestEndpoint_echoResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl)
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl (rev 0)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/TestService.wsdl 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1538' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1538/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1538' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1538/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1538/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='echoResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='tns:LevelFour'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelFour'>
+ <complexContent>
+ <extension base='tns:LevelThree'>
+ <sequence>
+ <element name='fieldFour' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='LevelOne'>
+ <sequence>
+ <element name='fieldOne' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelThree'>
+ <complexContent>
+ <extension base='tns:LevelTwo'>
+ <sequence>
+ <element name='fieldThree' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <complexType name='echo'>
+ <sequence>
+ <element name='LevelFour_1' nillable='true' type='tns:LevelFour'/>
+ </sequence>
+ </complexType>
+ <complexType name='LevelTwo'>
+ <complexContent>
+ <extension base='tns:LevelOne'>
+ <sequence>
+ <element name='fieldTwo' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name='echo' type='tns:echo'/>
+ <element name='echoResponse' type='tns:echoResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echo'>
+ <part element='ns1:echo' name='echo'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='ns1:echoResponse' name='echoResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.tools.jbws1538</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldTwo</java-variable-name>
- <xml-element-name>fieldTwo</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldTwo</java-variable-name>
- <xml-element-name>fieldTwo</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldThree</java-variable-name>
- <xml-element-name>fieldThree</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>fieldOne</java-variable-name>
- <xml-element-name>fieldOne</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldTwo</java-variable-name>
- <xml-element-name>fieldTwo</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldThree</java-variable-name>
- <xml-element-name>fieldThree</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fieldFour</java-variable-name>
- <xml-element-name>fieldFour</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>levelFour_1</java-variable-name>
- <xml-element-name>LevelFour_1</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>result</java-variable-name>
- <xml-element-name>result</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.tools.jbws1538.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
- <wsdl-message-part-name>LevelFour_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.tools.jbws1538.LevelFour</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/jaxrpc-mapping.xml 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.tools.jbws1538</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1538/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelOne</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelOne</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelTwo</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelTwo</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelThree</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelThree</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldThree</java-variable-name>
+ <xml-element-name>fieldThree</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.LevelFour</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:LevelFour</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>fieldOne</java-variable-name>
+ <xml-element-name>fieldOne</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldTwo</java-variable-name>
+ <xml-element-name>fieldTwo</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldThree</java-variable-name>
+ <xml-element-name>fieldThree</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>fieldFour</java-variable-name>
+ <xml-element-name>fieldFour</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echo</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>levelFour_1</java-variable-name>
+ <xml-element-name>LevelFour_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.tools.jbws1538.TestEndpoint_echo_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1538/types'>typeNS:echoResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.tools.jbws1538.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1538'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.tools.jbws1538.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1538'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1538'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.tools.jbws1538.LevelFour</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>LevelFour_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.tools.jbws1538.LevelFour</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1538'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-02-28 00:40:40 UTC (rev 2479)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-03-01 18:47:56 UTC (rev 2493)
@@ -1,14 +0,0 @@
-<configuration xmlns="http://www.jboss.org/jbossws-tools"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
-
- <java-wsdl>
- <service name="TestService"
- endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" />
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1538"
- type-namespace="http://org.jboss.test.ws/jbws1538/types" />
- <mapping file="jaxrpc-mapping.xml" />
- <webservices servlet-link="TestService"/>
- </java-wsdl>
-
-</configuration>
\ No newline at end of file
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml (from rev 2479, branches/dlofthouse/JBWS-1538/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml)
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml (rev 0)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1538/wstools-config.xml 2007-03-01 18:47:56 UTC (rev 2493)
@@ -0,0 +1,14 @@
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService"
+ endpoint="org.jboss.test.ws.tools.jbws1538.TestEndpoint" style="document" />
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1538"
+ type-namespace="http://org.jboss.test.ws/jbws1538/types" />
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices servlet-link="TestService"/>
+ </java-wsdl>
+
+</configuration>
\ No newline at end of file
17 years, 10 months
- 1
- 0
JBossWS SVN: r2492 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-03-01 12:57:31 -0500 (Thu, 01 Mar 2007)
New Revision: 2492
Added:
branches/dlofthouse/JBWS-1464/
Log:
Branch for JBWS-1464
Copied: branches/dlofthouse/JBWS-1464 (from rev 2491, trunk)
17 years, 10 months
- 1
- 0
JBossWS SVN: r2491 - in trunk: jbossws-core/src/main/resources/dist and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-01 10:51:40 -0500 (Thu, 01 Mar 2007)
New Revision: 2491
Modified:
trunk/build/ant-import/build-release.xml
trunk/jbossws-core/src/main/resources/dist/Install.txt
trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt
Log:
svn merge -r2483:2488 https://svn.jboss.org/repos/jbossws/tags/jbossws-1.2.0.GA
Include jbossws-wsconsume-impl.jar
Update references to wiki
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-03-01 15:01:18 UTC (rev 2490)
+++ trunk/build/ant-import/build-release.xml 2007-03-01 15:51:40 UTC (rev 2491)
@@ -25,13 +25,13 @@
<echo message="* 1) Create SVN tag: jbossws-${version.id}"/>
<echo message="* 2) Update portal-content/project.xml"/>
<echo message="* 3) Update portal-content/counter.xml"/>
- <echo message="* 4) Update news in portal-content/freezone/projectDescription.xml"/>
+ <echo message="* 4) Update news in portal-content/freezone/projectDescription.html"/>
<echo message="* 5) Verify release notes and install instructions"/>
<echo message="* 6) Publish the interop endpoints (ant -f jboss-tests/build.xml publish-interop-endpoints)"/>
<echo message="* 7) Commit the portal-content"/>
<echo message="* 8) Commit the repository jars"/>
<echo message="* 9) Write a sticky post on the user forum"/>
- <echo message="* 10) Release the jbossws-${version.id} version in JIRA"/>
+ <echo message="* 10) Release the jbossws-${version.id} version in JIRA"/>
<echo message="* 11) Post a message to jbossws-announce(a)lists.jboss.org"/>
<echo message="* 12) Post a message to thecore(a)jboss.org"/>
<echo message="*"/>
@@ -110,12 +110,13 @@
<property name="portal.userguide" value="${portal.freezone}/user-guide"/>
<property name="portal.downloads" value="${jbossws.portal.content}/downloads"/>
- <!-- Copy user guide -->
+ <!-- Copy user guide
<copy todir="${portal.userguide}" overwrite="true">
<fileset dir="${docs.userguide.dir}/build">
<include name="en/**"/>
</fileset>
</copy>
+ -->
<!-- Copy downloads -->
<copy todir="${portal.downloads}" overwrite="true">
@@ -174,13 +175,14 @@
<!-- javadoc -->
<copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/>
- <!-- documentation -->
+ <!-- documentation
<copy todir="${build.bin.dist}/docs/html" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/html"/>
</copy>
<copy todir="${build.bin.dist}/docs" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/pdf"/>
</copy>
+ -->
<!-- lib/jboss-jdk15 -->
<copy todir="${build.bin.dist}/lib/jboss-jdk15" overwrite="true">
@@ -190,6 +192,9 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
</copy>
<mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/>
<unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
Modified: trunk/jbossws-core/src/main/resources/dist/Install.txt
===================================================================
--- trunk/jbossws-core/src/main/resources/dist/Install.txt 2007-03-01 15:01:18 UTC (rev 2490)
+++ trunk/jbossws-core/src/main/resources/dist/Install.txt 2007-03-01 15:51:40 UTC (rev 2491)
@@ -14,10 +14,9 @@
1.) Copy lib/jbossws-client.jar to $JBOSS_HOME/client/
2.) Unzip lib/jbossws.sar to $JBOSS_HOME/server/default/deploy/
-3.) Replacing jboss-xml-binding.jar
-You need to manually replace the jboss-xml-binding.jar in the $JBOSS_HOME/client and $JBOSS_HOME/lib directories.
-The compatible release can be found here: http://repository.jboss.com/jboss/jbossxb/1.0.0.CR7
+Please consult the wiki for detailed up to date install instructions
+http://labs.jboss.com/portal/jbossws/
After the jbossws.sar is deployed you should be able to access JBossWS under
http://localhost:8080/jbossws
Modified: trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt
===================================================================
--- trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-03-01 15:01:18 UTC (rev 2490)
+++ trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-03-01 15:51:40 UTC (rev 2491)
@@ -7,7 +7,7 @@
Release Notes
=============
-The UserGuide can be found in the docs directory and is usally a good starting point
+The UserGuide accessible from http://labs.jboss.com/portal/jbossws is usally a good starting point
A list of examples that accompany the UserGuide can be found in the samples
If you have any questions, please post to the JBossWS User Forum
17 years, 10 months
- 1
- 0
JBossWS SVN: r2490 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-01 10:01:18 -0500 (Thu, 01 Mar 2007)
New Revision: 2490
Removed:
branches/jbossws-1.2.0/
Log:
Delete stale branch
17 years, 10 months
- 1
- 0