JBossWS SVN: r1906 - 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 11:05:43 -0500 (Wed, 10 Jan 2007)
New Revision: 1906
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:
Fixed Holder handling at client side.
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 16:02:53 UTC (rev 1905)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-01-10 16:05:43 UTC (rev 1906)
@@ -313,9 +313,7 @@
{
// unbind the return values
SOAPMessage resMessage = msgContext.getSOAPMessage();
- binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders);
-
- retObj = syncOutputParams(inputParams, epInv);
+ binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders);
}
handlerPass = handlerPass && callResponseHandlerChain(portName, HandlerType.ENDPOINT);
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 16:02:53 UTC (rev 1905)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-01-10 16:05:43 UTC (rev 1906)
@@ -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;
}
}
18 years
- 1
- 0
JBossWS SVN: r1905 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-10 11:02:53 -0500 (Wed, 10 Jan 2007)
New Revision: 1905
Removed:
branches/dlofthouse/JBWS-1383/
Log:
Branch no longer required.
18 years
- 1
- 0
JBossWS SVN: r1904 - in branches/dlofthouse/JBWS-1383/jbossws-tests: src/main/java/org/jboss/test/ws/jaxrpc and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-10 10:59:56 -0500 (Wed, 10 Jan 2007)
New Revision: 1904
Added:
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/JBWS1383TestCase.java
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook.java
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/web.xml
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/webservices.xml
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/wsdl/
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/wsdl/PhoneBook.wsdl
branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1383/jbossws-tests/ant-import/build-jars-jaxrpc.xml
Log:
JBWS-1383 - Test case.
Modified: branches/dlofthouse/JBWS-1383/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 15:59:56 UTC (rev 1904)
@@ -918,6 +918,19 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1383 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1383.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1383/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1383/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1383/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1383/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1427 -->
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar">
<fileset dir="${tests.output.dir}/classes">
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/JBWS1383TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/JBWS1383TestCase.java 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/JBWS1383TestCase.java 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,34 @@
+/*
+ * 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.jaxrpc.jbws1383;
+
+import org.jboss.test.ws.JBossWSTest;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 10 Jan 2007
+ */
+public class JBWS1383TestCase extends JBossWSTest
+{
+
+}
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/JBWS1383TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook.java
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook.java 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook.java 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,42 @@
+/*
+ * 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.jaxrpc.jbws1383;
+
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 10 Jan 2007
+ */
+public class PhoneBook implements PhoneBook_PortType
+{
+
+ /**
+ * @see org.jboss.test.ws.jaxrpc.jbws1383.PhoneBook_PortType#lookup(java.lang.String)
+ */
+ public String lookup(String lookup) throws RemoteException
+ {
+ return "(1234) 567890";
+ }
+
+}
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook_PortType.java 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook_PortType.java 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Jan 10 16:32:33 CET 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1383;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public java.lang.String lookup(java.lang.String lookup) throws java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1383/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/jaxrpc-mapping.xml 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/jaxrpc-mapping.xml 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,37 @@
+<?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.jaxrpc.jbws1383</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1383</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1383.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1383'>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.jaxrpc.jbws1383.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1383'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1383'>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/jbws1383'>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/jbws1383'>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>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/web.xml
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/web.xml 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/web.xml 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>PhoneBook</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1383.PhoneBook</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>PhoneBook</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/webservices.xml
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/webservices.xml 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/webservices.xml 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1 @@
+<webservices 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_web_services_1_1.xsd' version='1.1'><webservice-description><webservice-description-name>PhoneBook</webservice-description-name><wsdl-file>WEB-INF/wsdl/PhoneBook.wsdl</wsdl-file><jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file><port-component><port-component-name>PhoneBookPort</port-component-name><wsdl-port xmlns:portNS='http://test.jboss.org/ws/jbws1383'>portNS:PhoneBookPort</wsdl-port><service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1383.PhoneBook_PortType</service-endpoint-interface><service-impl-bean><servlet-link>PhoneBook</servlet-link></service-impl-bean></port-component></webservice-description></webservices>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/wsdl/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/wsdl/PhoneBook.wsdl 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/wsdl/PhoneBook.wsdl 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1383' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1383/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1383' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1383/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1383/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-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/WEB-INF/wsdl/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/wstools-config.xml 2007-01-10 15:57:47 UTC (rev 1903)
+++ branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/wstools-config.xml 2007-01-10 15:59:56 UTC (rev 1904)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -config wstools-config.xml
+-->
+
+<configuration>
+ <global>
+ <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1383" namespace="http://test.jboss.org/ws/jbws1383"/>
+ </global>
+
+ <wsdl-java location="WEB-INF/wsdl/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="PhoneBook" />
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1383/jbossws-tests/src/main/resources/jaxrpc/jbws1383/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1903 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-10 10:57:47 -0500 (Wed, 10 Jan 2007)
New Revision: 1903
Added:
branches/dlofthouse/JBWS-1383/
Log:
JBWS-1383 - Working branch.
Copied: branches/dlofthouse/JBWS-1383 (from rev 1902, trunk)
18 years
- 1
- 0
JBossWS SVN: r1902 - branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 10:30:12 -0500 (Wed, 10 Jan 2007)
New Revision: 1902
Added:
branches/tdiesler/trunk/
Log:
recreate
Copied: branches/tdiesler/trunk (from rev 1901, trunk)
18 years
- 1
- 0
JBossWS SVN: r1901 - branches/tdiesler.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 10:29:54 -0500 (Wed, 10 Jan 2007)
New Revision: 1901
Removed:
branches/tdiesler/trunk/
Log:
recreate
18 years
- 1
- 0
JBossWS SVN: r1900 - in trunk: jbossws-core/src/main/java/org/jboss/ws and 20 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 10:28:42 -0500 (Wed, 10 Jan 2007)
New Revision: 1900
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/interfaces/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/interfaces/RequestService.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/Message.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/RequestServiceEJB.java
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/ejb-jar.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/webservices.xml
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/wsdl/
trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl
Modified:
trunk/jbossws-core/.classpath
trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLProperty.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSErrorHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-tests/.classpath
trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java
Log:
[JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/.classpath 2007-01-10 15:28:42 UTC (rev 1900)
@@ -9,7 +9,7 @@
<classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/>
@@ -18,7 +18,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar" sourcepath="/build/thirdparty/wsdl4j-1_5_2.zip"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-ejb3x.jar"/>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -100,7 +100,7 @@
static final String URI_LITERAL_ENC = "";
/** WSDL 2.0 Encoding Rules */
static final String URI_STYLE_RPC = "http://www.w3.org/2004/03/wsdl/style/rpc";
- static final String URI_STYLE_IRI = "http://www.w3.org/2004/03/wsdl/style/iri"; //represents doc
+ static final String URI_STYLE_DOCUMENT = "http://www.w3.org/2004/03/wsdl/style/iri";
/**Style of WSDL */
static final String RPC_LITERAL = "RPC/Literal";
static final String DOCUMENT_LITERAL = "Document/Literal";
@@ -261,8 +261,8 @@
/** The key to the original message part name */
static final String WSDL_PROPERTY_PART_NAME = "http://www.jboss.org/jbossws/partname";
- /** The key to the message part type in case a part does not reference an element; http://www.jboss.org/jbossws/rpc/xmltype */
- static final String WSDL_PROPERTY_RPC_XMLTYPE = "http://www.jboss.org/jbossws/rpc/xmltype";
+ /** The key to the message part type in case a part does not reference an element; http://www.jboss.org/jbossws/part/xmltype */
+ static final String WSDL_PROPERTY_PART_XMLTYPE = "http://www.jboss.org/jbossws/part/xmltype";
/** Used as WSDL 2.0 property string to provide support for WSDL 1.1 mime types */
static final String WSDL_PROPERTY_WSDL11_MIME_TYPE = NS_ATTACHMENT_MIME_TYPE;
/** Indicate that the operation has zero arguments */
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -51,6 +51,10 @@
registerEntity("http://java.sun.com/xml/ns/javaee", "schema/javaee_web_services_1_2.xsd");
registerEntity("http://www.w3.org/2005/08/addressing", "schema/ws-addr.xsd");
registerEntity("http://schemas.xmlsoap.org/ws/2004/08/eventing", "eventing.xsd");
+ registerEntity("http://schemas.xmlsoap.org/soap/encoding/", "soap-encoding_1_1.xsd");
+ registerEntity("http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd", "j2ee_web_services_client_1_1.xsd");
+ registerEntity("http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd", "j2ee_web_services_1_1.xsd");
+ registerEntity("http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd", "j2ee_jaxrpc_mapping_1_1.xsd");
}
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
@@ -59,21 +63,23 @@
InputSource inputSource = super.resolveEntity(publicId, systemId);
if (inputSource == null)
- {
- inputSource = resolveSystemIDasURL(systemId, log.isTraceEnabled());
- }
-
+ inputSource = resolveSystemIDAsURL(systemId, log.isTraceEnabled());
+
+ if (inputSource == null)
+ log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]");
+
return inputSource;
}
- /** This method should be protected in the super class. */
- protected InputSource resolveSystemIDasURL(String systemId, boolean trace)
+ /** Use a ResourceURL to access the resource.
+ * This method should be protected in the super class. */
+ protected InputSource resolveSystemIDAsURL(String id, boolean trace)
{
- if (systemId == null)
+ if (id == null)
return null;
if (trace)
- log.trace("resolveSystemIDasURL, systemId=" + systemId);
+ log.trace("resolveIDAsResourceURL, id=" + id);
InputSource inputSource = null;
@@ -81,37 +87,35 @@
try
{
if (trace)
- log.trace("Trying to resolve systemId as a URL");
+ log.trace("Trying to resolve id as a URL");
- URL url = new URL(systemId);
+ URL url = new URL(id);
if (url.getProtocol().equalsIgnoreCase("file") == false)
- {
- log.warn("Trying to resolve systemId as a non-file URL: " + systemId);
- }
+ log.warn("Trying to resolve id as a non-file URL: " + id);
InputStream ins = new ResourceURL(url).openStream();
if (ins != null)
{
inputSource = new InputSource(ins);
- inputSource.setSystemId(systemId);
+ inputSource.setSystemId(id);
}
else
{
- log.warn("Cannot load systemId as URL: " + systemId);
+ log.warn("Cannot load id as URL: " + id);
}
if (trace)
- log.trace("Resolved systemId as a URL");
+ log.trace("Resolved id as a URL");
}
catch (MalformedURLException ignored)
{
if (trace)
- log.trace("SystemId is not a url: " + systemId, ignored);
+ log.trace("id is not a url: " + id, ignored);
}
catch (IOException e)
{
if (trace)
- log.trace("Failed to obtain URL.InputStream from systemId: " + systemId, e);
+ log.trace("Failed to obtain URL.InputStream from id: " + id, e);
}
return inputSource;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -187,7 +187,7 @@
// Set the operation style
String style = wsdlOperation.getStyle();
- epMetaData.setStyle((Constants.URI_STYLE_IRI.equals(style) ? Style.DOCUMENT : Style.RPC));
+ epMetaData.setStyle((Constants.URI_STYLE_DOCUMENT.equals(style) ? Style.DOCUMENT : Style.RPC));
// Set the operation MEP
if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern()))
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -157,7 +157,7 @@
// Set the operation style
String style = wsdlOperation.getStyle();
- epMetaData.setStyle((Constants.URI_STYLE_IRI.equals(style) ? Style.DOCUMENT : Style.RPC));
+ epMetaData.setStyle((Constants.URI_STYLE_DOCUMENT.equals(style) ? Style.DOCUMENT : Style.RPC));
// Set the operation MEP
if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern()))
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -128,7 +128,7 @@
// Fall back to the property
if (xmlType == null)
{
- WSDLProperty property = getProperty(Constants.WSDL_PROPERTY_RPC_XMLTYPE);
+ WSDLProperty property = getProperty(Constants.WSDL_PROPERTY_PART_XMLTYPE);
if (property != null)
{
String qnameRef = property.getValue();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLProperty.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLProperty.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLProperty.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -54,6 +54,8 @@
/** A OPTIONAL type definition constraining the value of the property, or the token
* #value if the {value} property is not empty.*/
private QName constraint;
+
+ private QName qnameValue;
public WSDLProperty(String uri, String value)
{
@@ -64,6 +66,15 @@
this.value = value;
}
+ public WSDLProperty(String uri, QName value)
+ {
+ if (uri == null)
+ throw new IllegalArgumentException("Illegal property URI: " + uri);
+
+ this.uri = uri;
+ this.qnameValue = value;
+ }
+
public WSDLProperty(String uri, boolean required, String value, QName constraint)
{
if (uri == null)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSErrorHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSErrorHandler.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSErrorHandler.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -1,30 +1,31 @@
/*
-* 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.
-*/
+ * 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.ws.metadata.wsdl.xmlschema;
import org.apache.xerces.xni.XNIException;
import org.apache.xerces.xni.parser.XMLErrorHandler;
import org.apache.xerces.xni.parser.XMLParseException;
import org.jboss.logging.Logger;
+
/**
* Error Handler for the Xerces schema parser default implementation
* @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana
@@ -41,9 +42,9 @@
* @param exception - Exception.
* @throws XNIException Thrown to signal that the parser should stop parsing the document.
*/
- public void warning(String domain, String key, XMLParseException xexp) throws XNIException
+ public void warning(String domain, String key, XMLParseException xexp) throws XNIException
{
- log.trace(getFormattedString(domain,key,xexp));
+ log.trace(getFormattedString(domain, key, xexp));
}
/**
@@ -53,11 +54,13 @@
* @param exception - Exception.
* @throws XNIException Thrown to signal that the parser should stop parsing the document.
*/
- public void error(String domain, String key, XMLParseException xexp) throws XNIException
+ public void error(String domain, String key, XMLParseException xexp) throws XNIException
{
- if("src-include.2.1".equals(key))
- throw new XNIException("Parser should stop:",xexp);
- log.error(getFormattedString(domain,key,xexp));
+ if ("src-include.2.1".equals(key))
+ throw new XNIException("Parser should stop:", xexp);
+
+ String errorMsg = getFormattedString(domain, key, xexp);
+ log.error(errorMsg);
}
/**
@@ -68,25 +71,24 @@
* @param exception - Exception.
* @throws XNIException Thrown to signal that the parser should stop parsing the document.
*/
- public void fatalError(String domain, String key, XMLParseException xexp) throws XNIException
+ public void fatalError(String domain, String key, XMLParseException xexp) throws XNIException
{
- log.fatal(getFormattedString(domain,key,xexp));
- throw new XNIException("Parser should stop:",xexp);
+ String errorMsg = getFormattedString(domain, key, xexp);
+ log.error(errorMsg);
+ throw new XNIException("Parser should stop: " + errorMsg, xexp);
}
/**
* Get the name of the schema file in question
- *
- * @param xexp
- * @return
*/
private String getFileName(XMLParseException xexp)
{
String fname = xexp.getExpandedSystemId();
- if (fname != null) {
- int index = fname.lastIndexOf('/');
- if (index != -1)
- fname = fname.substring(index + 1);
+ if (fname != null)
+ {
+ int index = fname.lastIndexOf('/');
+ if (index != -1)
+ fname = fname.substring(index + 1);
}
else
{
@@ -99,12 +101,8 @@
/**
* Return a formatted string that gives as much information
* as possible to the user
- * @param domain
- * @param key
- * @param xexp
- * @return
*/
- private String getFormattedString(String domain, String key, XMLParseException xexp)
+ private String getFormattedString(String domain, String key, XMLParseException xexp)
{
StringBuilder buf = new StringBuilder(getFileName(xexp));
buf.append("[domain:");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -38,6 +38,7 @@
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.JBossWSEntityResolver;
import org.jboss.ws.core.utils.ResourceURL;
import org.jboss.ws.metadata.wsdl.WSDLUtils;
@@ -172,12 +173,16 @@
log.debug("Load schema: " + nsURI + "=" + url);
XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null);
inputSource.setByteStream(new ResourceURL(url).openStream());
- gs[index++] = (SchemaGrammar)loader.loadGrammar(inputSource);
+ SchemaGrammar grammar = (SchemaGrammar)loader.loadGrammar(inputSource);
+ gs[index++] = grammar;
}
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
catch (Exception ex)
{
- log.error("Cannot parse schema", ex);
- return null;
+ throw new IllegalStateException("Cannot parse schema", ex);
}
}
XSModel xsmodel = new XSModelImpl(gs);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -169,7 +169,7 @@
protected void processOperationDOC(WSDLInterfaceOperation interfaceOperation, WSDLBindingOperation bindingOperation, OperationMetaData operation)
{
- interfaceOperation.setStyle(Constants.URI_STYLE_IRI);
+ interfaceOperation.setStyle(Constants.URI_STYLE_DOCUMENT);
WSDLInterfaceOperationInput input = new WSDLInterfaceOperationInput(interfaceOperation);
WSDLBindingOperationInput bindingInput = new WSDLBindingOperationInput(bindingOperation);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -51,6 +51,7 @@
import javax.wsdl.PortType;
import javax.wsdl.Service;
import javax.wsdl.Types;
+import javax.wsdl.WSDLException;
import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.wsdl.extensions.mime.MIMEContent;
@@ -66,7 +67,6 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
-import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
@@ -148,7 +148,7 @@
* @param srcWsdl The src WSDL11 definition
* @param wsdlLoc The source location, if null we cannot process imports or includes
*/
- public WSDLDefinitions processDefinition(Definition srcWsdl, URL wsdlLoc) throws IOException
+ public WSDLDefinitions processDefinition(Definition srcWsdl, URL wsdlLoc) throws IOException, WSDLException
{
log.trace("processDefinition: " + wsdlLoc);
@@ -178,7 +178,7 @@
}
// process all bindings not within service separetly
- private void processUnreachableBindings(Definition srcWsdl)
+ private void processUnreachableBindings(Definition srcWsdl) throws WSDLException
{
log.trace("processUnreachableBindings");
@@ -213,7 +213,7 @@
}
}
- private void processTypes(Definition srcWsdl, URL wsdlLoc) throws IOException
+ private void processTypes(Definition srcWsdl, URL wsdlLoc) throws IOException, WSDLException
{
log.trace("BEGIN processTypes: " + wsdlLoc);
@@ -240,7 +240,7 @@
}
else
{
- throw new WSException("Unsupported extensibility element: " + extElement);
+ throw new WSDLException(WSDLException.OTHER_ERROR, "Unsupported extensibility element: " + extElement);
}
Element domElementClone = (Element)domElement.cloneNode(true);
@@ -264,7 +264,7 @@
}
catch (IOException e)
{
- throw new WSException("Cannot extract schema definition", e);
+ throw new WSDLException(WSDLException.OTHER_ERROR, "Cannot extract schema definition", e);
}
}
@@ -315,7 +315,7 @@
}
}
- private void processSchemaImport(WSDLTypes types, URL wsdlLoc, Element importEl) throws IOException
+ private void processSchemaImport(WSDLTypes types, URL wsdlLoc, Element importEl) throws IOException, WSDLException
{
if (wsdlLoc == null)
throw new IllegalArgumentException("Cannot process import, parent location not set");
@@ -333,7 +333,7 @@
importEl.setAttribute("schemaLocation", newloc.toExternalForm());
}
- private URL processSchemaInclude(WSDLTypes types, URL wsdlLoc, Element schemaEl) throws IOException
+ private URL processSchemaInclude(WSDLTypes types, URL wsdlLoc, Element schemaEl) throws IOException, WSDLException
{
if (wsdlLoc == null)
throw new IllegalArgumentException("Cannot process iclude, parent location not set");
@@ -398,7 +398,7 @@
return tmpFile != null ? tmpFile.toURL() : null;
}
- private void handleSchemaImports(Element schemaEl, URL wsdlLoc) throws MalformedURLException
+ private void handleSchemaImports(Element schemaEl, URL wsdlLoc) throws MalformedURLException, WSDLException
{
if (wsdlLoc == null)
throw new IllegalArgumentException("Cannot process import, parent location not set");
@@ -425,7 +425,7 @@
}
}
- private URL getLocationURL(URL parentURL, String location) throws MalformedURLException
+ private URL getLocationURL(URL parentURL, String location) throws MalformedURLException, WSDLException
{
log.trace("getLocationURL: [location=" + location + ",parent=" + parentURL + "]");
@@ -461,7 +461,7 @@
}
else
{
- throw new WSException("Unsupported schemaLocation: " + location);
+ throw new WSDLException(WSDLException.OTHER_ERROR, "Unsupported schemaLocation: " + location);
}
}
@@ -469,7 +469,7 @@
return locationURL;
}
- private void processPortType(Definition srcWsdl, PortType srcPortType)
+ private void processPortType(Definition srcWsdl, PortType srcPortType) throws WSDLException
{
log.trace("processPortType: " + srcPortType.getQName());
@@ -494,7 +494,7 @@
}
}
- private void processPortTypeOperations(Definition srcWsdl, WSDLInterface destInterface, PortType srcPortType)
+ private void processPortTypeOperations(Definition srcWsdl, WSDLInterface destInterface, PortType srcPortType) throws WSDLException
{
Iterator itOperations = srcPortType.getOperations().iterator();
while (itOperations.hasNext())
@@ -513,12 +513,16 @@
}
}
- private void processOperationInput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType)
+ private void processOperationInput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType) throws WSDLException
{
Input srcInput = srcOperation.getInput();
if (srcInput != null)
{
Message srcMessage = srcInput.getMessage();
+ if (srcMessage == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find input message on operation " + srcOperation.getName() + " on port type: "
+ + srcPortType.getQName());
+
log.trace("processOperationInput: " + srcMessage.getQName());
QName wsaAction = (QName)srcInput.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSA_ACTION);
@@ -538,12 +542,12 @@
WSDLInterfaceOperationInput rpcInput = new WSDLInterfaceOperationInput(destOperation);
for (Part srcPart : (List<Part>)srcMessage.getOrderedParts(paramOrder))
{
- if (Constants.URI_STYLE_IRI == destOperation.getStyle())
+ if (Constants.URI_STYLE_DOCUMENT == destOperation.getStyle())
{
WSDLInterfaceOperationInput destInput = new WSDLInterfaceOperationInput(destOperation);
- QName elementName = messagePartToElementName(srcMessage, srcPart);
+ QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation);
destInput.setElement(elementName);
-
+
//Lets remember the Message name
destInput.setMessageName(srcMessage.getQName());
destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN, srcMessage.getQName().getLocalPart()));
@@ -560,7 +564,7 @@
QName xmlType = srcPart.getTypeName();
if (xmlType != null)
rpcInput.addChildPart(new WSDLRPCPart(srcPart.getName(), destWsdl.registerQName(xmlType)));
- else messagePartToElementName(srcMessage, srcPart);
+ else messagePartToElementName(srcMessage, srcPart, destOperation);
}
}
if (Constants.URI_STYLE_RPC == destOperation.getStyle())
@@ -574,7 +578,7 @@
}
}
- private void processOperationOutput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType)
+ private void processOperationOutput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType) throws WSDLException
{
Output srcOutput = srcOperation.getOutput();
if (srcOutput == null)
@@ -584,6 +588,10 @@
}
Message srcMessage = srcOutput.getMessage();
+ if (srcMessage == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find output message on operation " + srcOperation.getName() + " on port type: "
+ + srcPortType.getQName());
+
log.trace("processOperationOutput: " + srcMessage.getQName());
destOperation.setPattern(Constants.WSDL20_PATTERN_IN_OUT);
@@ -609,11 +617,11 @@
WSDLInterfaceOperationOutput rpcOutput = new WSDLInterfaceOperationOutput(destOperation);
for (Part srcPart : (List<Part>)srcMessage.getOrderedParts(null))
{
- if (Constants.URI_STYLE_IRI == destOperation.getStyle())
+ if (Constants.URI_STYLE_DOCUMENT == destOperation.getStyle())
{
WSDLInterfaceOperationOutput destOutput = new WSDLInterfaceOperationOutput(destOperation);
- QName elementName = messagePartToElementName(srcMessage, srcPart);
+ QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation);
destOutput.setElement(elementName);
// Lets remember the Message name
@@ -633,7 +641,7 @@
QName xmlType = srcPart.getTypeName();
if (xmlType != null)
rpcOutput.addChildPart(new WSDLRPCPart(srcPart.getName(), destWsdl.registerQName(xmlType)));
- else messagePartToElementName(srcMessage, srcPart);
+ else messagePartToElementName(srcMessage, srcPart, destOperation);
}
}
@@ -648,7 +656,7 @@
}
}
- private void processOperationFaults(Operation srcOperation, WSDLInterfaceOperation destOperation, WSDLInterface destInterface)
+ private void processOperationFaults(Operation srcOperation, WSDLInterfaceOperation destOperation, WSDLInterface destInterface) throws WSDLException
{
Map faults = srcOperation.getFaults();
@@ -660,7 +668,7 @@
}
}
- private void processOperationFault(WSDLInterfaceOperation destOperation, WSDLInterface destInterface, Fault srcFault)
+ private void processOperationFault(WSDLInterfaceOperation destOperation, WSDLInterface destInterface, Fault srcFault) throws WSDLException
{
String faultName = srcFault.getName();
log.trace("processOperationFault: " + faultName);
@@ -674,7 +682,7 @@
Map partsMap = message.getParts();
if (partsMap.size() != 1)
- throw new WSException("Unsupported number of fault parts in message " + messageName);
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Unsupported number of fault parts in message " + messageName);
Part part = (Part)partsMap.values().iterator().next();
QName xmlName = part.getElementName();
@@ -691,7 +699,7 @@
WSDLInterfaceFault prevFault = destInterface.getFault(ncName);
if (prevFault != null && prevFault.getName().equals(ncName) == false)
- throw new WSException("Fault name must be unique: " + faultName);
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Fault name must be unique: " + faultName);
// Add the fault to the interface
destInterface.addFault(destFault);
@@ -703,15 +711,42 @@
}
/** Translate the message part name into an XML element name.
+ * @throws WSDLException
*/
- private QName messagePartToElementName(Message srcMessage, Part srcPart)
+ private QName messagePartToElementName(Message srcMessage, Part srcPart, WSDLInterfaceOperation destOperation) throws WSDLException
{
- // <part name="param" element="tns:SomeType" />
- QName xmlName = srcPart.getElementName();
+ QName xmlName;
+
+ // R2306 A wsdl:message in a DESCRIPTION MUST NOT specify both type and element attributes on the same wsdl:part
+ if (srcPart.getTypeName() != null && srcPart.getElementName() != null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Message parts must not define an element name and type name: " + srcMessage.getQName());
- // <part name="param" type="xsd:string" />
- if (xmlName == null)
- xmlName = new QName(srcPart.getName());
+ String style = destOperation.getStyle();
+ if (Constants.URI_STYLE_RPC.equals(style))
+ {
+ // R2203 An rpc-literal binding in a DESCRIPTION MUST refer, in its soapbind:body element(s),
+ // only to wsdl:part element(s) that have been defined using the type attribute.
+ if (srcPart.getName() == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "RPC style message parts must define a typy name: " + srcMessage.getQName());
+
+ // <part name="param" element="tns:SomeType" />
+ // Headers do have an element name even in rpc
+ xmlName = srcPart.getElementName();
+
+ // <part name="param" type="xsd:string" />
+ if (xmlName == null)
+ xmlName = new QName(srcPart.getName());
+ }
+ else
+ {
+ // R2204 A document-literal binding in a DESCRIPTION MUST refer, in each of its soapbind:body element(s),
+ // only to wsdl:part element(s) that have been defined using the element attribute
+ if (srcPart.getElementName() == null)
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Document style message parts must define an element name: " + srcMessage.getQName());
+
+ // <part name="param" element="tns:SomeType" />
+ xmlName = srcPart.getElementName();
+ }
xmlName = destWsdl.registerQName(xmlName);
String key = srcMessage.getQName() + "->" + srcPart.getName();
@@ -720,21 +755,21 @@
return xmlName;
}
- private BindingOperation getBindingOperation(Definition srcWsdl, PortType srcPortType, Operation srcOperation)
+ private BindingOperation getBindingOperation(Definition srcWsdl, PortType srcPortType, Operation srcOperation) throws WSDLException
{
Binding srcBinding = getPortTypeBindings(srcWsdl).get(srcPortType.getQName());
if (srcBinding == null)
- throw new WSException("Cannot find binding for: " + srcPortType.getQName());
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find binding for: " + srcPortType.getQName());
String srcOperationName = srcOperation.getName();
BindingOperation srcBindingOperation = srcBinding.getBindingOperation(srcOperationName, null, null);
if (srcBindingOperation == null)
- throw new WSException("Cannot find binding operation for: " + srcOperationName);
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find binding operation for: " + srcOperationName);
return srcBindingOperation;
}
- private String getOperationStyle(Definition srcWsdl, PortType srcPortType, Operation srcOperation)
+ private String getOperationStyle(Definition srcWsdl, PortType srcPortType, Operation srcOperation) throws WSDLException
{
Binding srcBinding = getPortTypeBindings(srcWsdl).get(srcPortType.getQName());
BindingOperation srcBindingOperation = getBindingOperation(srcWsdl, srcPortType, srcOperation);
@@ -774,10 +809,10 @@
}
}
- return ("rpc".equals(operationStyle)) ? Constants.URI_STYLE_RPC : Constants.URI_STYLE_IRI;
+ return ("rpc".equals(operationStyle)) ? Constants.URI_STYLE_RPC : Constants.URI_STYLE_DOCUMENT;
}
- private boolean processBinding(Definition srcWsdl, Binding srcBinding)
+ private boolean processBinding(Definition srcWsdl, Binding srcBinding) throws WSDLException
{
QName srcBindingQName = srcBinding.getQName();
log.trace("processBinding: " + srcBindingQName);
@@ -787,7 +822,7 @@
{
PortType srcPortType = srcBinding.getPortType();
if (srcPortType == null)
- throw new WSException("Cannot find port type for binding: " + ncName);
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find port type for binding: " + ncName);
// Get binding type
String bindingType = null;
@@ -811,7 +846,7 @@
}
if (bindingType == null)
- throw new WSException("Cannot obtain binding type for: " + srcBindingQName);
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot obtain binding type for: " + srcBindingQName);
// Ignore unknown bindings
if (Constants.NS_SOAP11.equals(bindingType) == false && Constants.NS_SOAP12.equals(bindingType) == false)
@@ -889,7 +924,7 @@
return allBindings;
}
- private void processBindingOperations(Definition srcWsdl, WSDLBinding destBinding, Binding srcBinding, String bindingStyle)
+ private void processBindingOperations(Definition srcWsdl, WSDLBinding destBinding, Binding srcBinding, String bindingStyle) throws WSDLException
{
Iterator it = srcBinding.getBindingOperations().iterator();
while (it.hasNext())
@@ -899,7 +934,7 @@
}
}
- private void processBindingOperation(Definition srcWsdl, WSDLBinding destBinding, String bindingStyle, BindingOperation srcBindingOperation)
+ private void processBindingOperation(Definition srcWsdl, WSDLBinding destBinding, String bindingStyle, BindingOperation srcBindingOperation) throws WSDLException
{
String srcBindingName = srcBindingOperation.getName();
log.trace("processBindingOperation: " + srcBindingName);
@@ -955,7 +990,7 @@
}
private void processBindingInput(Definition srcWsdl, WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation,
- final BindingOperation srcBindingOperation, BindingInput srcBindingInput)
+ final BindingOperation srcBindingOperation, BindingInput srcBindingInput) throws WSDLException
{
log.trace("processBindingInput");
@@ -988,7 +1023,7 @@
}
private void processBindingOutput(Definition srcWsdl, WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation,
- final BindingOperation srcBindingOperation, BindingOutput srcBindingOutput)
+ final BindingOperation srcBindingOperation, BindingOutput srcBindingOutput) throws WSDLException
{
log.trace("processBindingInput");
@@ -1022,7 +1057,7 @@
}
private void processBindingReference(Definition srcWsdl, WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, QName soap11Body,
- List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback)
+ List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback) throws WSDLException
{
for (ExtensibilityElement extElement : extList)
{
@@ -1059,12 +1094,12 @@
}
if (elementName == null)
- throw new WSException("Could not determine element name from header: " + key);
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Could not determine element name from header: " + key);
WSDLSOAPHeader soapHeader = new WSDLSOAPHeader(elementName, headerPartName);
soapHeader.setIncludeInSignature(!isImplicitHeader);
reference.addSoapHeader(soapHeader);
- if (Constants.URI_STYLE_IRI == destIntfOperation.getStyle())
+ if (Constants.URI_STYLE_DOCUMENT == destIntfOperation.getStyle())
{
callback.removeReference(elementName);
}
@@ -1108,7 +1143,7 @@
{
QName xmlType = callback.getXmlType(name);
reference.addMimePart(new WSDLMIMEPart(name, xmlType, types));
- if (Constants.URI_STYLE_IRI == destIntfOperation.getStyle())
+ if (Constants.URI_STYLE_DOCUMENT == destIntfOperation.getStyle())
{
// A mime part must be defined as <part type="">
callback.removeReference(new QName(name));
@@ -1160,7 +1195,7 @@
}
}
- private void processServices(Definition srcWsdl)
+ private void processServices(Definition srcWsdl) throws WSDLException
{
log.trace("BEGIN processServices: " + srcWsdl.getDocumentBaseURI());
@@ -1202,7 +1237,7 @@
log.trace("END processServices: " + srcWsdl.getDocumentBaseURI());
}
- private void processPorts(Definition srcWsdl, WSDLService destService, Service srcService)
+ private void processPorts(Definition srcWsdl, WSDLService destService, Service srcService) throws WSDLException
{
Iterator it = srcService.getPorts().values().iterator();
while (it.hasNext())
@@ -1212,7 +1247,7 @@
}
}
- private void processPort(Definition srcWsdl, WSDLService destService, Port srcPort)
+ private void processPort(Definition srcWsdl, WSDLService destService, Port srcPort) throws WSDLException
{
log.trace("processPort: " + srcPort.getName());
@@ -1230,7 +1265,7 @@
/** Get the endpoint address from the ports extensible element
*/
- private String getSOAPAddress(Port srcPort)
+ private String getSOAPAddress(Port srcPort) throws WSDLException
{
String soapAddress = "dummy";
@@ -1259,7 +1294,7 @@
}
if (soapAddress == null)
- throw new WSException("Cannot obtain SOAP address");
+ throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot obtain SOAP address");
return soapAddress;
}
Modified: trunk/jbossws-tests/.classpath
===================================================================
--- trunk/jbossws-tests/.classpath 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/.classpath 2007-01-10 15:28:42 UTC (rev 1900)
@@ -41,5 +41,10 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-jaxrpc.jar"/>
+ <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-jaxws.jar"/>
+ <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-saaj.jar"/>
+ <classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-client.jar"/>
+ <classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-core.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-10 15:28:42 UTC (rev 1900)
@@ -918,6 +918,20 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1427 -->
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1427/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1427/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1427/META-INF">
+ <include name="webservices.xml"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -66,7 +66,7 @@
// check the echoString operation
WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperation(new NCName("echoString"));
- assertEquals(Constants.URI_STYLE_IRI, wsdlOperation.getStyle());
+ assertEquals(Constants.URI_STYLE_DOCUMENT, wsdlOperation.getStyle());
WSDLInterfaceOperationInput wsdlInput = wsdlOperation.getInput(new QName(TARGET_NAMESPACE, "echoString"));
assertEquals(new QName(TARGET_NAMESPACE, "echoString"), wsdlInput.getXMLType());
@@ -75,7 +75,7 @@
// check the echoSimpleUserType operation
wsdlOperation = wsdlInterface.getOperation(new NCName("echoSimpleUserType"));
- assertEquals(Constants.URI_STYLE_IRI, wsdlOperation.getStyle());
+ assertEquals(Constants.URI_STYLE_DOCUMENT, wsdlOperation.getStyle());
wsdlInput = wsdlOperation.getInput(new QName(TARGET_NAMESPACE, "echoSimpleUserType"));
assertEquals(new QName(TARGET_NAMESPACE, "echoSimpleUserType"), wsdlInput.getXMLType());
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java (from rev 1875, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1427/JBWS1427TestCase.java)
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1427/JBWS1427TestCase.java 2007-01-09 15:04:03 UTC (rev 1875)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,98 @@
+/*
+ * 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.jbws1427;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.test.ws.jaxrpc.jbws1427.interfaces.RequestService;
+import org.jboss.test.ws.jaxrpc.jbws1427.services.Message;
+import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+
+/**
+ *
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 09-Jan-2007
+ */
+public class JBWS1427TestCase extends JBossWSTest
+{
+ private static RequestService port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1427TestCase.class, "jaxrpc-jbws1427.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim");
+ Service service = factory.createService(wsdlURL, serviceName , mappingURL);
+ port = (RequestService)service.getPort(RequestService.class);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/SubmitRequestEJB");
+ }
+ }
+
+ public final void testWsdlParser() throws Exception
+ {
+ if (isTargetJBoss50())
+ {
+ System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
+ return;
+ }
+
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ File wsdlFile = new File("resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl");
+ assertTrue("File exists: " + wsdlFile, wsdlFile.exists());
+
+ factory.parse(wsdlFile.toURL());
+ }
+
+ public final void testEndpointAccess() throws Exception
+ {
+ if (isTargetJBoss50())
+ {
+ System.out.println("FIXME: [JBAS-3817] Fix EJB2.1 deployments");
+ return;
+ }
+
+ Message inObj = new Message("Kermit", new Integer(100));
+ Message retObj = port.processClaim(inObj);
+ assertEquals(inObj, retObj);
+ }
+}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/interfaces/RequestService.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/interfaces/RequestService.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/interfaces/RequestService.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,33 @@
+/*
+ * 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.jbws1427.interfaces;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import org.jboss.test.ws.jaxrpc.jbws1427.services.Message;
+
+
+public interface RequestService extends Remote
+{
+ public Message processClaim(Message messsge) throws RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/interfaces/RequestService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/Message.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/Message.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/Message.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,76 @@
+/*
+ * 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.jbws1427.services;
+
+public class Message
+{
+ private String name;
+ private Integer status;
+
+ public Message()
+ {
+ }
+
+ public Message(String name, Integer status)
+ {
+ this.name = name;
+ this.status = status;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public Integer getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(Integer status)
+ {
+ this.status = status;
+ }
+
+ public int hashCode()
+ {
+ return toString().hashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (this == obj) return true;
+ if (!(obj instanceof Message)) return false;
+ Message other = (Message)obj;
+ return toString().equals(other.toString());
+ }
+
+ public String toString()
+ {
+ return "[name=" + name + ",status=" + status + "]";
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/Message.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/RequestServiceEJB.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/RequestServiceEJB.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/RequestServiceEJB.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,64 @@
+/*
+ * 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.jbws1427.services;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.ws.jaxrpc.jbws1427.interfaces.RequestService;
+
+public class RequestServiceEJB implements SessionBean, RequestService
+{
+ private Logger logger = Logger.getLogger(this.getClass());
+
+ public Message processClaim(Message message) throws RemoteException
+ {
+ logger.info("Executing business logic:" + message);
+ return message;
+ }
+
+ // including the normal ejbActivate, ejbCreate etc with empty implementations
+
+ public void ejbCreate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbActivate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbPassivate() throws EJBException, RemoteException
+ {
+ }
+
+ public void ejbRemove() throws EJBException, RemoteException
+ {
+ }
+
+ public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException
+ {
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1427/services/RequestServiceEJB.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java 2007-01-10 15:08:47 UTC (rev 1899)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/WSDL11Validator.java 2007-01-10 15:28:42 UTC (rev 1900)
@@ -208,8 +208,8 @@
return true;
//Check if there is a property
- WSDLProperty wprop1 = in1.getProperty(Constants.WSDL_PROPERTY_RPC_XMLTYPE);
- WSDLProperty wprop2 = in2.getProperty(Constants.WSDL_PROPERTY_RPC_XMLTYPE);
+ WSDLProperty wprop1 = in1.getProperty(Constants.WSDL_PROPERTY_PART_XMLTYPE);
+ WSDLProperty wprop2 = in2.getProperty(Constants.WSDL_PROPERTY_PART_XMLTYPE);
QName el1 = in1.getElement();
QName el2 = in2.getElement();
Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427 (from rev 1875, trunk/jbossws-tests/src/main/resources/tools/jbws1427)
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/ejb-jar.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1427/META-INF/ejb-jar.xml 2007-01-09 15:04:03 UTC (rev 1875)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/ejb-jar.xml 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,14 @@
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+ <enterprise-beans>
+ <session>
+ <ejb-name>SubmitRequestEJB</ejb-name>
+ <service-endpoint>org.jboss.test.ws.jaxrpc.jbws1427.interfaces.RequestService</service-endpoint>
+ <ejb-class>org.jboss.test.ws.jaxrpc.jbws1427.services.RequestServiceEJB</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1427/META-INF/jaxrpc-mapping.xml 2007-01-09 15:04:03 UTC (rev 1875)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,57 @@
+<?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.jaxrpc.jbws1427.interfaces</package-type>
+ <namespaceURI>http://za.co.testws.interfaces/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1427.interfaces</package-type>
+ <namespaceURI>http://za.co.testws.interfaces</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1427.services.Message</java-type>
+ <root-type-qname xmlns:typeNS="http://za.co.testws.interfaces/types"> typeNS:Message </root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>status</java-variable-name>
+ <xml-element-name>status</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface> org.jboss.test.ws.jaxrpc.jbws1427.ProcessClaim </service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://za.co.testws.interfaces"> serviceNS:ProcessClaim </wsdl-service-name>
+ <port-mapping>
+ <port-name>RequestServicePort</port-name>
+ <java-port-name>RequestServicePort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface> org.jboss.test.ws.jaxrpc.jbws1427.RequestService </service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://za.co.testws.interfaces"> portTypeNS:RequestService </wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://za.co.testws.interfaces"> bindingNS:RequestServiceBinding </wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>processClaim</java-method-name>
+ <wsdl-operation>processClaim</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>za.co.testws.services.Message</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://za.co.testws.interfaces"> wsdlMsgNS:RequestService_processClaim </wsdl-message>
+ <wsdl-message-part-name>Message_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value> za.co.testws.services.Message </method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://za.co.testws.interfaces"> wsdlMsgNS:RequestService_processClaimResponse </wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/webservices.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1427/META-INF/webservices.xml 2007-01-09 15:04:03 UTC (rev 1875)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/webservices.xml 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,20 @@
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:impl="http://za.co.testws.interfaces"
+ 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_web_services_1_1.xsd"
+ version="1.1">
+
+ <webservice-description>
+ <webservice-description-name>RequestServiceEJB</webservice-description-name>
+ <wsdl-file>META-INF/wsdl/ProcessClaim.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>RequestService</port-component-name>
+ <wsdl-port>impl:RequestServicePort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1427.interfaces.RequestService</service-endpoint-interface>
+ <service-impl-bean>
+ <ejb-link>SubmitRequestEJB</ejb-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1427/META-INF/wsdl/ProcessClaim.wsdl 2007-01-09 15:04:03 UTC (rev 1875)
+++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl 2007-01-10 15:28:42 UTC (rev 1900)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="processClaim" targetNamespace="http://za.co.testws.interfaces" xmlns:tns="http://za.co.testws.interfaces" xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns2="http://za.co.testws.interfaces/types">
+ <types>
+ <schema targetNamespace="http://za.co.testws.interfaces/types" xmlns:tns="http://za.co.testws.interfaces/types"
+ xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+ <complexType name="Message">
+ <sequence>
+ <element name="name" type="string"/>
+ <element name="status" type="soap11-enc:int"/>
+ </sequence>
+ </complexType>
+ <!-- Add these element definitions -->
+ <element name="message" type="tns:Message"/>
+ <element name="result" type="tns:Message"/>
+ </schema>
+ </types>
+ <message name="RequestService_processClaim">
+ <!--part name="Message_1" type="ns2:Message"/-->
+ <part name="Message_1" element="ns2:message"/>
+ </message>
+ <message name="RequestService_processClaimResponse">
+ <!--part name="result" type="ns2:Message"/-->
+ <part name="result" element="ns2:result"/>
+ </message>
+ <portType name="RequestServicePort">
+ <operation name="processClaim" parameterOrder="Message_1">
+ <input message="tns:RequestService_processClaim"/>
+ <output message="tns:RequestService_processClaimResponse"/>
+ </operation>
+ </portType>
+ <!-- Original wsdl contained this invalid port type reference
+ <binding name="RequestServiceBinding" type="tns:RequestService">
+ -->
+ <binding name="RequestServiceBinding" type="tns:RequestServicePort">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
+ <operation name="processClaim">
+ <soap:operation soapAction="http://za.co.testws.interfaces/processClaim" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"/>
+ <input>
+ <soap:body use="literal" namespace="http://za.co.testws.interfaces"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://za.co.testws.interfaces"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="ProcessClaim">
+ <port name="RequestServicePort" binding="tns:RequestServiceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1427/META-INF/wsdl/ProcessClaim.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1899 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-10 10:08:47 -0500 (Wed, 10 Jan 2007)
New Revision: 1899
Removed:
branches/dlofthouse/JBWS-810/
Log:
Branch no longer required.
18 years
- 1
- 0
JBossWS SVN: r1898 - in trunk: 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 10:07:59 -0500 (Wed, 10 Jan 2007)
New Revision: 1898
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
trunk/jbossws-tests/src/main/resources/tools/jbws810/
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml
Removed:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-810 - WSDL to Java handling for simple types.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-10 14:55:22 UTC (rev 1897)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-10 15:07:59 UTC (rev 1898)
@@ -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();
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810 (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,76 +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.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();
- }
-
-}
Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java)
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810 (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810)
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,51 +0,0 @@
-<?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
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook.wsdl)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java 2007-01-10 15:07:59 UTC (rev 1898)
@@ -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.jbws810;
-
-public interface PhoneBook_PortType extends java.rmi.Remote {
- public java.lang.String lookup(java.lang.String parameters) throws
- java.rmi.RemoteException;
-}
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/PhoneBook_PortType.java)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,38 +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.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>
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/jaxrpc-mapping.xml)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws810/document/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/document/wstools-config.xml)
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,49 +0,0 @@
-<?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
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook.wsdl)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java 2007-01-10 15:07:59 UTC (rev 1898)
@@ -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.jbws810;
-
-public interface PhoneBook_PortType extends java.rmi.Remote {
- public java.lang.String lookup(java.lang.String person_1) throws
- java.rmi.RemoteException;
-}
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/PhoneBook_PortType.java)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,38 +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.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>
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/jaxrpc-mapping.xml)
Deleted: trunk/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:33:30 UTC (rev 1896)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml 2007-01-10 15:07:59 UTC (rev 1898)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws810/rpc/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: trunk/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml (from rev 1896, branches/dlofthouse/JBWS-810/jbossws-tests/src/main/resources/tools/jbws810/rpc/wstools-config.xml)
18 years
- 1
- 0
JBossWS SVN: r1897 - branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 09:55:22 -0500 (Wed, 10 Jan 2007)
New Revision: 1897
Modified:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
Log:
Strict integration target
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-10 14:33:30 UTC (rev 1896)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-10 14:55:22 UTC (rev 1897)
@@ -154,10 +154,7 @@
throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
if (jbossVersion.equals(integrationTarget) == false)
- {
- log.warn("Integration target mismatch, using: " + jbossVersion);
- integrationTarget = jbossVersion;
- }
+ throw new IllegalStateException("Integration target mismatch, jboss version: " + jbossVersion);
}
catch (Exception ex)
{
18 years
- 1
- 0