JBossWS SVN: r2974 - branches/jbossws-1.2.0.SP1-JBWS-1643/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-05-06 02:43:01 -0400 (Sun, 06 May 2007)
New Revision: 2974
Modified:
branches/jbossws-1.2.0.SP1-JBWS-1643/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
Log:
Actually there are 2 wsdls but this test case was testing for 1, so fixed it!
Modified: branches/jbossws-1.2.0.SP1-JBWS-1643/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.2.0.SP1-JBWS-1643/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-05-05 21:30:39 UTC (rev 2973)
+++ branches/jbossws-1.2.0.SP1-JBWS-1643/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-05-06 06:43:01 UTC (rev 2974)
@@ -35,6 +35,7 @@
/**
*
* @author darran.lofthouse(a)jboss.com
+ * @author mageshbk(a)jboss.com
* @since 19-October-2006
*/
public class TestEndpointImpl implements TestEndpoint
@@ -60,7 +61,7 @@
}
});
- assertEquals("WSDL files found", 1, wsdls.length);
+ assertEquals("WSDL files found", 2, wsdls.length);
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdl;
@@ -74,10 +75,10 @@
}
WSDLService[] services = wsdl.getServices();
- assertEquals("No of services", 1, services.length);
+ assertEquals("No of services", 2, services.length);
WSDLEndpoint[] endpoints = services[0].getEndpoints();
- assertEquals("No of endpoints", 1, endpoints.length);
+ assertEquals("No of endpoints", 2, endpoints.length);
String address = endpoints[0].getAddress();
assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
17 years
- 1
- 0
JBossWS SVN: r2973 - in branches/JBWS-856/jbossws-tests/src: java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: maeste
Date: 2007-05-05 17:30:39 -0400 (Sat, 05 May 2007)
New Revision: 2973
Added:
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/META-INF/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/META-INF/jboss-wsse-client.xml
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/WEB-INF/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/META-INF/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/META-INF/jboss-wsse-client.xml
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/WEB-INF/
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/WEB-INF/jboss-wsse-server.xml
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/wsse.keystore
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/wsse.truststore
Log:
Added sample for security policy. It have to be cleaned and tested.
Added: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java
===================================================================
--- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,45 @@
+/*
+ * 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.jaxws.samples.wssecuritypolicy;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
+
+@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public class HelloJavaBean
+{
+ private Logger log = Logger.getLogger(HelloJavaBean.class);
+
+ @WebMethod
+ public UserType echoUserType(@WebParam(name = "user") UserType in0)
+ {
+ log.info(in0);
+ return in0;
+ }
+}
Added: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
===================================================================
--- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,86 @@
+/*
+ * 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.jaxws.samples.wssecuritypolicy;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.jaxws.client.ServiceExt;
+
+/**
+ * Test WS-Security with RPC/Literal
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ * @version $Revision: 2385 $
+ */
+public class SimpleEncryptTestCase extends JBossWSTest
+{
+ /** Construct the test case with a given name
+ */
+
+ /** Deploy the test */
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war");
+ }
+
+ /**
+ * Test JSE endpoint
+ */
+ public void testEndpoint() throws Exception
+ {
+ Hello hello = getPort();
+
+ UserType in0 = new UserType();
+ in0.setMsg("Kermit");
+ UserType retObj = hello.echoUserType(in0);
+ assertEquals("Kermit", retObj.getMsg());
+ }
+
+ private Hello getPort() throws Exception
+ {
+ URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
+ URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm());
+
+ Hello port = (Hello)service.getPort(Hello.class);
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
+ reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-encrypt");
+
+ return port;
+ }
+}
\ No newline at end of file
Added: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java
===================================================================
--- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,82 @@
+/*
+ * 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.jaxws.samples.wssecuritypolicy;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.StubExt;
+import org.jboss.ws.core.jaxws.client.ServiceExt;
+
+/**
+ * Test WS-Security with RPC/Literal
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ */
+public class SimpleSignTestCase extends JBossWSTest
+{
+ /** Deploy the test */
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war");
+ }
+
+ /**
+ * Test JSE endpoint
+ */
+ public void testEndpoint() throws Exception
+ {
+ Hello hello = getPort();
+
+ UserType in0 = new UserType();
+ in0.setMsg("Kermit");
+ UserType retObj = hello.echoUserType(in0);
+ assertEquals("Kermit", retObj.getMsg());
+ }
+
+ private Hello getPort() throws Exception
+ {
+ URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
+ URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm());
+
+ Hello port = (Hello)service.getPort(Hello.class);
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+
+ Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext();
+ reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-sign");
+
+ return port;
+ }
+}
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:complexType name='UserType'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='msg' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='Hello_echoUserType'>
+ <part name='user' type='tns:UserType'/>
+ </message>
+ <message name='Hello_echoUserTypeResponse'>
+ <part name='return' type='tns:UserType'/>
+ </message>
+ <portType name='Hello'>
+ <operation name='echoUserType' parameterOrder='user'>
+ <input message='tns:Hello_echoUserType'/>
+ <output message='tns:Hello_echoUserTypeResponse'/>
+ </operation>
+ </portType>
+ <binding name='HelloBinding' type='tns:Hello'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoUserType'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='HelloService'>
+ <port binding='tns:HelloBinding' name='HelloPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc"
+ xmlns:tns="http://org.jboss.ws/jaxrpc"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:fab="http://www.fabrikam123.example.com/stock"
+ xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd""
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." >
+ <wsp:Policy wsu:Id="X509EndpointPolicy" >
+ <sp:jboss-ws-security>
+ <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file>
+ <sp:key-store-password>jbossws</sp:key-store-password>
+ <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file>
+ <sp:trust-store-password>jbossws</sp:trust-store-password>
+ <sp:config>
+ <sp:encrypt type="x509v3" alias="wsse"/>
+ <sp:requires>
+ <sp:encryption/>
+ </sp:requires>
+ </sp:config>
+ </sp:jboss-ws-security>
+ </wsp:Policy>
+ <binding name='HelloBinding' type='tns:Hello'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" />
+ <operation name='echoUserType'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='HelloService'>
+ <port binding='tns:HelloBinding' name='HelloPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,17 @@
+<?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>HelloService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/META-INF/jboss-wsse-client.xml (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <encrypt type="x509v3" alias="wsse"/>
+ <requires>
+ <encryption/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/META-INF/jboss-wsse-client.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/META-INF/jboss-wsse-client.xml (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/META-INF/jboss-wsse-client.xml 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/WEB-INF/jboss-wsse-server.xml
===================================================================
--- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/WEB-INF/jboss-wsse-server.xml 2007-05-05 21:30:39 UTC (rev 2973)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>WEB-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/wsse.keystore
===================================================================
(Binary files differ)
Property changes on: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/wsse.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/wsse.truststore
===================================================================
(Binary files differ)
Property changes on: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/wsse.truststore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years
- 1
- 0
JBossWS SVN: r2972 - in trunk: jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-05 15:57:08 -0400 (Sat, 05 May 2007)
New Revision: 2972
Modified:
trunk/integration/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
Log:
Fix failing JBWS-1190 test cases.
Modified: trunk/integration/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java
===================================================================
--- trunk/integration/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java 2007-05-05 19:26:51 UTC (rev 2971)
+++ trunk/integration/src/main/java/org/jboss/ws/integration/management/ServerConfigImpl.java 2007-05-05 19:57:08 UTC (rev 2972)
@@ -133,10 +133,10 @@
public int getWebServicePort()
{
- if (webServicePort == 0)
+ if (webServicePort <= 0)
webServicePort = getConnectorPort("HTTP/1.1", false);
- if (webServicePort == 0)
+ if (webServicePort <= 0)
{
log.warn("Unable to calculate 'WebServicePort', using default '8080'");
webServicePort = 8080;
@@ -147,10 +147,10 @@
public int getWebServiceSecurePort()
{
- if (webServiceSecurePort == 0)
+ if (webServiceSecurePort <= 0)
webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
- if (webServiceSecurePort == 0)
+ if (webServiceSecurePort <= 0)
{
log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'");
webServiceSecurePort = 8443;
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-05-05 19:26:51 UTC (rev 2971)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-05-05 19:57:08 UTC (rev 2972)
@@ -80,8 +80,8 @@
assertEquals("No of endpoints", 1, endpoints.length);
String address = endpoints[0].getAddress();
- assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.indexOf(":" + port + "/") > -1);
+ assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://"));
+ assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1);
}
private void assertEquals(final String message, final int expected, final int actual)
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-05-05 19:26:51 UTC (rev 2971)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-05-05 19:57:08 UTC (rev 2972)
@@ -42,7 +42,7 @@
* @author darran.lofthouse(a)jboss.com
* @since 19-October-2006
*/
-@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint", targetNamespace = "http://org.jboss/test/ws/jbws1190", name="Test")
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint", targetNamespace = "http://org.jboss/test/ws/jbws1190", name = "Test")
public class TestEndpointImpl implements TestEndpoint
{
@@ -66,7 +66,15 @@
}
});
- assertEquals("WSDL files found", 1, wsdls.length);
+ File wsdlFile = null;
+ for (int i = 0; i < wsdls.length; i++)
+ {
+ if (wsdlFile == null || wsdls[i].compareTo(wsdlFile) > 0)
+ {
+ wsdlFile = wsdls[i];
+ }
+ }
+ assertTrue("No WSDL files found", wsdlFile != null);
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdl;
@@ -86,8 +94,8 @@
assertEquals("No of endpoints", 1, endpoints.length);
String address = endpoints[0].getAddress();
- assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
+ assertTrue("Expected Scheme '" + scheme + "' from address '" + address + "'", address.startsWith(scheme + "://"));
+ assertTrue("Expected Port '" + port + "' from address '" + address + "'", address.indexOf(":" + port + "/") > -1);
}
private void assertEquals(final String message, final int expected, final int actual)
17 years
- 1
- 0
JBossWS SVN: r2971 - branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-05 15:26:51 -0400 (Sat, 05 May 2007)
New Revision: 2971
Removed:
branches/dlofthouse/JBWS-1625/
Log:
Branch no longer required.
17 years
- 1
- 0
JBossWS SVN: r2970 - in branches/jbossws-2.0: jbossws-tests/src/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-05 14:28:29 -0400 (Sat, 05 May 2007)
New Revision: 2970
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
Log:
JBWS-1625 - Calling SOAPPart.setContent() with a DOMSource containing an Element which is a SOAPElement the contents of the body are added twice.
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-05 18:27:51 UTC (rev 2969)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-05 18:28:29 UTC (rev 2970)
@@ -110,7 +110,8 @@
if (domElement == null)
throw new IllegalArgumentException("Source node cannot be null");
- if (domElement instanceof SOAPElement)
+ // Can only use this optimization if we are doing a deep copy.
+ if (domElement instanceof SOAPElement && deep==true)
return (SOAPElement)domElement;
String localName = domElement.getLocalName();
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-05 18:27:51 UTC (rev 2969)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-05 18:28:29 UTC (rev 2970)
@@ -33,6 +33,7 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import org.jboss.test.ws.JBossWSTest;
@@ -127,7 +128,7 @@
assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI());
}
- public void testSetContentOnSOAPPart() throws Exception
+ public void testSetContentOnSOAPPart_StreamSource() throws Exception
{
String expMsg =
"<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
@@ -153,6 +154,34 @@
assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg));
}
+ public void testSetContentOnSOAPPart_DOMSource() throws Exception
+ {
+ String expMsg =
+ "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <soapenv:Header/>" +
+ " <soapenv:Body>" +
+ " <HelloResponse xmlns='http://helloservice.org/types\'>" +
+ " <argument>responseBean</argument>" +
+ " </HelloResponse>" +
+ " </soapenv:Body>" +
+ "</soapenv:Envelope>";
+
+ MessageFactory factory = new MessageFactoryImpl();
+
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(expMsg.getBytes());
+ SOAPMessage soapMsg = factory.createMessage(null, inputStream);
+
+ SOAPMessage message = factory.createMessage();
+ message.getSOAPPart().setContent(soapMsg.getSOAPPart().getContent());
+ message.saveChanges();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ message.writeTo(baos);
+ String wasMsg = new String(baos.toByteArray());
+
+ assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg));
+ }
+
// [JBWS-1511] MessageFactory does not preserve comments
public void testPreserveComments() throws Exception
{
17 years
- 1
- 0
JBossWS SVN: r2969 - in trunk: jbossws-tests/src/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-05 14:27:51 -0400 (Sat, 05 May 2007)
New Revision: 2969
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
Log:
JBWS-1625 - Calling SOAPPart.setContent() with a DOMSource containing an Element which is a SOAPElement the contents of the body are added twice.
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-05 11:16:05 UTC (rev 2968)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2007-05-05 18:27:51 UTC (rev 2969)
@@ -110,7 +110,8 @@
if (domElement == null)
throw new IllegalArgumentException("Source node cannot be null");
- if (domElement instanceof SOAPElement)
+ // Can only use this optimization if we are doing a deep copy.
+ if (domElement instanceof SOAPElement && deep==true)
return (SOAPElement)domElement;
String localName = domElement.getLocalName();
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-05 11:16:05 UTC (rev 2968)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-05-05 18:27:51 UTC (rev 2969)
@@ -33,6 +33,7 @@
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import org.jboss.test.ws.JBossWSTest;
@@ -127,7 +128,7 @@
assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI());
}
- public void testSetContentOnSOAPPart() throws Exception
+ public void testSetContentOnSOAPPart_StreamSource() throws Exception
{
String expMsg =
"<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
@@ -153,6 +154,34 @@
assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg));
}
+ public void testSetContentOnSOAPPart_DOMSource() throws Exception
+ {
+ String expMsg =
+ "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <soapenv:Header/>" +
+ " <soapenv:Body>" +
+ " <HelloResponse xmlns='http://helloservice.org/types\'>" +
+ " <argument>responseBean</argument>" +
+ " </HelloResponse>" +
+ " </soapenv:Body>" +
+ "</soapenv:Envelope>";
+
+ MessageFactory factory = new MessageFactoryImpl();
+
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(expMsg.getBytes());
+ SOAPMessage soapMsg = factory.createMessage(null, inputStream);
+
+ SOAPMessage message = factory.createMessage();
+ message.getSOAPPart().setContent(soapMsg.getSOAPPart().getContent());
+ message.saveChanges();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ message.writeTo(baos);
+ String wasMsg = new String(baos.toByteArray());
+
+ assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg));
+ }
+
// [JBWS-1511] MessageFactory does not preserve comments
public void testPreserveComments() throws Exception
{
17 years
- 1
- 0
JBossWS SVN: r2968 - in branches/JBWS-856: jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-05-05 07:16:05 -0400 (Sat, 05 May 2007)
New Revision: 2968
Modified:
branches/JBWS-856/build/ant-import/build-thirdparty.xml
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaExtension.java
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
Log:
- Modified the WSDLGenerator to deal with endpoint policies when generating the wsdl unified structure from the UMDM
- Apache Policy library added to classhpath
Modified: branches/JBWS-856/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/JBWS-856/build/ant-import/build-thirdparty.xml 2007-05-05 09:03:09 UTC (rev 2967)
+++ branches/JBWS-856/build/ant-import/build-thirdparty.xml 2007-05-05 11:16:05 UTC (rev 2968)
@@ -114,6 +114,7 @@
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
<pathelement location="${thirdparty.dir}/xalan.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
</path>
<!-- The compile classpath for jboss50 integration -->
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaExtension.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaExtension.java 2007-05-05 09:03:09 UTC (rev 2967)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaExtension.java 2007-05-05 11:16:05 UTC (rev 2968)
@@ -1,43 +1,53 @@
package org.jboss.ws.extensions.policy.metadata;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+
import org.apache.ws.policy.Policy;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.metadata.umdm.MetaDataExtension;
public class PolicyMetaExtension extends MetaDataExtension
{
-
- private Policy policy;
- private PolicyScopeLevel scope;
+ //Policies may be attached to a policy subject with different policy scopes
+ private Map<PolicyScopeLevel,Collection<Policy>> policies = new HashMap<PolicyScopeLevel,Collection<Policy>>();
-
public PolicyMetaExtension(String extensionNameSpace)
{
super(extensionNameSpace);
}
-
- public Policy getPolicy()
+ public void addPolicy(PolicyScopeLevel scope, Policy policy)
{
- return policy;
+ Collection<Policy> list;
+ if (!policies.containsKey(scope))
+ {
+ list = new LinkedList<Policy>();
+ policies.put(scope,list);
+ }
+ else
+ {
+ list = policies.get(scope);
+ }
+ list.add(policy);
}
-
- public void setPolicy(Policy policy)
+
+ public Collection<Policy> getPolicies(PolicyScopeLevel scope)
{
- this.policy = policy;
+ return policies.get(scope);
}
-
-
- public PolicyScopeLevel getScope()
+
+ public Collection<Policy> getAllPolicies()
{
- return scope;
+ Collection<Policy> list = new LinkedList<Policy>();
+ for (PolicyScopeLevel scope : policies.keySet())
+ {
+ list.addAll(policies.get(scope));
+ }
+ return list;
}
-
-
- public void setScope(PolicyScopeLevel scope)
- {
- this.scope = scope;
- }
-
+
}
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-05 09:03:09 UTC (rev 2967)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-05 11:16:05 UTC (rev 2968)
@@ -526,13 +526,16 @@
private void deployPolicy(Policy policy, PolicyScopeLevel scope, ExtensibleMetaData extMetaData)
{
- PolicyMetaExtension ext = new PolicyMetaExtension(Constants.URI_WS_POLICY);
+ PolicyMetaExtension ext = (PolicyMetaExtension)extMetaData.getExtension(Constants.URI_WS_POLICY);
+ if (ext == null)
+ {
+ ext = new PolicyMetaExtension(Constants.URI_WS_POLICY);
+ extMetaData.addExtension(ext);
+ }
try
{
Policy deployedPolicy = PolicyDeployer.getInstance().deployServerside(policy, extMetaData);
- ext.setPolicy(deployedPolicy);
- ext.setScope(scope);
- extMetaData.addExtension(ext);
+ ext.addPolicy(scope,deployedPolicy);
}
catch (UnsupportedPolicy e)
{
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-05 09:03:09 UTC (rev 2967)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-05 11:16:05 UTC (rev 2968)
@@ -174,9 +174,6 @@
MetaDataBuilder.replaceAddressLocation(sepMetaData);
- //POL-2
- //TODO!!!
-
processEndpointMetaDataExtensions(sepMetaData, wsdlDefinitions);
// init service endpoint id
@@ -361,17 +358,14 @@
//since we need to look for policies, eventually choose the supported
//policy alternatives and generate the final wsdl
//serviceMetaData.setWsdlLocation(wsdlLocation);
-
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlLocation);
+ processPolicyMetaDataExtension(epMetaData, wsdlDefinitions);
if (policyLocation == null)
{
//process wsdl fragment with additional policies
WSDLDefinitions policyDefinitions = factory.parse(policyLocation);
+ processPolicyMetaDataExtension(epMetaData, policyDefinitions);
}
-
- //POL-1
- //TODO!!!
-
//generate the wsdl4j model again for the actual UMDM containing policy data
WSDLDefinitions actualWsdlDefinitions = generator.generate(serviceMetaData);
writeWsdl(serviceMetaData,actualWsdlDefinitions,epMetaData);
@@ -388,10 +382,7 @@
else
{
WSDLDefinitions policyDefinitions = factory.parse(policyLocation);
-
- //POL-1
- //TODO!!!
-
+ processPolicyMetaDataExtension(epMetaData, policyDefinitions);
//generate the wsdl4j model again for the actual UMDM containing policy data
WSDLDefinitions actualWsdlDefinitions = generator.generate(serviceMetaData);
writeWsdl(serviceMetaData,actualWsdlDefinitions,epMetaData);
Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java
===================================================================
--- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-05-05 09:03:09 UTC (rev 2967)
+++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2007-05-05 11:16:05 UTC (rev 2968)
@@ -21,18 +21,28 @@
*/
package org.jboss.ws.tools.wsdl;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
+import org.apache.ws.policy.Policy;
+import org.apache.ws.policy.util.PolicyFactory;
+import org.apache.ws.policy.util.PolicyWriter;
import org.jboss.ws.Constants;
import org.jboss.ws.core.jaxrpc.Style;
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.FaultMetaData;
+import org.jboss.ws.metadata.umdm.MetaDataExtension;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
+import org.jboss.ws.metadata.wsdl.Extendable;
import org.jboss.ws.metadata.wsdl.WSDLBinding;
import org.jboss.ws.metadata.wsdl.WSDLBindingFault;
import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
@@ -40,6 +50,7 @@
import org.jboss.ws.metadata.wsdl.WSDLBindingOperationOutput;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
+import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement;
import org.jboss.ws.metadata.wsdl.WSDLImport;
import org.jboss.ws.metadata.wsdl.WSDLInterface;
import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault;
@@ -47,11 +58,13 @@
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput;
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault;
import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput;
+import org.jboss.ws.metadata.wsdl.WSDLProperty;
import org.jboss.ws.metadata.wsdl.WSDLRPCPart;
import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem;
import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader;
import org.jboss.ws.metadata.wsdl.WSDLService;
import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction;
+import org.w3c.dom.Element;
/**
@@ -97,6 +110,28 @@
{
processOperation(wsdlInterface, wsdlBinding, operation);
}
+
+ //Policies
+ MetaDataExtension ext = endpoint.getExtension(Constants.URI_WS_POLICY);
+ if (ext != null)
+ {
+ PolicyMetaExtension policyExt = (PolicyMetaExtension)ext;
+ for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT))
+ {
+ addPolicyDefinition(policy);
+ addPolicyReference(policy, wsdlEndpoint);
+ }
+ for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_PORT_TYPE))
+ {
+ addPolicyDefinition(policy);
+ addPolicyURIAttribute(policy, wsdlInterface);
+ }
+ for (Policy policy : policyExt.getPolicies(PolicyScopeLevel.WSDL_BINDING))
+ {
+ addPolicyDefinition(policy);
+ addPolicyReference(policy, wsdlBinding);
+ }
+ }
}
protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation)
@@ -341,4 +376,43 @@
return wsdl;
}
+
+ protected void addPolicyDefinition(Policy policy)
+ {
+ try
+ {
+ PolicyWriter writer = PolicyFactory.getPolicyWriter(PolicyFactory.StAX_POLICY_WRITER);
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ writer.writePolicy(policy, outputStream);
+ Element element = DOMUtils.parse(outputStream.toString(Constants.DEFAULT_XML_CHARSET));
+ WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICY, element);
+ wsdl.addExtensibilityElement(ext);
+ //optional: to obtain a better looking wsdl, register ws-policy
+ //prefix in wsdl:definitions if it is not defined there yet
+ if (wsdl.getPrefix(element.getNamespaceURI())==null)
+ {
+ wsdl.registerNamespaceURI(element.getNamespaceURI(),element.getPrefix());
+ }
+ }
+ catch (IOException ioe)
+ {
+ throw new RuntimeException("Error while converting policy to element!");
+ }
+ }
+
+ protected void addPolicyReference(Policy policy, Extendable extendable)
+ {
+ Element element = DOMUtils.createElement(Constants.WSDL_ELEMENT_POLICYREFERENCE,
+ wsdl.getPrefix(Constants.URI_WS_POLICY), Constants.URI_WS_POLICY);
+ element.setAttribute("URI", policy.getPolicyURI());
+ //TODO!! we need to understand if the policy is local or not...
+ WSDLExtensibilityElement ext = new WSDLExtensibilityElement(Constants.WSDL_ELEMENT_POLICYREFERENCE, element);
+ extendable.addExtensibilityElement(ext);
+ }
+
+ protected void addPolicyURIAttribute(Policy policy, Extendable extendable)
+ {
+ //TODO!! we need to understand if the policy is local or not...
+ extendable.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_POLICYURIS, policy.getPolicyURI()));
+ }
}
17 years
- 1
- 0
JBossWS SVN: r2967 - branches.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-05-05 05:03:09 -0400 (Sat, 05 May 2007)
New Revision: 2967
Added:
branches/jbossws-1.2.0.SP1-JBWS-1643/
Log:
made a copy
Copied: branches/jbossws-1.2.0.SP1-JBWS-1643 (from rev 2966, tags/jbossws-1.2.0.SP1)
17 years
- 1
- 0
JBossWS SVN: r2966 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/tools and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-04 16:46:21 -0400 (Fri, 04 May 2007)
New Revision: 2966
Added:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml
Removed:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java
Log:
JBWS-429 - WSDL to Java, JAX-RPC holder generation.
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-05-04 20:18:42 UTC (rev 2965)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,24 +1,24 @@
/*
-* 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;
import java.io.File;
@@ -92,10 +92,10 @@
private final Map primitiveMap = new HashMap();
- private final static Map<String,Class> schemaBasicTypes = new HashMap<String,Class>();
+ private final static Map<String, Class> schemaBasicTypes = new HashMap<String, Class>();
- private final static Map<Class,Class> holderTypes = new HashMap<Class,Class>();
- private final static Map<Class,Class> reverseHolderTypes = new HashMap<Class,Class>();
+ private final static Map<Class, Class> holderTypes = new HashMap<Class, Class>();
+ private final static Map<Class, Class> reverseHolderTypes = new HashMap<Class, Class>();
// Skip these methods when generating wsdl operations
private List<String> ignoredMethods;
@@ -119,55 +119,54 @@
static
{
- holderTypes.put(BigDecimal.class,BigDecimalHolder.class);
- holderTypes.put(BigInteger.class,BigIntegerHolder.class);
- holderTypes.put(boolean.class,BooleanHolder.class);
- holderTypes.put(Boolean.class,BooleanWrapperHolder.class);
- holderTypes.put(byte.class,ByteHolder.class);
- holderTypes.put(Byte.class,ByteWrapperHolder.class);
- holderTypes.put(Byte[].class,ByteArrayHolder.class);
- holderTypes.put(Calendar.class,CalendarHolder.class);
- holderTypes.put(double.class,DoubleHolder.class);
- holderTypes.put(Double.class,DoubleWrapperHolder.class);
+ holderTypes.put(BigDecimal.class, BigDecimalHolder.class);
+ holderTypes.put(BigInteger.class, BigIntegerHolder.class);
+ holderTypes.put(boolean.class, BooleanHolder.class);
+ holderTypes.put(Boolean.class, BooleanWrapperHolder.class);
+ holderTypes.put(byte.class, ByteHolder.class);
+ holderTypes.put(Byte.class, ByteWrapperHolder.class);
+ holderTypes.put(Byte[].class, ByteArrayHolder.class);
+ holderTypes.put(Calendar.class, CalendarHolder.class);
+ holderTypes.put(double.class, DoubleHolder.class);
+ holderTypes.put(Double.class, DoubleWrapperHolder.class);
holderTypes.put(float.class, FloatHolder.class);
holderTypes.put(Float.class, FloatWrapperHolder.class);
- holderTypes.put(int.class,IntHolder.class);
- holderTypes.put(Integer.class,IntegerWrapperHolder.class);
- holderTypes.put(long.class,LongHolder.class);
- holderTypes.put(Long.class,LongWrapperHolder.class);
- holderTypes.put(Object.class,ObjectHolder.class);
- holderTypes.put(QName.class,QNameHolder.class);
- holderTypes.put(short.class,ShortHolder.class);
- holderTypes.put(Short.class,ShortWrapperHolder.class);
- holderTypes.put(String.class,StringHolder.class);
+ holderTypes.put(int.class, IntHolder.class);
+ holderTypes.put(Integer.class, IntegerWrapperHolder.class);
+ holderTypes.put(long.class, LongHolder.class);
+ holderTypes.put(Long.class, LongWrapperHolder.class);
+ holderTypes.put(Object.class, ObjectHolder.class);
+ holderTypes.put(QName.class, QNameHolder.class);
+ holderTypes.put(short.class, ShortHolder.class);
+ holderTypes.put(Short.class, ShortWrapperHolder.class);
+ holderTypes.put(String.class, StringHolder.class);
}
static
{
- reverseHolderTypes.put(BigDecimalHolder.class , BigDecimal.class);
- reverseHolderTypes.put(BigIntegerHolder.class , BigInteger.class);
- reverseHolderTypes.put(BooleanHolder.class , boolean.class);
+ reverseHolderTypes.put(BigDecimalHolder.class, BigDecimal.class);
+ reverseHolderTypes.put(BigIntegerHolder.class, BigInteger.class);
+ reverseHolderTypes.put(BooleanHolder.class, boolean.class);
reverseHolderTypes.put(BooleanWrapperHolder.class, Boolean.class);
reverseHolderTypes.put(ByteArrayHolder.class, Byte[].class);
reverseHolderTypes.put(ByteHolder.class, byte.class);
- reverseHolderTypes.put(ByteWrapperHolder.class,Byte.class );
- reverseHolderTypes.put(CalendarHolder.class,Calendar.class);
- reverseHolderTypes.put(DoubleHolder.class,double.class );
- reverseHolderTypes.put(DoubleWrapperHolder.class,Double.class);
- reverseHolderTypes.put(FloatHolder.class,float.class);
+ reverseHolderTypes.put(ByteWrapperHolder.class, Byte.class);
+ reverseHolderTypes.put(CalendarHolder.class, Calendar.class);
+ reverseHolderTypes.put(DoubleHolder.class, double.class);
+ reverseHolderTypes.put(DoubleWrapperHolder.class, Double.class);
+ reverseHolderTypes.put(FloatHolder.class, float.class);
reverseHolderTypes.put(FloatWrapperHolder.class, Float.class);
- reverseHolderTypes.put(IntHolder.class,int.class );
- reverseHolderTypes.put(IntegerWrapperHolder.class,Integer.class );
+ reverseHolderTypes.put(IntHolder.class, int.class);
+ reverseHolderTypes.put(IntegerWrapperHolder.class, Integer.class);
reverseHolderTypes.put(LongHolder.class, long.class);
- reverseHolderTypes.put(LongWrapperHolder.class,Long.class);
- reverseHolderTypes.put(ObjectHolder.class,Object.class);
- reverseHolderTypes.put(QNameHolder.class,QName.class);
- reverseHolderTypes.put(ShortHolder.class,short.class);
- reverseHolderTypes.put(ShortWrapperHolder.class,Short.class);
- reverseHolderTypes.put(StringHolder.class,String.class);
+ reverseHolderTypes.put(LongWrapperHolder.class, Long.class);
+ reverseHolderTypes.put(ObjectHolder.class, Object.class);
+ reverseHolderTypes.put(QNameHolder.class, QName.class);
+ reverseHolderTypes.put(ShortHolder.class, short.class);
+ reverseHolderTypes.put(ShortWrapperHolder.class, Short.class);
+ reverseHolderTypes.put(StringHolder.class, String.class);
}
-
/**
* Singleton - Only way to get an instance
* @return
@@ -220,8 +219,7 @@
//Check baseType is xsd:anyType
if (baseType != null)
{
- if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD &&
- baseType.getName().equals("anyType"))
+ if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && baseType.getName().equals("anyType"))
bool = true; //Ignore this baseType
}
if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType())
@@ -233,7 +231,6 @@
}
-
/**
* Check if the class is a Java standard class
* @param cls
@@ -241,13 +238,14 @@
*/
public boolean checkIgnoreClass(Class cls)
{
- if(cls == null)
+ if (cls == null)
throw new IllegalArgumentException("Illegal null argument:cls");
//if (cls.isArray()) cls = cls.getComponentType();
if (!cls.isArray())
{
String pkgname = cls.getPackage() != null ? cls.getPackage().getName() : null;
- if (pkgname != null && pkgname.startsWith("java")) return true;
+ if (pkgname != null && pkgname.startsWith("java"))
+ return true;
if (ParameterWrapping.WrapperType.class.isAssignableFrom(cls))
return true;
@@ -256,7 +254,6 @@
return false;
}
-
/** Check if this method should be ignored
*/
public boolean checkIgnoreMethod(Method method)
@@ -287,7 +284,6 @@
return ignoreMethod;
}
-
/**
* Chop "PortType" at the end of the String
* @param name
@@ -296,7 +292,8 @@
public String chopPortType(String name)
{
int index = name.lastIndexOf("PortType");
- if (index > 0) return name.substring(0, index);
+ if (index > 0)
+ return name.substring(0, index);
return name;
}
@@ -310,7 +307,8 @@
public String chop(String name, String chopstr)
{
int index = name.lastIndexOf(chopstr);
- if (index > 0) return name.substring(0, index);
+ if (index > 0)
+ return name.substring(0, index);
return name;
}
@@ -321,9 +319,9 @@
*/
public File createPackage(String path, String packageName)
{
- if(packageName == null )
+ if (packageName == null)
throw new IllegalArgumentException("Illegal Null Argument: packageName");
- if(path == null)
+ if (path == null)
throw new IllegalArgumentException("Illegal Null Argument: path");
String pac = packageName.replace('.', '/');
File dir = new File(path + "/" + pac);
@@ -338,23 +336,22 @@
* @return
* @throws IOException Problem creating the file
*/
- public File createPhysicalFile(File loc, String fname)
- throws IOException
+ public File createPhysicalFile(File loc, String fname) throws IOException
{
- if(loc == null )
+ if (loc == null)
throw new IllegalArgumentException("Illegal Null Argument: loc");
- if(fname == null)
+ if (fname == null)
throw new IllegalArgumentException("Illegal Null Argument: fname");
- File sei = new File(loc.getAbsolutePath() + "/" + fname + ".java");
- //Delete the sei if already exists
- if (sei.exists()) sei.delete();
- boolean boolCreate = sei.createNewFile();
+ File javaFile = new File(loc.getAbsolutePath() + "/" + fname + ".java");
+ //Delete the javaFile if already exists
+ if (javaFile.exists())
+ javaFile.delete();
+ boolean boolCreate = javaFile.createNewFile();
if (!boolCreate)
- throw new WSException("SEI " + fname + ".java cannot be created");
- return sei;
+ throw new WSException(fname + ".java cannot be created");
+ return javaFile;
}
-
/**
* Create the basic template of a class
* @param pkgname Package Name
@@ -363,10 +360,7 @@
* @param importList Strings representing imports
* @return
*/
- public StringBuilder createClassBasicStructure(String pkgname,
- String fname,
- XSTypeDefinition type,
- List importList, String baseName)
+ public StringBuilder createClassBasicStructure(String pkgname, String fname, XSTypeDefinition type, List importList, String baseName)
{
StringBuilder buf = new StringBuilder();
writeJbossHeader(buf);
@@ -393,8 +387,7 @@
//Check baseType is xsd:anyType
if (baseType != null)
{
- if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD &&
- baseType.getName().equals("anyType"))
+ if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && baseType.getName().equals("anyType"))
baseType = null; //Ignore this baseType
}
if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType())
@@ -404,9 +397,9 @@
}
buf.append("public class " + fname);
- if(baseName == null && baseType != null)
+ if (baseName == null && baseType != null)
baseName = baseType.getName();
- if(baseName != null)
+ if (baseName != null)
buf.append(" extends " + baseName);
buf.append(newline);
buf.append("{");
@@ -421,7 +414,7 @@
* @param name Field name to check
* @return true - if public field exists, false-otherwise
*/
- public boolean doesPublicFieldExist( Class javaType, String name)
+ public boolean doesPublicFieldExist(Class javaType, String name)
{
Field fld = null;
try
@@ -442,7 +435,6 @@
return false;
}
-
/**
* Ensure that the first alphabet is uppercase
* @param fname
@@ -470,10 +462,11 @@
*/
public int getArrayDimension(Class arr)
{
- if(arr == null || arr.isArray() == false)
+ if (arr == null || arr.isArray() == false)
throw new IllegalArgumentException("Illegal null or array arg:arr");
int counter = 0;
- while(arr.isArray()) {
+ while (arr.isArray())
+ {
counter += 1;
arr = arr.getComponentType();
}
@@ -499,14 +492,12 @@
*/
public Class getJavaTypeForHolder(Class cls)
{
- if(Holder.class.isAssignableFrom(cls))
+ if (Holder.class.isAssignableFrom(cls))
return HolderUtils.getValueType(cls);
- else
- return cls;
+ else return cls;
//return reverseHolderTypes.get(cls);
}
-
/**
* An input of "HelloObjArray" is converted into arrayOfHelloObj
* Applied in the input part for WSDL 1.1 Messages
@@ -536,7 +527,8 @@
public static String getJustClassName(Class cls)
{
- if (cls == null) return null;
+ if (cls == null)
+ return null;
if (cls.isArray())
{
Class c = cls.getComponentType();
@@ -557,8 +549,7 @@
int index = classname.lastIndexOf(".");
if (index < 0)
index = 0;
- else
- index = index + 1;
+ else index = index + 1;
return classname.substring(index);
}
@@ -619,7 +610,8 @@
*/
public Class getJavaType(QName xmlType)
{
- if (xmlType == null) return null;
+ if (xmlType == null)
+ return null;
String localPart = xmlType.getLocalPart();
return (Class)schemaBasicTypes.get(localPart);
}
@@ -634,14 +626,13 @@
if (str == null || str.length() == 0)
throw new IllegalArgumentException("String passed to WSDLUtils.getMixedCase is null");
- if (str.length() == 1) return str.toUpperCase();
+ if (str.length() == 1)
+ return str.toUpperCase();
char[] charr = str.toCharArray();
charr[0] = Character.toUpperCase(charr[0]);
return new String(charr);
}
-
-
/**
* Given a QName, provide a string that is prefix:localpart
* @param qn
@@ -654,7 +645,8 @@
StringBuilder sb = new StringBuilder();
String prefix = qn.getPrefix();
String localpart = qn.getLocalPart();
- if (prefix == null || prefix == "") prefix = Constants.PREFIX_TNS;
+ if (prefix == null || prefix == "")
+ prefix = Constants.PREFIX_TNS;
sb.append(prefix + ":");
sb.append(localpart);
@@ -666,23 +658,22 @@
* @param formattedStr string that is prefix:localpart
* @return QName
*/
- public QName getQName( String formattedStr)
+ public QName getQName(String formattedStr)
{
QName qn = null;
int ind = formattedStr.lastIndexOf(":");
- if(ind < 0)
+ if (ind < 0)
throw new IllegalArgumentException("Formatted String is not of format prefix:localpart");
- String prefix = formattedStr.substring(0,ind);
+ String prefix = formattedStr.substring(0, ind);
String nsuri = null;
- if(Constants.PREFIX_XSD.equals(prefix)) nsuri = Constants.NS_SCHEMA_XSD;
- if(nsuri == null)
- qn = new QName( formattedStr.substring(ind+1) );
- else
- qn = new QName( nsuri,formattedStr.substring(ind+1),prefix);
+ if (Constants.PREFIX_XSD.equals(prefix))
+ nsuri = Constants.NS_SCHEMA_XSD;
+ if (nsuri == null)
+ qn = new QName(formattedStr.substring(ind + 1));
+ else qn = new QName(nsuri, formattedStr.substring(ind + 1), prefix);
return qn;
}
-
/**
* Return the primitive for a wrapper equivalent (Integer -> int)
* @param str
@@ -718,19 +709,20 @@
StringBuilder sb = new StringBuilder("http://");
//Generate tokens with '.' as delimiter
- StringTokenizer st = new StringTokenizer(packageName,".");
+ StringTokenizer st = new StringTokenizer(packageName, ".");
//Have a LIFO queue for the tokens
Stack<String> stk = new Stack<String>();
- while(st != null && st.hasMoreTokens())
+ while (st != null && st.hasMoreTokens())
{
stk.push(st.nextToken());
}
String next;
- while(!stk.isEmpty() && (next=stk.pop())!=null)
+ while (!stk.isEmpty() && (next = stk.pop()) != null)
{
- if(sb.toString().equals("http://") == false) sb.append(".");
+ if (sb.toString().equals("http://") == false)
+ sb.append(".");
sb.append(next);
}
@@ -751,26 +743,25 @@
WSDLInterface wi = wsdl.getInterfaces()[0];
WSDLInterfaceOperation wio = wi.getOperations()[0];
String style = wio.getStyle();
- if(style == null || style.equals(Constants.URI_STYLE_RPC) || "rpc".equalsIgnoreCase(style))
+ if (style == null || style.equals(Constants.URI_STYLE_RPC) || "rpc".equalsIgnoreCase(style))
return Constants.RPC_LITERAL;
- else
- return Constants.DOCUMENT_LITERAL;
+ else return Constants.DOCUMENT_LITERAL;
}
public static JBossXSModel getSchemaModel(WSDLTypes types)
{
if (types instanceof XSModelTypes)
- return ((XSModelTypes) types).getSchemaModel();
+ return ((XSModelTypes)types).getSchemaModel();
throw new WSException("WSDLTypes is not an XSModelTypes");
}
public static void addSchemaModel(WSDLTypes types, String namespace, JBossXSModel model)
{
- if (! (types instanceof XSModelTypes))
+ if (!(types instanceof XSModelTypes))
throw new WSException("WSDLTypes is not an XSModelTypes");
- XSModelTypes modelTypes = (XSModelTypes) types;
+ XSModelTypes modelTypes = (XSModelTypes)types;
modelTypes.addSchemaModel(namespace, model);
}
@@ -782,10 +773,10 @@
*/
public boolean isStandardHolder(Class cls)
{
- if(Holder.class.isAssignableFrom(cls) == false)
- return false; //Not even a holder
+ if (Holder.class.isAssignableFrom(cls) == false)
+ return false; //Not even a holder
//It is a holder. Is it a standard holder?
- if(cls.getPackage().getName().startsWith("javax.xml.rpc"))
+ if (cls.getPackage().getName().startsWith("javax.xml.rpc"))
return true;
return false;
}
@@ -861,8 +852,10 @@
switch (outputs.length)
{
- case 0: return null;
- case 1: return outputs[0];
+ case 0:
+ return null;
+ case 1:
+ return outputs[0];
}
throw new WSException("Only Request-Only and Request-Response MEPs are allowed");
@@ -876,8 +869,10 @@
switch (inputs.length)
{
- case 0: return null;
- case 1: return inputs[0];
+ case 0:
+ return null;
+ case 1:
+ return inputs[0];
}
throw new WSException("Only Request-Only and Request-Response MEPs are allowed");
Copied: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java (from rev 2911, trunk/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java)
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/HolderWriter.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,121 @@
+/*
+ * 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.ws.tools;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.HashMap;
+
+import javax.xml.rpc.holders.Holder;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.wsdl.WSDLUtils;
+
+/**
+ * Utility class to write JAX-RPC holders.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 11 Apr 2007
+ */
+public class HolderWriter
+{
+
+ private static final WSDLUtils utils = WSDLUtils.getInstance();
+
+ private static final String newline = "\n";
+
+ /**
+ * HashMap of the holders already generated so they do not need to be
+ * generated again.
+ */
+ private HashMap<String, String> createdHolders = new HashMap<String, String>();
+
+ String getOrCreateHolder(final String type, final File pkgLoc)
+ {
+
+ String fullHolderName = createdHolders.get(type);
+ if (fullHolderName == null)
+ {
+ StringBuilder buf = new StringBuilder();
+ fullHolderName = writeHolder(type, buf);
+
+ createdHolders.put(type, fullHolderName);
+
+ String holderName = fullHolderName.substring(fullHolderName.lastIndexOf('.') + 1);
+
+ try
+ {
+ File sei = utils.createPhysicalFile(pkgLoc, holderName);
+ FileWriter writer = new FileWriter(sei);
+ writer.write(buf.toString());
+ writer.flush();
+ writer.close();
+ }
+ catch (IOException e)
+ {
+ throw new WSException("Unable to create JAX-RPC holder.", e);
+ }
+ }
+
+ return fullHolderName;
+ }
+
+ private String writeHolder(final String type, final StringBuilder buf)
+ {
+ String pkg = type.substring(0, type.lastIndexOf('.'));
+ String typeName = type.substring(type.lastIndexOf('.') + 1);
+ String holderName = typeName + "Holder";
+
+ utils.writeJbossHeader(buf);
+ buf.append(newline);
+ buf.append("package ").append(pkg).append(";").append(newline);
+
+ buf.append(newline);
+ buf.append("public class ").append(holderName).append(" implements ").append(Holder.class.getName());
+ buf.append(newline).append("{").append(newline);
+
+ // Add the public member variable.
+ buf.append(newline);
+ buf.append(" public ").append(type).append(" value;");
+ buf.append(newline);
+
+ // Add the default constructor.
+ buf.append(newline);
+ buf.append(" ").append("public ").append(holderName).append("()").append(newline);
+ buf.append(" {").append(newline);
+ buf.append(" this.value = new ").append(type).append("();").append(newline);
+ buf.append(" }").append(newline);
+
+ // Add the second constructor.
+ buf.append(newline);
+ buf.append(" ").append("public ").append(holderName).append("(final ").append(type).append(" value)").append(newline);
+ buf.append(" {").append(newline);
+ buf.append(" this.value = value;").append(newline);
+ buf.append(" }").append(newline);
+ buf.append(newline);
+
+ buf.append("}").append(newline);
+ return pkg + "." + holderName;
+ }
+
+}
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-04 20:18:42 UTC (rev 2965)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -80,7 +80,6 @@
{
private String newline = "\n";
- //protected LiteralTypeMapping typeMapping = new LiteralTypeMapping();
protected LiteralTypeMapping typeMapping = null;
protected WSDLDefinitions wsdl = null;
@@ -90,14 +89,12 @@
*/
protected WSDLUtils utils = WSDLUtils.getInstance();
- //protected XSDToJavaIntf xsdJava = new XSDToJava();
-
//Feature Set
protected boolean annotate = false;
protected Map<String, String> namespacePackageMap = null;
- //private String wsdlStyle = Constants.RPC_LITERAL;
+ protected HolderWriter holderWriter = new HolderWriter();
private String seiPkgName = "";
@@ -378,12 +375,12 @@
boolean holder = false;
if (input != null && input.getElement() != null)
{
- QName xmlName = input.getElement();
+ QName xmlName = input.getElement();
holder = output != null && xmlName.equals(output.getElement());
-
+
appendParameters(paramBuffer, input, output, xmlName.getLocalPart());
}
-
+
if (!holder && output != null && output.getElement() != null)
{
QName xmlName = output.getElement();
@@ -569,8 +566,15 @@
if (className.charAt(0) == '>')
className = className.substring(1);
className = utils.firstLetterUpperCase(className);
- buf.append(seiPkgName + "." + className + arraySuffix);
+ className = seiPkgName + "." + className + arraySuffix;
+ if (holder)
+ {
+ className = holderWriter.getOrCreateHolder(className, getLocationForJavaGeneration());
+ }
+
+ buf.append(className);
+
if (xt instanceof XSComplexTypeDefinition)
generateJavaSource((XSComplexTypeDefinition)xt, xsmodel, containingElement);
}
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java 2007-05-04 20:18:42 UTC (rev 2965)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/XSDToJava.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -134,7 +134,7 @@
String nsuri = elmtype.getNamespace();
String tname = elmtype.getName();
if (tname != null) continue; //Consider only anon complex types
- //xsdJava.createJavaFile(ctype, dirloc, packageName, xsmodel, elmname);
+
createJavaFile(ctype, dirloc, packageName, xsmodel, elmname);
}
}
@@ -159,7 +159,6 @@
throw new IllegalArgumentException(str);
checkXSDTypeToJava();
xsdJava.createJavaFile(type,outerElementName, loc,pkgname,schema, false);
- //createJavaFile(type, schema);
}
private void checkXSDTypeToJava()
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429 (from rev 2911, trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429)
Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,131 +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.jbws429;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.WSToolsTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-429
- *
- * WSDL to Java, generation of custom holders.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 11 Apr 2007
- */
-public class JBWS429TestCase extends WSToolsTest
-{
-
- /**
- * Test WSDL to Java with the a document/literal endpoint
- * where the message part is the same for both the input
- * and output message.
- *
- */
- public void testGenerateDocLitInOut() throws Exception
- {
- generateScenario("doclit_inout");
- }
-
- /**
- * Test WSDL to Java with a rpc/literal endpoint
- * where a matching message part is in the request
- * and response messages.
- *
- */
- public void testGenerateRpcLitInOut() throws Exception
- {
- generateScenario("rpclit_inout");
- }
-
- /**
- * Test WSDL to Java with a rpc/literal endpoint
- * where there are multiple parts in the response
- * message so a holder is required.
- *
- */
- public void testGenerateRpcLitOut() throws Exception
- {
- generateScenario("rpclit_out");
- }
-
- protected void generateScenario(final String scenario) throws Exception
- {
- String resourceDir = "resources/tools/jbws429/" + scenario;
- String toolsDir = "tools/jbws429/" + scenario;
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws429/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java (from rev 2911, trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,131 @@
+/*
+ * 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.jbws429;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.WSToolsTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-429
+ *
+ * WSDL to Java, generation of custom holders.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 11 Apr 2007
+ */
+public class JBWS429TestCase extends WSToolsTest
+{
+
+ /**
+ * Test WSDL to Java with the a document/literal endpoint
+ * where the message part is the same for both the input
+ * and output message.
+ *
+ */
+ public void testGenerateDocLitInOut() throws Exception
+ {
+ generateScenario("doclit_inout");
+ }
+
+ /**
+ * Test WSDL to Java with a rpc/literal endpoint
+ * where a matching message part is in the request
+ * and response messages.
+ *
+ */
+ public void testGenerateRpcLitInOut() throws Exception
+ {
+ generateScenario("rpclit_inout");
+ }
+
+ /**
+ * Test WSDL to Java with a rpc/literal endpoint
+ * where there are multiple parts in the response
+ * message so a holder is required.
+ *
+ */
+ public void testGenerateRpcLitOut() throws Exception
+ {
+ generateScenario("rpclit_out");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws429/" + scenario;
+ String toolsDir = "tools/jbws429/" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws429/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429 (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429)
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout)
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:01:45 CEST 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.jbws429;
-
-
-public class Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/Person.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:01:45 CEST 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.jbws429;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:01:45 CEST 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.jbws429;
-
-public class PersonHolder implements javax.xml.rpc.holders.Holder
-{
-
- public org.jboss.test.ws.jbws429.Person value;
-
- public PersonHolder()
- {
- this.value = new org.jboss.test.ws.jbws429.Person();
- }
-
- public PersonHolder(final org.jboss.test.ws.jbws429.Person value)
- {
- this.value = value;
- }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PersonHolder.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:01:45 CEST 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.jbws429;
+
+public class PersonHolder implements javax.xml.rpc.holders.Holder
+{
+
+ public org.jboss.test.ws.jbws429.Person value;
+
+ public PersonHolder()
+ {
+ this.value = new org.jboss.test.ws.jbws429.Person();
+ }
+
+ public PersonHolder(final org.jboss.test.ws.jbws429.Person value)
+ {
+ this.value = value;
+ }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws429/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws429'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws429/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws429/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='lookup'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookup' name='lookup'/>
- </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>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws429/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws429'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws429/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws429/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='lookup'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookup' name='lookup'/>
+ </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>
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:01:45 CEST 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.jbws429;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public void lookup(org.jboss.test.ws.jbws429.PersonHolder lookup) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:01:45 CEST 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.jbws429;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(org.jboss.test.ws.jbws429.PersonHolder lookup) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI>
- </package-mapping>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
- <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
- <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
- <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
- <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type>
- <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name>
- <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,49 @@
+<?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 xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI>
+ </package-mapping>
+ <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
+ <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
+ <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
+ <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
+ <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type>
+ <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name>
+ <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/doclit_inout/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws429/doclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout)
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-
-public class Account
-{
-
-protected java.lang.String accountNumber;
-public Account(){}
-
-public Account(java.lang.String accountNumber){
-this.accountNumber=accountNumber;
-}
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Account.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+
+public class Account
+{
+
+protected java.lang.String accountNumber;
+public Account(){}
+
+public Account(java.lang.String accountNumber){
+this.accountNumber=accountNumber;
+}
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-public class AccountHolder implements javax.xml.rpc.holders.Holder
-{
-
- public org.jboss.test.ws.jbws429.Account value;
-
- public AccountHolder()
- {
- this.value = new org.jboss.test.ws.jbws429.Account();
- }
-
- public AccountHolder(final org.jboss.test.ws.jbws429.Account value)
- {
- this.value = value;
- }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/AccountHolder.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+public class AccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+ public org.jboss.test.ws.jbws429.Account value;
+
+ public AccountHolder()
+ {
+ this.value = new org.jboss.test.ws.jbws429.Account();
+ }
+
+ public AccountHolder(final org.jboss.test.ws.jbws429.Account value)
+ {
+ this.value = value;
+ }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-
-public class Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/Person.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws429/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws429'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <schema targetNamespace='http://test.jboss.org/ws/jbws429/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws429/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'>
- <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
- <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'>
- <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
- <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- </sequence>
- </complexType>
-
- <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'>
- <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
- <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- </sequence>
- </complexType>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- </message>
- <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- </message>
-
- <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:operation soapAction=''/>
- <input xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- </input>
- <output xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws429/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws429'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws429/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws429/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'>
+ <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
+ <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'>
+ <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
+ <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'>
+ <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
+ <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ </sequence>
+ </complexType>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ </message>
+ <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ </message>
+
+ <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:operation soapAction=''/>
+ <input xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ </input>
+ <output xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/TelephoneNumber.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI>
- </package-mapping>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
- <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
- <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
- <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
- <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type>
- <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name>
- <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position>
- <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type>
- <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name>
- <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,85 @@
+<?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 xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI>
+ </package-mapping>
+ <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
+ <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
+ <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
+ <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
+ <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type>
+ <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name>
+ <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position>
+ <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type>
+ <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name>
+ <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_inout/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws429/rpclit_inout/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out)
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-
-public class Account
-{
-
-protected java.lang.String accountNumber;
-public Account(){}
-
-public Account(java.lang.String accountNumber){
-this.accountNumber=accountNumber;
-}
-public java.lang.String getAccountNumber() { return accountNumber ;}
-
-public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Account.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+
+public class Account
+{
+
+protected java.lang.String accountNumber;
+public Account(){}
+
+public Account(java.lang.String accountNumber){
+this.accountNumber=accountNumber;
+}
+public java.lang.String getAccountNumber() { return accountNumber ;}
+
+public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,28 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-public class AccountHolder implements javax.xml.rpc.holders.Holder
-{
-
- public org.jboss.test.ws.jbws429.Account value;
-
- public AccountHolder()
- {
- this.value = new org.jboss.test.ws.jbws429.Account();
- }
-
- public AccountHolder(final org.jboss.test.ws.jbws429.Account value)
- {
- this.value = value;
- }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/AccountHolder.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,28 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+public class AccountHolder implements javax.xml.rpc.holders.Holder
+{
+
+ public org.jboss.test.ws.jbws429.Account value;
+
+ public AccountHolder()
+ {
+ this.value = new org.jboss.test.ws.jbws429.Account();
+ }
+
+ public AccountHolder(final org.jboss.test.ws.jbws429.Account value)
+ {
+ this.value = value;
+ }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-
-public class Person
-{
-
-protected java.lang.String firstName;
-
-protected java.lang.String surname;
-public Person(){}
-
-public Person(java.lang.String firstName, java.lang.String surname){
-this.firstName=firstName;
-this.surname=surname;
-}
-public java.lang.String getFirstName() { return firstName ;}
-
-public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
-
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/Person.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+
+public class Person
+{
+
+protected java.lang.String firstName;
+
+protected java.lang.String surname;
+public Person(){}
+
+public Person(java.lang.String firstName, java.lang.String surname){
+this.firstName=firstName;
+this.surname=surname;
+}
+public java.lang.String getFirstName() { return firstName ;}
+
+public void setFirstName(java.lang.String firstName){ this.firstName=firstName; }
+
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws429/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws429'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <schema targetNamespace='http://test.jboss.org/ws/jbws429/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws429/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'>
- <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
- <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- </sequence>
- </complexType>
-
- <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'>
- <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
- <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- </sequence>
- </complexType>
-
- <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'>
- <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
- <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
- </sequence>
- </complexType>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- </message>
- <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- </message>
-
- <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
- </operation>
- </portType>
-
- <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:operation soapAction=''/>
- <input xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- </input>
- <output xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook.wsdl 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws429'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws429/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws429'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws429/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws429/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person' xmlns='http://www.w3.org/2001/XMLSchema'>
+ <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
+ <element name='firstName' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ <element name='surname' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber' xmlns='http://www.w3.org/2001/XMLSchema'>
+ <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
+ <element name='areaCode' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ <element name='number' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Account' xmlns='http://www.w3.org/2001/XMLSchema'>
+ <sequence xmlns='http://www.w3.org/2001/XMLSchema'>
+ <element name='accountNumber' nillable='true' type='string' xmlns='http://www.w3.org/2001/XMLSchema'/>
+ </sequence>
+ </complexType>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='Person_1' type='ns1:Person' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ </message>
+ <message name='PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='result' type='ns1:TelephoneNumber' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <part name='Account' type='ns1:Account' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ </message>
+
+ <portType name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <operation name='lookup' parameterOrder='Person_1 Account' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <input message='tns:PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ <output message='tns:PhoneBook_lookupResponse' xmlns='http://schemas.xmlsoap.org/wsdl/'/>
+ </operation>
+ </portType>
+
+ <binding name='PhoneBookBinding' type='tns:PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:operation soapAction=''/>
+ <input xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ </input>
+ <output xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/PhoneBook_PortType.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws429.TelephoneNumber lookup(org.jboss.test.ws.jbws429.Person person_1, org.jboss.test.ws.jbws429.AccountHolder account) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
-
-
-public class TelephoneNumber
-{
-
-protected java.lang.String areaCode;
-
-protected java.lang.String number;
-public TelephoneNumber(){}
-
-public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
-this.areaCode=areaCode;
-this.number=number;
-}
-public java.lang.String getAreaCode() { return areaCode ;}
-
-public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
-
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/TelephoneNumber.java 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 23:58:44 CEST 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.jbws429;
+
+
+public class TelephoneNumber
+{
+
+protected java.lang.String areaCode;
+
+protected java.lang.String number;
+public TelephoneNumber(){}
+
+public TelephoneNumber(java.lang.String areaCode, java.lang.String number){
+this.areaCode=areaCode;
+this.number=number;
+}
+public java.lang.String getAreaCode() { return areaCode ;}
+
+public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; }
+
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI>
- </package-mapping>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname>
- <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
- <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name>
- <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
- <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
- <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
- <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
- <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type>
- <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name>
- <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position>
- <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type>
- <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name>
- <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>OUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/jaxrpc-mapping.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,85 @@
+<?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 xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429/types</namespaceURI>
+ </package-mapping>
+ <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws429</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Person</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws429/types' xmlns='http://java.sun.com/xml/ns/j2ee'>typeNS:Account</root-type-qname>
+ <qname-scope xmlns='http://java.sun.com/xml/ns/j2ee'>complexType</qname-scope>
+ <variable-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-variable-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</java-variable-name>
+ <xml-element-name xmlns='http://java.sun.com/xml/ns/j2ee'>accountNumber</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
+ <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
+ <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
+ <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
+ <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Person</param-type>
+ <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Person_1</wsdl-message-part-name>
+ <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>1</param-position>
+ <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.Account</param-type>
+ <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>Account</wsdl-message-part-name>
+ <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>OUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <method-return-value xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws429.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws429' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-04-23 21:48:37 UTC (rev 2911)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml (from rev 2911, trunk/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws429/rpclit_out/wstools-config.xml 2007-05-04 20:46:21 UTC (rev 2966)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws429/rpclit_out/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years
- 1
- 0
JBossWS SVN: r2965 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-05-04 16:18:42 -0400 (Fri, 04 May 2007)
New Revision: 2965
Added:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml
Removed:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
JBWS-1607 - WSDL To Java - document/literal, IN OUT parameter incorectly used as return type.
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-04 18:42:55 UTC (rev 2964)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-05-04 20:18:42 UTC (rev 2965)
@@ -378,13 +378,12 @@
boolean holder = false;
if (input != null && input.getElement() != null)
{
- QName xmlName = input.getElement();
- QName xmlType = input.getXMLType();
- JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes());
- XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
-
+ QName xmlName = input.getElement();
+ holder = output != null && xmlName.equals(output.getElement());
+
appendParameters(paramBuffer, input, output, xmlName.getLocalPart());
}
+
if (!holder && output != null && output.getElement() != null)
{
QName xmlName = output.getElement();
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-04 18:42:55 UTC (rev 2964)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-05-04 20:18:42 UTC (rev 2965)
@@ -227,8 +227,13 @@
private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop)
{
WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop);
+ WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop);
+
JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
MethodParamPartsMapping mpin = null;
+
+ boolean holder = false;
+
if (win != null)
{
QName xmlName = win.getElement();
@@ -248,14 +253,19 @@
{
if (xt instanceof XSSimpleTypeDefinition)
xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
+ String paramMode = "IN";
+ holder = output != null && xmlName.equals(output.getElement());
+ if (holder == true)
+ {
+ paramMode = "INOUT";
+ }
- mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, "IN", partName, false, true);
+ mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, paramMode, partName, false, true);
semm.addMethodParamPartsMapping(mpin);
}
}
- WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop);
- if (output != null)
+ if (holder == false && output != null)
{
QName xmlName = output.getElement();
QName xmlType = output.getXMLType();
@@ -755,8 +765,10 @@
if (javaType == null)
{
- if(log.isDebugEnabled()) log.debug("Typemapping lookup failed for " + xmlName);
- if(log.isDebugEnabled()) log.debug("Falling back to identifier generation");
+ if (log.isDebugEnabled())
+ log.debug("Typemapping lookup failed for " + xmlName);
+ if (log.isDebugEnabled())
+ log.debug("Falling back to identifier generation");
String className = xmlType.getLocalPart();
if (className.charAt(0) == '>')
className = className.substring(1);
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607 (from rev 2905, trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607)
Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-04-23 19:29:38 UTC (rev 2905)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-04 20:18:42 UTC (rev 2965)
@@ -1,107 +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.jbws1607;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1607
- *
- * WSDL to Java, If an INOUT parameter has been mapped to a
- * JAX-RPC holder it should not also be mapped to the return
- * type.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 11 Apr 2007
- */
-public class JBWS1607TestCase extends JBossWSTest
-{
-
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1607";
- String toolsDir = "tools/jbws1607";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1607/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java (from rev 2905, trunk/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2007-05-04 20:18:42 UTC (rev 2965)
@@ -0,0 +1,107 @@
+/*
+ * 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.jbws1607;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1607
+ *
+ * WSDL to Java, If an INOUT parameter has been mapped to a
+ * JAX-RPC holder it should not also be mapped to the return
+ * type.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 11 Apr 2007
+ */
+public class JBWS1607TestCase extends JBossWSTest
+{
+
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1607";
+ String toolsDir = "tools/jbws1607";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1607/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607 (from rev 2905, trunk/jbossws-tests/src/resources/tools/jbws1607)
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-04-23 19:29:38 UTC (rev 2905)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-05-04 20:18:42 UTC (rev 2965)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1607' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1607/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1607' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1607/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1607/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <element name='lookup' type='string'/>
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='lookup'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookup' name='lookup'/>
- </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>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl (from rev 2905, trunk/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook.wsdl 2007-05-04 20:18:42 UTC (rev 2965)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1607' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1607/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1607' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1607/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1607/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <element name='lookup' type='string'/>
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='lookup'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookup' name='lookup'/>
+ </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>
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-04-23 19:29:38 UTC (rev 2905)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-05-04 20:18:42 UTC (rev 2965)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Apr 11 17:06:28 CEST 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.jbws1607;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public void lookup(javax.xml.rpc.holders.StringHolder lookup) throws java.rmi.RemoteException;
-}
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java (from rev 2905, trunk/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/PhoneBook_PortType.java 2007-05-04 20:18:42 UTC (rev 2965)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Apr 11 17:06:28 CEST 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.jbws1607;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public void lookup(javax.xml.rpc.holders.StringHolder lookup) throws java.rmi.RemoteException;
+}
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-04-23 19:29:38 UTC (rev 2905)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-05-04 20:18:42 UTC (rev 2965)
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607</package-type>
- <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws1607</namespaceURI>
- </package-mapping>
- <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
- <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
- <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
- <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
- <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>java.lang.String</param-type>
- <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name>
- <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml (from rev 2905, trunk/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/jaxrpc-mapping.xml 2007-05-04 20:18:42 UTC (rev 2965)
@@ -0,0 +1,32 @@
+<?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 xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <package-type xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607</package-type>
+ <namespaceURI xmlns='http://java.sun.com/xml/ns/j2ee'>http://test.jboss.org/ws/jbws1607</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</port-name>
+ <java-port-name xmlns='http://java.sun.com/xml/ns/j2ee'>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <service-endpoint-interface xmlns='http://java.sun.com/xml/ns/j2ee'>org.jboss.test.ws.jbws1607.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <java-method-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</java-method-name>
+ <wsdl-operation xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-operation>
+ <method-param-parts-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <param-position xmlns='http://java.sun.com/xml/ns/j2ee'>0</param-position>
+ <param-type xmlns='http://java.sun.com/xml/ns/j2ee'>java.lang.String</param-type>
+ <wsdl-message-mapping xmlns='http://java.sun.com/xml/ns/j2ee'>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1607' xmlns='http://java.sun.com/xml/ns/j2ee'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name xmlns='http://java.sun.com/xml/ns/j2ee'>lookup</wsdl-message-part-name>
+ <parameter-mode xmlns='http://java.sun.com/xml/ns/j2ee'>INOUT</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-04-23 19:29:38 UTC (rev 2905)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-05-04 20:18:42 UTC (rev 2965)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml (from rev 2905, trunk/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml)
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/resources/tools/jbws1607/wstools-config.xml 2007-05-04 20:18:42 UTC (rev 2965)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1607/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years
- 1
- 0