December 2006 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1671 - in branches/dlofthouse/JBWS-1260/src/test: java/org/jboss/test/ws/tools/jbws1260 resources/tools/jbws1260 resources/tools/jbws1260/scenario_AB resources/tools/jbws1260/scenario_AC resources/tools/jbws1260/scenario_AD resources/tools/jbws1260/scenario_AE resources/tools/jbws1260/scenario_AF

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2006-12-19 19:23:58 -0500 (Tue, 19 Dec 2006) New Revision: 1671 Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Lookup.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/LookupResponse.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Person.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupName.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Person.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java Log: JBWS-1260 - Test case refinemenets. Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/jbws1260/JBWS1260TestCase.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -27,6 +27,7 @@ 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.WSException; import org.jboss.ws.tools.WSTools; /** @@ -75,7 +76,14 @@ */ public void testScenario_B() throws Exception { - generateScenario("B"); + try + { + generateScenario("B"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -114,7 +122,14 @@ */ public void testScenario_D() throws Exception { - generateScenario("D"); + try + { + generateScenario("D"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -306,7 +321,14 @@ */ public void testScenario_M() throws Exception { - generateScenario("M"); + try + { + generateScenario("M"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -326,7 +348,14 @@ */ public void testScenario_N() throws Exception { - generateScenario("N"); + try + { + generateScenario("N"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -372,7 +401,14 @@ */ public void testScenario_P() throws Exception { - generateScenario("P"); + try + { + generateScenario("P"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -392,7 +428,14 @@ */ public void testScenario_Q() throws Exception { - generateScenario("Q"); + try + { + generateScenario("Q"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -438,7 +481,14 @@ */ public void testScenario_S() throws Exception { - generateScenario("S"); + try + { + generateScenario("S"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -457,7 +507,14 @@ */ public void testScenario_T() throws Exception { - generateScenario("T"); + try + { + generateScenario("T"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -500,7 +557,14 @@ */ public void testScenario_V() throws Exception { - generateScenario("V"); + try + { + generateScenario("V"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -517,7 +581,14 @@ */ public void testScenario_W() throws Exception { - generateScenario("W"); + try + { + generateScenario("W"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } } /** @@ -624,6 +695,128 @@ generateScenario("AA"); } + /** + * Test case to test where the element referenced as the message + * parts contains an anonymous simple type. + * + * <element name='lookupResponse'> + * <simpleType> + * <restriction base='string'> + * <maxLength value="50"/> + * </restriction> + * </simpleType> + * </element> + * + */ + public void testScenario_AB() throws Exception + { + try + { + generateScenario("AB"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test case to test where the element referenced as the message + * parts references a named simple type. + * + * <element name='lookupResponse' type='tns:number'/> + * + * <simpleType name='number'> + * <restriction base='string'> + * <maxLength value="50"/> + * </restriction> + * </simpleType> + * + */ + public void testScenario_AC() throws Exception + { + try + { + generateScenario("AC"); + fail("Expected exception not thrown."); + } + catch (WSException e) + { + } + } + + /** + * Test scenario where the element referenced as the input message + * part contains an anonymous complex type which contains + * two elements. + * + * The element referenced as the output message part contains an + * anonymous complex type with a single element. + * + * <element name='lookupResponse'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * + */ + public void testScenario_AD() throws Exception + { + generateScenario("AD"); + } + + /** + * Test scenario where the element referenced as the input message + * part references a complex type which contains two elements. + * + * The element referenced as the output message part references a + * complex type with a single element. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * + */ + public void testScenario_AE() throws Exception + { + generateScenario("AE"); + } + + /** + * Test scenario where the element referenced as the input message + * part references a complex type which contains an element which + * contains an anonymous complex type which contains two elements. + * + * The element referenced as the output message part references a + * complex type which contains an element which contains an anonymous + * complex type which contains a single element. + * + * <element name='lookupResponse' type='tns:TelephoneNumber'/> + * + * <complexType name='TelephoneNumber'> + * <sequence> + * <element name='Number'> + * <complexType> + * <sequence> + * <element name='number' nillable='true' type='string'/> + * </sequence> + * </complexType> + * </element> + * </sequence> + * </complexType> + * + */ + public void testScenario_AF() throws Exception + { + generateScenario("AF"); + } + protected void generateScenario(final String scenario) throws Exception { String tests = System.getProperty("client.scenario"); Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <simpleType> + <restriction base='string'> + <maxLength value="50"/> + </restriction> + </simpleType> + </element> + + <element name='lookupResponse'> + <simpleType> + <restriction base='string'> + <maxLength value="50"/> + </restriction> + </simpleType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wrapped-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_AB/Wrapped.wsdl" parameter-style="wrapped"> + <mapping file="wrapped-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AB/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String parameters) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <simpleType name='person'> + <restriction base='string'> + <maxLength value="50"/> + </restriction> + </simpleType> + + <simpleType name='number'> + <restriction base='string'> + <maxLength value="50"/> + </restriction> + </simpleType> + + <element name='lookup' type='tns:person'/> + <element name='lookupResponse' type='tns:number'/> + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wrapped-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_AC/Wrapped.wsdl" parameter-style="wrapped"> + <mapping file="wrapped-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AC/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Lookup.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Lookup.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Lookup.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class Lookup { + protected java.lang.String firstName; + protected java.lang.String surname; + + public Lookup() { + } + + public Lookup(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; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Lookup.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/LookupResponse.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/LookupResponse.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/LookupResponse.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class LookupResponse { + protected java.lang.String number; + + public LookupResponse() { + } + + public LookupResponse(java.lang.String number) { + this.number = number; + } + + public java.lang.String getNumber() { + return number; + } + + public void setNumber(java.lang.String number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/LookupResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String firstName, java.lang.String surname) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <element name='lookup'> + <complexType> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + + <element name='lookupResponse'> + <complexType> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponse</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>lookupResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Lookup</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>lookup</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>firstName</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>surname</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>number</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wrapped-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_AD/Wrapped.wsdl" parameter-style="wrapped"> + <mapping file="wrapped-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AD/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Person.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Person.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +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; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public java.lang.String lookup(java.lang.String firstName, java.lang.String surname) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class TelephoneNumber { + protected java.lang.String number; + + public TelephoneNumber() { + } + + public TelephoneNumber(java.lang.String number) { + this.number = number; + } + + public java.lang.String getNumber() { + return number; + } + + public void setNumber(java.lang.String number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/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> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>firstName</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>surname</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>number</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wrapped-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_AE/Wrapped.wsdl" parameter-style="wrapped"> + <mapping file="wrapped-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AE/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupName.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupName.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupName.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,36 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class LookupName { + protected java.lang.String firstName; + protected java.lang.String surname; + + public LookupName() { + } + + public LookupName(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; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupName.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class LookupResponseNumber { + protected java.lang.String number; + + public LookupResponseNumber() { + } + + public LookupResponseNumber(java.lang.String number) { + this.number = number; + } + + public java.lang.String getNumber() { + return number; + } + + public void setNumber(java.lang.String number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/LookupResponseNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Person.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Person.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Person.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class Person { + protected org.jboss.test.ws.jbws1260.LookupName name; + + public Person() { + } + + public Person(org.jboss.test.ws.jbws1260.LookupName name) { + this.name = name; + } + + public org.jboss.test.ws.jbws1260.LookupName getName() { + return name; + } + + public void setName(org.jboss.test.ws.jbws1260.LookupName name) { + this.name = name; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Person.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,11 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + +public interface PhoneBook_PortType extends java.rmi.Remote { + public org.jboss.test.ws.jbws1260.LookupResponseNumber lookup(org.jboss.test.ws.jbws1260.LookupName name) throws + java.rmi.RemoteException; +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/PhoneBook_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,26 @@ +// This class was generated by the JAXRPC SI, do not edit. +// Contents subject to change without notice. +// JAX-RPC Standard Implementation (1.1.3, build R1) +// Generated source version: 1.1.3 + +package org.jboss.test.ws.jbws1260; + + +public class TelephoneNumber { + protected org.jboss.test.ws.jbws1260.LookupResponseNumber number; + + public TelephoneNumber() { + } + + public TelephoneNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { + this.number = number; + } + + public org.jboss.test.ws.jbws1260.LookupResponseNumber getNumber() { + return number; + } + + public void setNumber(org.jboss.test.ws.jbws1260.LookupResponseNumber number) { + this.number = number; + } +} Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/TelephoneNumber.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1260' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1260/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1260' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1260/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1260/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='Name'> + <complexType> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='Number'> + <complexType> + <sequence> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + + </schema> + </types> + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/Wrapped.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1260</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>Number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupName</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>Person>Name</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.LookupResponseNumber</java-type> + <anonymous-type-qname>http://test.jboss.org/ws/jbws1260/types:>TelephoneNumber>Number</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1260.Person</java-type> + <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>name</java-variable-name> + <xml-element-name>Name</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1260.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <wrapped-element/> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1260.LookupName</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Name</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1260.LookupResponseNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>Number</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wrapped-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2006-12-19 16:40:39 UTC (rev 1670) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml 2006-12-20 00:23:58 UTC (rev 1671) @@ -0,0 +1,5 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1260/scenario_AF/Wrapped.wsdl" parameter-style="wrapped"> + <mapping file="wrapped-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_AF/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1670 - in trunk/src/main/java/org/jboss/ws: core/jaxrpc integration/jboss50 metadata/config metadata/j2ee metadata/umdm metadata/wsse

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-12-19 11:40:39 -0500 (Tue, 19 Dec 2006) New Revision: 1670 Modified: trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java Log: Fix handling of client meta data, remove dependency on resourceLoader. [JBCTS-481] Fix jaxrpc/api/javax_xml_rpc/Stub Modified: trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceObjectFactory.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -32,9 +32,7 @@ import java.io.ObjectInputStream; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; import java.net.URLEncoder; import java.rmi.Remote; import java.util.ArrayList; @@ -127,31 +125,6 @@ throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); } - // reconstruct the resourceCl - ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); - URL url = new URL((String)ref.get(ServiceReferenceable.DEPLOYMENT_URL).getContent()); - URLClassLoader resourceCL = new URLClassLoader(new URL[] { url }, contextCL); - serviceRefMetaData.setResourceCL(resourceCL); - - // Rewrite the config-file content - String configFile = serviceRefMetaData.getConfigFile(); - if (configFile != null) - { - try - { - new URL(configFile); - } - catch (MalformedURLException ex) - { - URL configURL = resourceCL.getResource(configFile); - if (configURL != null) - { - configFile = configURL.toExternalForm(); - serviceRefMetaData.setConfigFile(configFile); - } - } - } - // Unmarshall the WSSecurityConfiguration WSSecurityConfiguration securityConfig = null; RefAddr wsseRefAddr = ref.get(ServiceReferenceable.SECURITY_CONFIG); @@ -171,15 +144,15 @@ } ServiceImpl jaxrpcService = null; - URL wsdlURL = serviceRefMetaData.getWsdlURL(); - if (wsdlURL != null) + URL wsdlLocation = serviceRefMetaData.getWsdlLocation(); + if (wsdlLocation != null) { log.debug("Create jaxrpc service from wsdl"); // Create the actual service object QName serviceName = serviceRefMetaData.getServiceQName(); JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)serviceRefMetaData.getJavaWsdlMapping(); - jaxrpcService = new ServiceImpl(serviceName, wsdlURL, javaWsdlMapping, securityConfig, serviceRefMetaData); + jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRefMetaData); } else { @@ -244,6 +217,7 @@ ********************************************************/ // load the service interface class + ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); Class siClass = contextCL.loadClass(serviceRefMetaData.getServiceInterface()); if (Service.class.isAssignableFrom(siClass) == false) throw new JAXRPCException("The service interface does not implement javax.xml.rpc.Service: " + siClass.getName()); Modified: trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -26,6 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectOutputStream; import java.net.URL; @@ -35,9 +36,11 @@ import javax.naming.Referenceable; import javax.naming.StringRefAddr; +import org.jboss.logging.Logger; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; @@ -55,6 +58,9 @@ */ public class ServiceReferenceable implements Referenceable { + // provide logging + private static Logger log = Logger.getLogger(ServiceReferenceable.class); + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; public static final String DEPLOYMENT_URL = "DEPLOYMENT_URL"; public static final String SECURITY_CONFIG = "SECURITY_CONFIG"; @@ -95,6 +101,7 @@ // Add a reference to the ServiceRefMetaData and WSDLDefinitions myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); + // FIXME: JBWS-1431 Merge ws-security config with jaxrpc/jaxws config if (getSecurityConfigURL() != null) myRef.add(new BinaryRefAddr(SECURITY_CONFIG, marshallSecurityConfig())); @@ -169,9 +176,19 @@ private URL getSecurityConfigURL() { - ClassLoader ctxClassLoader = refMetaData.getResourceCL(); - String descriptorLoc = udi.metaData instanceof UnifiedWebMetaData ? "WEB-INF" : "META-INF"; - URL securityURL = ctxClassLoader.getResource(descriptorLoc + "/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); - return securityURL; + String descriptorPath = udi.metaData instanceof UnifiedWebMetaData ? "WEB-INF" : "META-INF"; + descriptorPath = descriptorPath + "/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME; + try + { + URL securityURL = udi.getMetaDataFile(descriptorPath); + InputStream inputStream = new ResourceURL(securityURL).openStream(); + inputStream.close(); + return securityURL; + } + catch (IOException ex) + { + log.debug("Cannot find security config: " + descriptorPath); + return null; + } } } \ No newline at end of file Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -62,18 +62,28 @@ WebMetaData webMetaData = allMetaData.iterator().next(); try { - ClassLoader anLoader = unit.getClassLoader(); - Iterator it = webMetaData.getServlets().iterator(); while (it.hasNext()) { Servlet servlet = (Servlet)it.next(); + String servletClassName = servlet.getServletClass(); + // Skip JSPs - if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) + if (servletClassName == null) continue; - String beanName = servlet.getServletClass(); - Class<?> servletClass = anLoader.loadClass(beanName); + Class<?> servletClass = null; + try + { + ClassLoader loader = unit.getClassLoader(); + servletClass = loader.loadClass(servletClassName.trim()); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + if (servletClass.isAnnotationPresent(WebService.class) || servletClass.isAnnotationPresent(WebServiceProvider.class)) { isWebServiceDeployment = true; Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -71,7 +71,8 @@ String className = (deployment != null ? deployment.getClass().getName() : null); if ((deployment instanceof DeploymentUnit) == false) throw new IllegalArgumentException("Expected " + DeploymentUnit.class.getName() + ", but was: " + className); - + + DeploymentUnit unit = (DeploymentUnit)deployment; try { while (serviceRefs.hasNext()) @@ -79,6 +80,20 @@ ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); String serviceRefName = serviceRef.getServiceRefName(); + // Build the container independent deployment info + UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); + DeploymentInfoAdaptor.buildDeploymentInfo(udi, unit); + + // Convert wsdlFile to URL + String wsdlFile = serviceRef.getWsdlFile(); + if (wsdlFile != null) + serviceRef.setWsdlFile(udi.getMetaDataFile(wsdlFile).toExternalForm()); + + // Convert mappingFile to URL + String mappingFile = serviceRef.getMappingFile(); + if (mappingFile != null) + serviceRef.setMappingFile(udi.getMetaDataFile(mappingFile).toExternalForm()); + UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(serviceRef); JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); @@ -87,10 +102,6 @@ Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); wsServiceRef.setWsdlDefinition(wsdlDefinition); - // build the container independent deployment info - UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, (DeploymentUnit)deployment); - ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); Util.bind(envCtx, serviceRefName, ref); @@ -106,7 +117,7 @@ private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) { JavaWsdlMapping javaWsdlMapping = null; - URL mappingURL = serviceRef.getJavaWsdlMappingURL(); + URL mappingURL = serviceRef.getMappingLocation(); if (mappingURL != null) { try @@ -128,7 +139,7 @@ Definition wsdlDefinition = null; { URL wsdlOverride = serviceRef.getWsdlOverride(); - URL wsdlURL = serviceRef.getWsdlURL(); + URL wsdlURL = serviceRef.getWsdlLocation(); if (wsdlOverride == null && wsdlURL != null) { try Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -21,16 +21,29 @@ */ package org.jboss.ws.integration.jboss50; +import java.util.Iterator; + import javax.management.ObjectName; +import javax.naming.Context; -import org.jboss.webservice.ServiceRefHandler; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.ws.core.utils.ObjectNameFactory; /** * MBean interface. */ -public interface ServiceRefHandlerMBean extends ServiceRefHandler +public interface ServiceRefHandlerMBean { // default object name public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); + + /** + * Binds a JAXRPC Service into the callers ENC for every service-ref element + * + * @param envCtx ENC to bind the javax.rpc.xml.Service object to + * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor + * @param deployment The client's deployment unit + * @throws DeploymentException if it goes wrong + */ + void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, Object deployment); } Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -23,11 +23,17 @@ // $Id$ +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.ArrayList; import java.util.LinkedHashMap; import javax.xml.namespace.QName; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.virtual.VirtualFile; import org.jboss.webservice.metadata.serviceref.HandlerMetaData; import org.jboss.webservice.metadata.serviceref.InitParamMetaData; import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; @@ -45,13 +51,13 @@ */ public class ServiceRefMetaDataAdaptor { - public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(ServiceRefMetaData srmd) + public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(ServiceRefMetaData srmd) throws Exception { UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(); usrmd.setServiceRefName(srmd.getServiceRefName()); usrmd.setServiceInterface(srmd.getServiceInterface()); - usrmd.setWsdlFile(srmd.getWsdlFile()); - usrmd.setJaxrpcMappingFile(srmd.getJaxrpcMappingFile()); + usrmd.setWsdlLocation(getWsdlLocation(srmd)); + usrmd.setMappingLocation(getMetaDataURL(srmd.getMappingFile())); usrmd.setServiceQName(srmd.getServiceQName()); LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); @@ -94,8 +100,21 @@ usrmd.setConfigFile(srmd.getConfigFile()); usrmd.setWsdlOverride(srmd.getWsdlOverride()); usrmd.setCallProperties(srmd.getCallProperties()); - usrmd.setResourceCL(srmd.getResourceCL()); return usrmd; } + + private static URL getWsdlLocation(ServiceRefMetaData srmd) throws MalformedURLException + { + URL wsdlLocation = srmd.getWsdlOverride(); + if (wsdlLocation == null) + wsdlLocation = getMetaDataURL(srmd.getWsdlFile()); + + return wsdlLocation; + } + + private static URL getMetaDataURL(String resourcePath) throws MalformedURLException + { + return (resourcePath != null ? new URL(resourcePath) : null); + } } Modified: trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -1,24 +1,48 @@ +/* + * 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.config; +// $Id: $ + + /** * Provides configuration for JBossWS components.<br> * Currently this is implemented by <code>EndpointMetaData</code>. * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 15.12.2006 * * @see org.jboss.ws.metadata.umdm.EndpointMetaData */ -public interface ConfigurationProvider { +public interface ConfigurationProvider +{ - static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml"; - static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml"; - static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint"; + static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml"; + static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml"; + static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint"; - static final String DEFAULT_JAXRPC_CLIENT_CONFIG = "META-INF/standard-jaxrpc-client-config.xml"; - static final String DEFAULT_JAXWS_CLIENT_CONFIG = "META-INF/standard-jaxws-client-config.xml"; - static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client"; + static final String DEFAULT_JAXRPC_CLIENT_CONFIG = "META-INF/standard-jaxrpc-client-config.xml"; + static final String DEFAULT_JAXWS_CLIENT_CONFIG = "META-INF/standard-jaxws-client-config.xml"; + static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client"; /** * Callback for components that require configuration through jbossws-dd Modified: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -25,7 +25,6 @@ import java.io.Serializable; import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -44,16 +43,16 @@ */ public class UnifiedServiceRefMetaData implements Serializable { - private static final long serialVersionUID = 122554634182144069L; + private static final long serialVersionUID = -6845188004746036291L; // The required <service-ref-name> element private String serviceRefName; // The required <service-interface> element private String serviceInterface; // The optional <wsdl-file> element - private String wsdlFile; + private URL wsdlLocation; // The optional <jaxrpc-mapping-file> element - private String jaxrpcMappingFile; + private URL mappingLocation; // The optional <service-qname> element private QName serviceQName; // The LinkedHashMap<String, UnifiedPortComponentRefMetaData> for <port-component-ref> elements @@ -75,50 +74,16 @@ // The java/wsdl mapping, if we have one private Object javaWsdlMapping; - //The ClassLoader to load additional resources - private transient URLClassLoader resourceCL; - - /** Set the resource classloader that can load the wsdl file - * On the client side this is set expicitly after unmarshalling. - */ - public void setResourceCL(URLClassLoader resourceCL) + public URL getMappingLocation() { - if (resourceCL == null) - throw new IllegalArgumentException("ResourceClassLoader cannot be null"); - - this.resourceCL = resourceCL; + return mappingLocation; } - public URLClassLoader getResourceCL() + public void setMappingLocation(URL mappingLocation) { - if (resourceCL == null) - resourceCL = new URLClassLoader(new URL[] {}, Thread.currentThread().getContextClassLoader()); - - return resourceCL; + this.mappingLocation = mappingLocation; } - public String getJaxrpcMappingFile() - { - return jaxrpcMappingFile; - } - - public void setJaxrpcMappingFile(String jaxrpcMappingFile) - { - this.jaxrpcMappingFile = jaxrpcMappingFile; - } - - public URL getJavaWsdlMappingURL() - { - URL mappingURL = null; - if (jaxrpcMappingFile != null) - { - mappingURL = getResourceCL().findResource(jaxrpcMappingFile); - if (mappingURL == null) - throw new IllegalStateException("Cannot find resource: " + jaxrpcMappingFile); - } - return mappingURL; - } - public Object getJavaWsdlMapping() { return javaWsdlMapping; @@ -183,14 +148,14 @@ this.serviceRefName = serviceRefName; } - public String getWsdlFile() + public URL getWsdlLocation() { - return wsdlFile; + return wsdlLocation; } - public void setWsdlFile(String wsdlFile) + public void setWsdlLocation(URL wsdlLocation) { - this.wsdlFile = wsdlFile; + this.wsdlLocation = wsdlLocation; } public String getConfigFile() @@ -218,24 +183,11 @@ return wsdlOverride; } - public void setWsdlOverride(URL wsdlOverride) { this.wsdlOverride = wsdlOverride; } - public URL getWsdlURL() - { - URL wsdlURL = wsdlOverride; - if (wsdlURL == null && wsdlFile != null) - { - wsdlURL = getResourceCL().findResource(wsdlFile); - if (wsdlURL == null) - throw new IllegalStateException("Cannot find resource: " + wsdlFile); - } - return wsdlURL; - } - public Properties getCallProperties() { return callProperties; Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -23,6 +23,19 @@ // $Id$ +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -38,16 +51,13 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.config.*; +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.config.Configurable; +import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.ws.metadata.config.EndpointFeature; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; -import java.lang.reflect.Method; -import java.util.*; - /** * A Service component describes a set of endpoints. * Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -120,7 +120,8 @@ if (index == -1 && matchTypes(returnType, expectedType, exact, false)) return true; - if (index < parameters.length && matchTypes(parameters[index], expectedType, exact, holder)) + boolean indexInBounds = -1 < index && index < parameters.length; + if (indexInBounds && matchTypes(parameters[index], expectedType, exact, holder)) { matches.add(index); return true; Modified: trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2006-12-19 13:13:51 UTC (rev 1669) +++ trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2006-12-19 16:40:39 UTC (rev 1670) @@ -27,6 +27,7 @@ import java.util.HashMap; import org.jboss.logging.Logger; +import org.jboss.ws.core.utils.ResourceURL; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.SimpleTypeBindings; @@ -80,24 +81,21 @@ /** * Factory method for JavaWsdlMapping */ - public WSSecurityConfiguration parse(URL configurationFile) throws IOException + public WSSecurityConfiguration parse(URL configURL) throws IOException { - if (configurationFile == null) - { + if (configURL == null) throw new IllegalArgumentException("URL cannot be null"); - } - // setup the XML binding Unmarshaller - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - InputStream is = configurationFile.openStream(); + InputStream is = new ResourceURL(configURL).openStream(); try { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); WSSecurityConfiguration configuration = (WSSecurityConfiguration) unmarshaller.unmarshal(is, this, null); return configuration; } catch (JBossXBException e) { - IOException ioex = new IOException("Cannot parse: " + configurationFile); + IOException ioex = new IOException("Cannot parse: " + configURL); Throwable cause = e.getCause(); if (cause != null) ioex.initCause(cause);

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1669 - trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-12-19 08:13:51 -0500 (Tue, 19 Dec 2006) New Revision: 1669 Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java Log: Fix JBWS-1430 Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-18 19:38:13 UTC (rev 1668) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-19 13:13:51 UTC (rev 1669) @@ -34,6 +34,8 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.client.AppClientLauncher; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref @@ -70,13 +72,13 @@ assertEquals(helloWorld, retObj); } - public void testApplicationClient() throws Exception + public void testApplicationClient() throws Throwable { String helloWorld = "Hello World!"; ApplicationClient.iniCtx = getInitialContext(); - - System.out.println("FIXME [JBWS-1430]: Fix client side @WebServiceRef"); - //ClientLauncher.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld}); - //assertEquals(helloWorld, ApplicationClient.retStr); + + AppClientLauncher apl = new ClientLauncher(); + apl.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld}); + assertEquals(helloWorld, ApplicationClient.retStr); } }

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1668 - trunk

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-12-18 14:38:13 -0500 (Mon, 18 Dec 2006) New Revision: 1668 Modified: trunk/STATUS_AND_NEWS.txt Log: All good with jbossas -r 59084 Modified: trunk/STATUS_AND_NEWS.txt =================================================================== --- trunk/STATUS_AND_NEWS.txt 2006-12-18 19:35:55 UTC (rev 1667) +++ trunk/STATUS_AND_NEWS.txt 2006-12-18 19:38:13 UTC (rev 1668) @@ -1,5 +1,9 @@ # $Id$ +18-Dec-2006 +----------- +* All good with jbossas -r 59084 + 11-Dec-2006 -----------

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1667 - in trunk/src/main/java/org/jboss/ws: core/jaxrpc core/server integration/jboss50 integration/tomcat metadata/builder metadata/webservices

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-12-18 14:35:55 -0500 (Mon, 18 Dec 2006) New Revision: 1667 Modified: trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java Log: Exclude DeploymentUnit components from deployment. Remove assumtion that DeploymentUnit.name is a URL. Prevent CNFE when servlet class cannot be loaded Modified: trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceReferenceable.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -89,8 +89,8 @@ // The deployment URL of the web service client deployment // Add a reference to the client deployment URL - URL deploymentURL = udi.url; - myRef.add(new StringRefAddr(DEPLOYMENT_URL, deploymentURL.toExternalForm())); + String deploymentID = udi.name; + myRef.add(new StringRefAddr(DEPLOYMENT_URL, deploymentID)); // Add a reference to the ServiceRefMetaData and WSDLDefinitions myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); Modified: trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointPublisher.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -145,10 +145,22 @@ if (classElement == null) continue; - // Get the servlet class String servletClassName = DOMUtils.getTextContent(classElement).trim(); - Class servletClass = (loader != null ? loader.loadClass(servletClassName) : null); + // Get the servlet class + Class servletClass = null; + if (loader != null) + { + try + { + servletClass = loader.loadClass(servletClassName); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + } + } + String targetBeanName = null; // Nothing to do if we have an <init-param> Modified: trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -73,7 +73,7 @@ public void create(UnifiedDeploymentInfo udi) { - log.debug("create: " + udi.url); + log.debug("create: " + udi.name); try { UnifiedMetaData wsMetaData; @@ -102,7 +102,7 @@ throw new IllegalStateException("Invalid type: " + udi.type); } - metaDataMap.put(udi.url.toExternalForm(), wsMetaData); + metaDataMap.put(udi.name, wsMetaData); for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) { @@ -125,7 +125,7 @@ public void start(UnifiedDeploymentInfo udi) { - log.debug("start: " + udi.url); + log.debug("start: " + udi.name); try { UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); @@ -160,7 +160,7 @@ public void stop(UnifiedDeploymentInfo udi) { - log.debug("stop: " + udi.url); + log.debug("stop: " + udi.name); try { UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); @@ -193,7 +193,7 @@ public void destroy(UnifiedDeploymentInfo udi) { - log.debug("destroy: " + udi.url); + log.debug("destroy: " + udi.name); try { UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); @@ -222,7 +222,7 @@ public UnifiedMetaData getUnifiedMetaData(UnifiedDeploymentInfo udi) { - UnifiedMetaData wsMetaData = metaDataMap.get(udi.url.toExternalForm()); + UnifiedMetaData wsMetaData = metaDataMap.get(udi.name); return wsMetaData; } } \ No newline at end of file Modified: trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -52,9 +52,11 @@ /** Sub deployments have a parent */ public UnifiedDeploymentInfo parent; /** The suffix of the deployment url */ - public String shortName; - /** The URL identifing this deployment **/ + public String simpleName; + /** The URL for this deployment */ public URL url; + /** The string identifing this deployment **/ + public String name; /** The URL to the expanded webapp **/ public URL expandedWebApp; /** We can hold "typed" metadata */ @@ -67,7 +69,7 @@ /** The sortName concatenated with the canonical names of all parents. */ public String getCanonicalName() { - String name = shortName; + String name = simpleName; if (parent != null) name = parent.getCanonicalName() + "/" + name; return name; @@ -107,8 +109,8 @@ StringBuilder builder = new StringBuilder(); builder.append("["); builder.append("type=" + type); - builder.append(",shortName=" + shortName); - builder.append(",url=" + url); + builder.append(",shortName=" + simpleName); + builder.append(",url=" + name); builder.append("]"); return builder.toString(); } Modified: trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -71,7 +71,7 @@ { this.udi = udi; - String archiveName = udi.shortName; + String archiveName = udi.simpleName; if (archiveName.endsWith(".jar") || archiveName.endsWith(".ejb3")) expLocation = "META-INF/wsdl/"; else if (archiveName.endsWith(".war")) @@ -245,7 +245,7 @@ */ public void unpublishWsdlFiles() throws IOException { - String deploymentDir = (udi.parent != null ? udi.parent.shortName : udi.shortName); + String deploymentDir = (udi.parent != null ? udi.parent.simpleName : udi.simpleName); ServerConfig config = ServerConfigFactory.getInstance().getServerConfig(); File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir); deleteWsdlPublishDirectory(serviceDir); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -52,65 +52,87 @@ @Override public void deploy(DeploymentUnit unit) throws DeploymentException { - if (isWebServiceDeployment(unit)) - deployWebServiceDeployment(unit); + boolean isComponent = unit.getDeploymentContext().isComponent(); + if (isComponent == false && isWebServiceDeployment(unit)) + deployInternal(unit); } + private void deployInternal(DeploymentUnit unit) throws DeploymentException + { + try + { + deployServiceEndpoint(unit); + } + catch (Exception ex) + { + UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(unit); + if (udi != null) + undeployInternal(unit, udi); + + DeploymentException.rethrowAsDeploymentException(ex.getMessage(), ex); + } + } + /** Undeploy the web service endpoints if there are any */ @Override public void undeploy(DeploymentUnit unit) { + boolean isComponent = unit.getDeploymentContext().isComponent(); UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(unit); - if (udi != null) - undeployWebServiceDeployment(unit, udi); + if (isComponent == false && udi != null) + undeployInternal(unit, udi); } + private void undeployInternal(DeploymentUnit unit, UnifiedDeploymentInfo udi) + { + undeployServiceEndpoint(unit, udi); + } + /** Create the unified deployment info from the deployment unit */ - protected abstract UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit); + protected abstract UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) throws DeploymentException; /** Create the unified deployment info and create the service endpoints * through the ServiceEndpointDeployer */ - protected void deployWebServiceDeployment(DeploymentUnit unit) throws DeploymentException + protected void deployServiceEndpoint(DeploymentUnit unit) throws DeploymentException { UnifiedDeploymentInfo udi = createUnifiedDeploymentInfo(unit); unit.addAttachment(UnifiedDeploymentInfo.class, udi); - createServiceEndpoint(udi, unit); } /** Stop and destroy the service endpoints through the ServiceEndpointDeployer */ - protected void undeployWebServiceDeployment(DeploymentUnit unit, UnifiedDeploymentInfo udi) + protected void undeployServiceEndpoint(DeploymentUnit unit, UnifiedDeploymentInfo udi) { destroyServiceEndpoint(udi, unit); } protected void createServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws DeploymentException { - log.debug("createServiceEndpoint: " + udi.getCanonicalName()); + log.debug("Create ServiceEndpoint: " + udi.getCanonicalName()); getServiceEndpointDeployer().create(udi); } protected void destroyServiceEndpoint(UnifiedDeploymentInfo udi, DeploymentUnit unit) { - log.debug("destroyServiceEndpoint: " + udi.getCanonicalName()); + log.debug("Destroy ServiceEndpoint: " + udi.getCanonicalName()); getServiceEndpointDeployer().destroy(udi); } /** Override to provide the deployment type */ protected abstract DeploymentType getDeploymentType(); - + protected UnifiedDeploymentInfo getUnifiedDeploymentInfo(DeploymentUnit unit) { UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); return (udi != null && udi.type == getDeploymentType() ? udi : null); - + } - + protected ServiceEndpointDeployer getServiceEndpointDeployer() { KernelRegistry registry = KernelLocator.getKernel().getRegistry(); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -23,30 +23,17 @@ //$Id$ -import java.io.File; -import java.io.FileOutputStream; import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.util.Enumeration; import java.util.Iterator; import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import javax.jws.WebService; - import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.NameValuePair; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; -import org.jboss.virtual.VirtualFile; import org.jboss.ws.WSException; -import org.jboss.ws.core.server.ServerConfig; -import org.jboss.ws.core.server.ServerConfigFactory; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.core.utils.IOUtils; /** * An abstract deployer for JSE Endpoints @@ -69,10 +56,10 @@ * through the ServiceEndpointDeployer */ @Override - protected void deployWebServiceDeployment(DeploymentUnit unit) throws DeploymentException + protected void deployServiceEndpoint(DeploymentUnit unit) throws DeploymentException { // Call the super implementation - super.deployWebServiceDeployment(unit); + super.deployServiceEndpoint(unit); // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData String altDD = generateAltDD(unit); @@ -101,10 +88,10 @@ } @Override - protected void undeployWebServiceDeployment(DeploymentUnit unit, UnifiedDeploymentInfo udi) + protected void undeployServiceEndpoint(DeploymentUnit unit, UnifiedDeploymentInfo udi) { // Call the super implementation - super.undeployWebServiceDeployment(unit, udi); + super.undeployServiceEndpoint(unit, udi); } private void modifyWebMetaData(DeploymentUnit unit, String altDD) throws DeploymentException @@ -115,30 +102,26 @@ if (allMetaData.size() > 0) { WebMetaData webMetaData = allMetaData.iterator().next(); - ClassLoader anLoader = unit.getClassLoader(); String serviceEndpointServlet = getServiceEndpointPublisher().getServiceEndpointServlet(); Iterator it = webMetaData.getServlets().iterator(); while (it.hasNext()) { Servlet servlet = (Servlet)it.next(); - String className = servlet.getServletClass(); + String servletClassName = servlet.getServletClass(); // JSP - if (className == null || className.length() == 0) + if (servletClassName == null) continue; - Class<?> servletClass = anLoader.loadClass(className); - if (servletClass.isAnnotationPresent(WebService.class)) + // Nothing to do if we have an <init-param> + if (isAlreadyModified(servlet) == false) { - // Nothing to do if we have an <init-param> - if (isAlreadyModified(servlet) == false) - { - servlet.setServletClass(serviceEndpointServlet); - NameValuePair initParam = new NameValuePair(INIT_PARAM_SERVICE_ENDPOINT_IMPL, className); - servlet.addInitParam(initParam); - } + servlet.setServletClass(serviceEndpointServlet); + NameValuePair initParam = new NameValuePair(INIT_PARAM_SERVICE_ENDPOINT_IMPL, servletClassName); + servlet.addInitParam(initParam); } + // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData webMetaData.setAltDDPath(altDD); } @@ -161,63 +144,4 @@ } return false; } - - private URL expandWebDeployment(DeploymentUnit unit) throws DeploymentException - { - URL expWebAppURL = null; - try - { - VirtualFile virtualWarFile = unit.getDeploymentContext().getRoot(); - // FIXME: JBAS-3811 - VirtualFile.getPathName() returns empty string for jar files - // String warPathName = virtualWarFile.getPathName(); - - String warPathName = virtualWarFile.toURL().toExternalForm(); - if (warPathName.startsWith("jar:") && warPathName.endsWith("!/")) - warPathName = warPathName.substring(4, warPathName.lastIndexOf("!/")); - if (warPathName.startsWith("file:")) - warPathName = new URL(warPathName).getFile(); - - String warShortName = virtualWarFile.getName(); - File warFile = new File(warPathName); - if (warFile.exists() == false) - throw new IllegalStateException("WAR file does not exist: " + warPathName); - - if (warFile.isDirectory() == false) - { - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); - File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); - - File tmpWar = File.createTempFile(warShortName, ".war", tmpdir); - tmpWar.delete(); - - log.debug("Expand war to: " + tmpWar); - - ZipFile zipFile = new ZipFile(warFile); - Enumeration en = zipFile.entries(); - while (en.hasMoreElements()) - { - ZipEntry entry = (ZipEntry)en.nextElement(); - String entryName = entry.getName(); - if (entry.isDirectory() == false) - { - File entryFile = new File(tmpWar.getAbsolutePath() + "/" + entryName); - entryFile.getParentFile().mkdirs(); - OutputStream fos = new FileOutputStream(entryFile); - InputStream fis = zipFile.getInputStream(entry); - IOUtils.copyStream(fos, fis); - fos.close(); - fis.close(); - } - } - - expWebAppURL = tmpWar.toURL(); - } - } - catch (Exception ex) - { - DeploymentException.rethrowAsDeploymentException(ex.getMessage(), ex); - } - return expWebAppURL; - } } Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -23,8 +23,8 @@ import java.net.URL; import java.net.URLClassLoader; -import java.util.Set; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.ejb3.Ejb3Deployment; import org.jboss.logging.Logger; @@ -45,44 +45,31 @@ // logging support private static Logger log = Logger.getLogger(DeploymentInfoAdaptor.class); - public static UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit unit) + public static void buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws DeploymentException { - if (unit.getDeploymentContext().getParent() != null) + try { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit()); - } + if (unit.getDeploymentContext().getParent() != null) + { + udi.parent = new UnifiedDeploymentInfo(null); + buildDeploymentInfo(udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit()); + } - udi.shortName = getShortName(unit); - udi.url = getDeploymentURL(unit); - udi.metaData = buildMetaData(unit); + udi.name = unit.getName(); + udi.simpleName = unit.getSimpleName(); + udi.url = unit.getDeploymentContext().getRoot().toURL(); + udi.metaData = buildMetaData(unit); - // Since we create temporary classes, we need to create a delegate loader - // This prevents CCE problems where the parent loader is available at deploy time, - // and a child loader is available at start time. - udi.classLoader = new URLClassLoader(new URL[]{}, unit.getClassLoader()); - - log.debug("UnifiedDeploymentInfo:\n" + udi); - - return udi; - } - - private static String getShortName(DeploymentUnit unit) - { - String shortName = unit.getDeploymentContext().getRoot().getName(); - return shortName; - } - - private static URL getDeploymentURL(DeploymentUnit unit) - { - try - { - URL url = new URL(unit.getName()); - return url; + // Since we create temporary classes, we need to create a delegate loader + // This prevents CCE problems where the parent loader is available at deploy time, + // and a child loader is available at start time. + udi.classLoader = new URLClassLoader(new URL[]{}, unit.getClassLoader()); + + log.debug("UnifiedDeploymentInfo:\n" + udi); } catch (Exception ex) { - throw new IllegalStateException("Cannot get deployment url", ex); + DeploymentException.rethrowAsDeploymentException(ex.getMessage(), ex); } } Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -26,6 +26,7 @@ import java.net.URL; import java.util.Set; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.virtual.VirtualFile; @@ -50,12 +51,12 @@ @Override public boolean isWebServiceDeployment(DeploymentUnit unit) { - Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class); - return allMetaData.size() > 0 && getWebServicesURL(unit) != null; + boolean hasWebMetaData = unit.getAllMetaData(WebMetaData.class).size() > 0; + return hasWebMetaData && getWebServicesURL(unit) != null; } @Override - protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) + protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) throws DeploymentException { URL webservicesUrl = getWebServicesURL(unit); UnifiedDeploymentInfo udi = new JAXRPCDeployment(getDeploymentType(), webservicesUrl); @@ -65,22 +66,19 @@ private URL getWebServicesURL(DeploymentUnit unit) { + URL webservicesURL = null; VirtualFile vfile = unit.getMetaDataFile("webservices.xml"); if (vfile != null) { try { - String urlStr = vfile.toURL().toExternalForm(); - if (urlStr.startsWith("jar:") && urlStr.endsWith("!/")) - urlStr = urlStr.substring(4, urlStr.length() - 2); - - return new URL(urlStr); + webservicesURL = vfile.toURL(); } catch (Exception ex) { // ignore } } - return null; + return webservicesURL; } } Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -28,6 +28,7 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceProvider; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3Deployment; @@ -51,7 +52,7 @@ } @Override - protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) + protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) throws DeploymentException { UnifiedDeploymentInfo udi = new JAXWSDeployment(getDeploymentType()); DeploymentInfoAdaptor.buildDeploymentInfo(udi, unit); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -29,6 +29,7 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceProvider; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.web.Servlet; @@ -90,7 +91,7 @@ } @Override - protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) + protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit) throws DeploymentException { UnifiedDeploymentInfo udi = new JAXWSDeployment(getDeploymentType()); DeploymentInfoAdaptor.buildDeploymentInfo(udi, unit); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB3.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -64,10 +64,10 @@ String ejbName = seInfo.getServerEndpointMetaData().getLinkName(); UnifiedDeploymentInfo udi = seInfo.getUnifiedDeploymentInfo(); - String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.shortName; + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; if (udi.parent != null) { - nameStr += ",ear=" + udi.parent.shortName; + nameStr += ",ear=" + udi.parent.simpleName; } objectName = ObjectNameFactory.create(nameStr.toString()); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -49,7 +49,7 @@ public void deploy(DeploymentUnit unit) throws DeploymentException { UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); - if (udi != null) + if (udi != null && udi.name.equals(unit.getName())) { // Get the webapp context classloader and use it as the deploymet class loader Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class); @@ -58,8 +58,8 @@ WebMetaData webMetaData = allMetaData.iterator().next(); udi.classLoader = webMetaData.getContextLoader(); } - - log.debug("startServiceEndpoint: " + udi.getCanonicalName()); + + log.debug("Start ServiceEndpoint: " + udi.getCanonicalName()); getServiceEndpointDeployer().start(udi); } } @@ -70,9 +70,9 @@ public void undeploy(DeploymentUnit unit) { UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); - if (udi != null) + if (udi != null && udi.name.equals(unit.getName())) { - log.debug("stopServiceEndpoint: " + udi.getCanonicalName()); + log.debug("Stop ServiceEndpoint: " + udi.getCanonicalName()); getServiceEndpointDeployer().stop(udi); } } Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -68,8 +68,8 @@ String shortName = getContextRoot(warURL); shortName = shortName.substring(1) + ".war"; - udi.shortName = shortName; - udi.url = warURL; + udi.simpleName = shortName; + //udi.url = warURL; udi.metaData = buildWebMetaData(udi, ctx); udi.classLoader = loader; @@ -83,7 +83,7 @@ UnifiedWebMetaData wmd = new UnifiedWebMetaData(); wmd.setServletMappings(getServetMappings(webXML)); wmd.setServletClassNames(getServetClassMap(webXML)); - wmd.setContextRoot(getContextRoot(udi.url)); + //wmd.setContextRoot(getContextRoot(udi.url)); wmd.setConfigName(ctx.getInitParameter("jbossws-config-name")); wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file")); wmd.setSecurityMetaData(getSecurityMetaData(webXML)); Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -161,10 +161,10 @@ UnifiedDeploymentInfo udi; URLClassLoader ctxLoader = (URLClassLoader)Thread.currentThread().getContextClassLoader(); - URL webservices109URL = ctxLoader.findResource("WEB-INF/webservices.xml"); - if (webservices109URL != null) + URL webservicesURL = ctxLoader.findResource("WEB-INF/webservices.xml"); + if (webservicesURL != null) { - udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE, webservices109URL); + udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE, webservicesURL); } else { Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -152,11 +152,11 @@ contextRoot = "/"; if (udi.parent != null) { - String shortName = udi.parent.shortName; + String shortName = udi.parent.simpleName; shortName = shortName.substring(0, shortName.indexOf('.')); contextRoot += shortName + "-"; } - String shortName = udi.shortName; + String shortName = udi.simpleName; shortName = shortName.substring(0, shortName.indexOf('.')); contextRoot += shortName; } Modified: trunk/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2006-12-18 15:58:28 UTC (rev 1666) +++ trunk/src/main/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2006-12-18 19:35:55 UTC (rev 1667) @@ -26,6 +26,7 @@ import java.net.URL; import org.jboss.logging.Logger; +import org.jboss.virtual.VirtualFile; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.xb.binding.ObjectModelFactory;

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1666 - trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-12-18 10:58:28 -0500 (Mon, 18 Dec 2006) New Revision: 1666 Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java Log: added fixme with jira reference Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-18 12:26:19 UTC (rev 1665) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.java 2006-12-18 15:58:28 UTC (rev 1666) @@ -44,7 +44,7 @@ public class WebServiceRefClientTestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref"; - + public static Test suite() { return JBossWSTestSetup.newTestSetup(WebServiceRefClientTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-client.jar"); @@ -57,7 +57,7 @@ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); assertNotNull(wsdlDefinitions); } - + public void testDynamicProxy() throws Exception { URL wsdlURL = new File("resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); @@ -74,6 +74,8 @@ { String helloWorld = "Hello World!"; ApplicationClient.iniCtx = getInitialContext(); + + System.out.println("FIXME [JBWS-1430]: Fix client side @WebServiceRef"); //ClientLauncher.launch(ApplicationClient.class.getName(), "jbossws-client", new String[]{helloWorld}); //assertEquals(helloWorld, ApplicationClient.retStr); }

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1665 - in trunk/src: main/java/org/jboss/ws/core main/java/org/jboss/ws/core/jaxrpc main/java/org/jboss/ws/core/soap main/java/org/jboss/ws/integration/jboss50 main/java/org/jboss/ws/metadata/builder main/java/org/jboss/ws/metadata/builder/jaxrpc main/java/org/jboss/ws/metadata/builder/jaxws main/java/org/jboss/ws/metadata/config main/java/org/jboss/ws/metadata/config/jaxrpc main/java/org/jboss/ws/metadata/config/jaxws main/java/org/jboss/ws/metadata/umdm main/java/org/jboss/

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-12-18 07:26:19 -0500 (Mon, 18 Dec 2006) New Revision: 1665 Added: trunk/src/main/java/org/jboss/ws/metadata/config/Configurable.java trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java trunk/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java Modified: trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java trunk/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java trunk/src/test/resources/common/config/jaxws-endpoint-config.xml Log: Refactor ConfigFactory and ConfigProvider Modified: trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -30,6 +30,8 @@ import org.jboss.ws.core.jaxws.binding.SOAP12BindingJAXWS; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; +import org.jboss.ws.metadata.config.Configurable; +import org.jboss.ws.metadata.config.ConfigurationProvider; /** * Provides access to the protocol binding. @@ -37,17 +39,17 @@ * @author Thomas.Diesler(a)jboss.com * @since 04-Jul-2006 */ -public class CommonBindingProvider +public class CommonBindingProvider implements Configurable { protected EndpointMetaData epMetaData; protected CommonBinding binding; - + public CommonBindingProvider(EndpointMetaData epMetaData) { this.epMetaData = epMetaData; initBinding(epMetaData.getBindingId(), epMetaData.getType()); } - + public CommonBindingProvider(String bindingId, Type type) { initBinding(bindingId, type); @@ -69,6 +71,13 @@ { throw new WSException("Unsupported binding: " + bindingId); } + + // process MTOM config elements + if(epMetaData!=null) + { + ConfigurationProvider configProvider = (ConfigurationProvider)epMetaData; + configProvider.configure(this); + } } public CommonBinding getCommonBinding() Modified: trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -23,26 +23,6 @@ // $Id$ -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPMessage; - import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; @@ -52,18 +32,7 @@ import org.jboss.ws.core.jaxrpc.StubExt; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxrpc.binding.BindingException; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.NameImpl; -import org.jboss.ws.core.soap.SOAPBodyElementDoc; -import org.jboss.ws.core.soap.SOAPBodyElementRpc; -import org.jboss.ws.core.soap.SOAPContentElement; -import org.jboss.ws.core.soap.SOAPElementImpl; -import org.jboss.ws.core.soap.SOAPFactoryImpl; -import org.jboss.ws.core.soap.SOAPFaultImpl; -import org.jboss.ws.core.soap.SOAPHeaderElementImpl; -import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.core.soap.UnboundHeader; +import org.jboss.ws.core.soap.*; import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.utils.DOMUtils; @@ -76,6 +45,15 @@ import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.Element; +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.soap.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + /** * The SOAPBinding interface is an abstraction for the SOAP binding. * @@ -142,7 +120,7 @@ if (opMetaData.isRPCEncoded()) XOPContext.setMTOMEnabled(false); else - XOPContext.setMTOMEnabled( isMTOMEnabled() ); + XOPContext.setMTOMEnabled( isMTOMEnabled() ); // Associate current message with message context SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData); Modified: trunk/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -569,6 +569,7 @@ } catch (Exception ex) { + ex.printStackTrace(); throw new RemoteException("Call invocation failed", ex); } finally Modified: trunk/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/core/soap/SOAPDocument.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -422,7 +422,7 @@ public Object getFeature(String arg0, String arg1) { - // FIXME getFeature + // FIXME hasFeature return null; } Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -28,6 +28,7 @@ import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.ws.metadata.config.ConfigurationProvider; import javax.servlet.ServletContext; @@ -60,10 +61,14 @@ { log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile); ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData(); - sepMetaData.setConfigName(configName); - sepMetaData.setConfigFile(configFile); - sepMetaData.processEndpointConfig(); + ConfigurationProvider configProvider = (ConfigurationProvider)sepMetaData; + configProvider.setConfigName(configName); + configProvider.setConfigFile(configFile); + + // configure handler chain + configProvider.configure(sepMetaData); + log.debug("Updated server meta data" + sepMetaData); } } Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -175,7 +175,7 @@ sepMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath)); } - public static ObjectName getServiceEndpointID(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) + public static ObjectName createServiceEndpointID(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) { String linkName = sepMetaData.getLinkName(); String context = sepMetaData.getContextRoot(); Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -33,6 +33,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.config.jaxrpc.ClientConfigJAXRPC; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; @@ -219,7 +220,8 @@ private void setupHandlers(UnifiedServiceRefMetaData serviceRefMetaData, QName portName, EndpointMetaData epMetaData) { // Add pre handlers - ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)epMetaData.getEndpointConfig(); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ClientConfigJAXRPC jaxrpcConfig = (ClientConfigJAXRPC)factory.getConfig(epMetaData.getConfigName(), epMetaData.getConfigFile()); epMetaData.addHandlers(jaxrpcConfig.getHandlers(epMetaData, HandlerType.PRE)); // Setup the endpoint handlers Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -25,6 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.j2ee.*; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; @@ -145,7 +146,7 @@ serviceMetaData.setWsdlPublishLocation(wsdlPublishLocation); // Copy <port-component> meta data - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(linkName); + UnifiedBeanMetaData beanMetaData = apMetaData.getBeanByEjbName(linkName); if (beanMetaData == null) throw new WSException("Cannot obtain UnifiedBeanMetaData for: " + linkName); @@ -199,7 +200,7 @@ } // init service endpoint id - ObjectName sepID = getServiceEndpointID(udi, sepMetaData); + ObjectName sepID = createServiceEndpointID(udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); replaceAddressLocation(sepMetaData); @@ -218,7 +219,8 @@ setupOperationsFromWSDL(sepMetaData, wsdlEndpoint, seiMapping); // Add pre handlers - EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)sepMetaData.getEndpointConfig(); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + EndpointConfigJAXRPC jaxrpcConfig = (EndpointConfigJAXRPC)factory.getConfig(sepMetaData.getConfigName(), sepMetaData.getConfigFile()); sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE)); // Setup the endpoint handlers Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientEndpointMetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -61,7 +61,7 @@ processSOAPBinding(epMetaData, wsClass); // process config, this will as well setup the handler - epMetaData.processEndpointConfig(); + epMetaData.configure(epMetaData); // Process an optional @HandlerChain annotation if (wsClass.isAnnotationPresent(HandlerChain.class)) Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -48,6 +48,9 @@ protected void processBindingType(EndpointMetaData epMetaData, Class<?> wsClass) { + if (! wsClass.isAnnotationPresent(BindingType.class)) + return; + BindingType anBindingType = (BindingType)wsClass.getAnnotation(BindingType.class); String uri = anBindingType.value(); if (uri.length() > 0) @@ -58,86 +61,87 @@ protected void processPortComponent(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) { - PortComponent anPortComponent = (PortComponent)wsClass.getAnnotation(PortComponent.class); - if (anPortComponent != null) + PortComponent anPortComponent = wsClass.getAnnotation(PortComponent.class); + if (anPortComponent == null) + return; + + // setup config name + if (anPortComponent.configName().length() > 0) { - // setup config name - if (anPortComponent.configName().length() > 0) - { - String configName = anPortComponent.configName(); - sepMetaData.setConfigName(configName); - } + String configName = anPortComponent.configName(); + sepMetaData.setConfigName(configName); + } - // setup config file - if (anPortComponent.configFile().length() > 0) - { - String configFile = anPortComponent.configFile(); - sepMetaData.setConfigFile(configFile); - } + // setup config file + if (anPortComponent.configFile().length() > 0) + { + String configFile = anPortComponent.configFile(); + sepMetaData.setConfigFile(configFile); + } - boolean isJSEEndpoint = udi.type == DeploymentType.JAXWS_JSE; + boolean isJSEEndpoint = udi.type == DeploymentType.JAXWS_JSE; - // context-root - if (anPortComponent.contextRoot().length() > 0) + // context-root + if (anPortComponent.contextRoot().length() > 0) + { + if (isJSEEndpoint) + log.warn("@PortComponent.contextRoot is only valid on EJB endpoints"); + + if (isJSEEndpoint == false) { - if (isJSEEndpoint) - log.warn("@PortComponent.contextRoot is only valid on EJB endpoints"); + String contextRoot = anPortComponent.contextRoot(); + if (contextRoot.startsWith("/") == false) + contextRoot = "/" + contextRoot; - if (isJSEEndpoint == false) - { - String contextRoot = anPortComponent.contextRoot(); - if (contextRoot.startsWith("/") == false) - contextRoot = "/" + contextRoot; - - sepMetaData.setContextRoot(contextRoot); - } + sepMetaData.setContextRoot(contextRoot); } + } - // url-pattern - if (anPortComponent.urlPattern().length() > 0) + // url-pattern + if (anPortComponent.urlPattern().length() > 0) + { + if (isJSEEndpoint) + log.warn("@PortComponent.urlPattern is only valid on EJB endpoints"); + + if (isJSEEndpoint == false) { - if (isJSEEndpoint) - log.warn("@PortComponent.urlPattern is only valid on EJB endpoints"); - - if (isJSEEndpoint == false) - { - String urlPattern = anPortComponent.urlPattern(); - sepMetaData.setURLPattern(urlPattern); - } + String urlPattern = anPortComponent.urlPattern(); + sepMetaData.setURLPattern(urlPattern); } + } - // auth-method - if (anPortComponent.authMethod().length() > 0) + // auth-method + if (anPortComponent.authMethod().length() > 0) + { + if (isJSEEndpoint) + log.warn("@PortComponent.authMethod is only valid on EJB endpoints"); + + if (isJSEEndpoint == false) { - if (isJSEEndpoint) - log.warn("@PortComponent.authMethod is only valid on EJB endpoints"); - - if (isJSEEndpoint == false) - { - String authMethod = anPortComponent.authMethod(); - sepMetaData.setAuthMethod(authMethod); - } + String authMethod = anPortComponent.authMethod(); + sepMetaData.setAuthMethod(authMethod); } + } - // transport-guarantee - if (anPortComponent.transportGuarantee().length() > 0) + // transport-guarantee + if (anPortComponent.transportGuarantee().length() > 0) + { + if (isJSEEndpoint) + log.warn("@PortComponent.transportGuarantee is only valid on EJB endpoints"); + + if (isJSEEndpoint == false) { - if (isJSEEndpoint) - log.warn("@PortComponent.transportGuarantee is only valid on EJB endpoints"); - - if (isJSEEndpoint == false) - { - String transportGuarantee = anPortComponent.transportGuarantee(); - sepMetaData.setTransportGuarantee(transportGuarantee); - } + String transportGuarantee = anPortComponent.transportGuarantee(); + sepMetaData.setTransportGuarantee(transportGuarantee); } - - // virtual hosts - String[] virtualHosts = anPortComponent.virtualHosts(); - if (virtualHosts != null & virtualHosts.length > 0) - { - sepMetaData.setVirtualHosts(virtualHosts); - } } + + // virtual hosts + String[] virtualHosts = anPortComponent.virtualHosts(); + if (virtualHosts != null & virtualHosts.length > 0) + { + sepMetaData.setVirtualHosts(virtualHosts); + } + } } Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -145,7 +145,7 @@ MetaDataBuilder.replaceAddressLocation(sepMetaData); // init service endpoint id - ObjectName sepID = MetaDataBuilder.getServiceEndpointID(udi, sepMetaData); + ObjectName sepID = MetaDataBuilder.createServiceEndpointID(udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); return sepMetaData; Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -68,7 +68,6 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.BindingType; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; import javax.xml.ws.WebFault; @@ -89,10 +88,13 @@ import java.util.List; import java.util.Map; -/** An abstract annotation meta data builder. +/** + * An abstract annotation meta data builder. * * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Heiko.Braun(a)jboss.org + * * @since 15-Oct-2005 */ @SuppressWarnings("deprecation") @@ -304,7 +306,7 @@ return null; } - private QName getWebParamName(OperationMetaData opMetaData, int index, Class javaType, WebParam webParam) + private QName getWebParamName(OperationMetaData opMetaData, int index, WebParam webParam) { String namespace = null; String name = null; @@ -339,7 +341,7 @@ return (namespace != null) ? new QName(namespace, name) : new QName(name); } - private QName getWebResultName(OperationMetaData opMetaData, Class javaType, WebResult anWebResult) + private QName getWebResultName(OperationMetaData opMetaData, WebResult anWebResult) { String name = null; String namespace = null; @@ -427,7 +429,7 @@ */ private void processMetaExtensions(EndpointMetaData epMetaData, OperationMetaData opMetaData) { - // Until there is a addressing annotion we fallback to implicit action asosciation + // Until there is a addressing annotion we fallback to implicit action association // TODO: figure out a way to assign message name instead of IN and OUT String tns = epMetaData.getQName().getNamespaceURI(); String portTypeName = epMetaData.getQName().getLocalPart(); @@ -530,7 +532,7 @@ if (isWrapped) { - QName wrappedElementName = getWebParamName(opMetaData, i, javaType, anWebParam); + QName wrappedElementName = getWebParamName(opMetaData, i, anWebParam); String variable = convertToVariable(wrappedElementName.getLocalPart()); WrappedParameter wrappedParameter = new WrappedParameter(wrappedElementName, javaTypeName, variable, i); @@ -546,7 +548,7 @@ } else { - QName xmlName = getWebParamName(opMetaData, i, javaType, anWebParam); + QName xmlName = getWebParamName(opMetaData, i, anWebParam); ParameterMetaData paramMetaData = new ParameterMetaData(opMetaData, xmlName, javaTypeName); paramMetaData.setInHeader(isHeader); @@ -566,7 +568,7 @@ Class returnType = method.getReturnType(); Type genericReturnType = method.getGenericReturnType(); String returnTypeName = returnType.getName(); - if ((returnType == void.class) == false) + if (!(returnType == void.class)) { if (opMetaData.isOneWay()) throw new IllegalArgumentException("[JSR-181 2.5.1] The method '" + method.getName() + "' can not have a return value if it is marked OneWay"); @@ -574,7 +576,7 @@ WebResult anWebResult = method.getAnnotation(WebResult.class); boolean isHeader = anWebResult != null && anWebResult.header(); boolean isWrapped = opMetaData.isDocumentWrapped() && !isHeader; - QName xmlName = getWebResultName(opMetaData, returnType, anWebResult); + QName xmlName = getWebResultName(opMetaData, anWebResult); if (isWrapped) { @@ -632,7 +634,7 @@ throw new WSException("Cannot obtain @WebService annotation from: " + sepClass.getName()); Class<?> seiClass = null; - String seiName = null; + String seiName; WSDLUtils wsdlUtils = WSDLUtils.getInstance(); String name = anWebService.name(); @@ -750,7 +752,7 @@ if (wsClass.isAnnotationPresent(SOAPMessageHandlers.class)) throw new WSException("Cannot combine @HandlerChain with @SOAPMessageHandlers"); - HandlerChain anHandlerChain = (HandlerChain)wsClass.getAnnotation(HandlerChain.class); + HandlerChain anHandlerChain = wsClass.getAnnotation(HandlerChain.class); URL fileURL = null; String filename = anHandlerChain.file(); @@ -884,8 +886,12 @@ protected void processSOAPBinding(EndpointMetaData epMetaData, Class<?> wsClass) { - SOAPBinding anSoapBinding = (SOAPBinding)wsClass.getAnnotation(SOAPBinding.class); + if (! wsClass.isAnnotationPresent(SOAPBinding.class)) + return; + + SOAPBinding anSoapBinding = wsClass.getAnnotation(SOAPBinding.class); + SOAPBinding.Style attrStyle = anSoapBinding.style(); Style style = (attrStyle == SOAPBinding.Style.RPC ? Style.RPC : Style.DOCUMENT); epMetaData.setStyle(style); @@ -959,49 +965,61 @@ // Clear the java types, etc. resetMetaDataBuilder(udi.classLoader); - ServerEndpointMetaData sepMetaData = result.semd; - ServiceMetaData serviceMetaData = result.smd; - Class<?> wsClass = result.klass; + ServerEndpointMetaData sepMetaData = result.semd; + ServiceMetaData serviceMetaData = result.smd; + Class<?> seiClass = result.klass; + sepMetaData.setLinkName(linkName); + sepMetaData.setServiceEndpointImplName(sepClass.getName()); + sepMetaData.setServiceEndpointInterfaceName(seiClass.getName()); // Assign the WS-Security configuration, WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(udi); serviceMetaData.setSecurityConfiguration(securityConfiguration); - sepMetaData.setServiceEndpointImplName(sepClass.getName()); - sepMetaData.setServiceEndpointInterfaceName(wsClass.getName()); // Process an optional @SOAPBinding annotation - if (wsClass.isAnnotationPresent(SOAPBinding.class)) - processSOAPBinding(sepMetaData, wsClass); + processSOAPBinding(sepMetaData, seiClass); // Process an optional @BindingType annotation - if (wsClass.isAnnotationPresent(BindingType.class)) - processBindingType(sepMetaData, wsClass); + processBindingType(sepMetaData, seiClass); + // Process web methods + processWebMethods(sepMetaData, seiClass); + // Init the transport guarantee initTransportGuaranteeJSE(udi, sepMetaData, linkName); - // Process web methods - processWebMethods(sepMetaData, wsClass); - // Initialize types createJAXBContext(sepMetaData); populateXmlTypes(sepMetaData); // Process or generate WSDL - processOrGenerateWSDL(wsClass, serviceMetaData, result.wsdlLocation, sepMetaData); + processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation, sepMetaData); - // Read the generated WSDL and initialize the schema model - // FIXME - This should be removed + // process config name and config file amongst others + processPortComponent(udi, seiClass, linkName, sepMetaData); + + // setup handler chain from config + sepMetaData.configure(sepMetaData); + + // Process an optional @HandlerChain annotation + if (sepClass.isAnnotationPresent(HandlerChain.class)) + { + processHandlerChain(sepMetaData, sepClass); + } + else if (seiClass.isAnnotationPresent(HandlerChain.class)) + { + processHandlerChain(sepMetaData, seiClass); + } + + + // Sanity check: read the generated WSDL and initialize the schema model WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); serviceMetaData.getTypesMetaData().setSchemaModel(schemaModel); - // Set the endpoint address - processPortComponent(udi, wsClass, linkName, sepMetaData); - // Init the endpoint address MetaDataBuilder.initEndpointAddress(udi, sepMetaData, linkName); @@ -1009,24 +1027,11 @@ MetaDataBuilder.replaceAddressLocation(sepMetaData); // Process an optional @SOAPMessageHandlers annotation - if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || wsClass.isAnnotationPresent(SOAPMessageHandlers.class)) + if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || seiClass.isAnnotationPresent(SOAPMessageHandlers.class)) log.warn("@SOAPMessageHandlers is deprecated as of JAX-WS 2.0 with no replacement."); - // setup handler chain from config - sepMetaData.processEndpointConfig(); - - // Process an optional @HandlerChain annotation - if (sepClass.isAnnotationPresent(HandlerChain.class)) - { - processHandlerChain(sepMetaData, sepClass); - } - else if (wsClass.isAnnotationPresent(HandlerChain.class)) - { - processHandlerChain(sepMetaData, wsClass); - } - // init service endpoint id - ObjectName sepID = MetaDataBuilder.getServiceEndpointID(udi, sepMetaData); + ObjectName sepID = MetaDataBuilder.createServiceEndpointID(udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); return sepMetaData; Modified: trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -56,13 +56,13 @@ public abstract List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type); - public boolean getFeature(URI type) { + public boolean hasFeature(URI type) { return features.contains(type); } - public boolean getFeature(String uri) + public boolean hasFeature(String uri) { - return getFeature(nameToURI(uri)); + return hasFeature(nameToURI(uri)); } public void setFeature(String type, boolean enabled) { Added: trunk/src/main/java/org/jboss/ws/metadata/config/Configurable.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/Configurable.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -0,0 +1,11 @@ +package org.jboss.ws.metadata.config; + +/** + * A marker interface that identifies configurable JBossWS components. + * + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 15.12.2006 + */ +public interface Configurable { +} Added: trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/ConfigurationProvider.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -0,0 +1,37 @@ +package org.jboss.ws.metadata.config; + +/** + * Provides configuration for JBossWS components.<br> + * Currently this is implemented by <code>EndpointMetaData</code>. + * + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 15.12.2006 + * + * @see org.jboss.ws.metadata.umdm.EndpointMetaData + */ +public interface ConfigurationProvider { + + static final String DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml"; + static final String DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml"; + static final String DEFAULT_ENDPOINT_CONFIG_NAME = "Standard Endpoint"; + + static final String DEFAULT_JAXRPC_CLIENT_CONFIG = "META-INF/standard-jaxrpc-client-config.xml"; + static final String DEFAULT_JAXWS_CLIENT_CONFIG = "META-INF/standard-jaxws-client-config.xml"; + static final String DEFAULT_CLIENT_CONFIG_NAME = "Standard Client"; + + /** + * Callback for components that require configuration through jbossws-dd + * + * @param configurable + */ + void configure(Configurable configurable); + + String getConfigFile(); + + void setConfigFile(String configFile); + + String getConfigName(); + + void setConfigName(String configName); +} Added: trunk/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.config; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 14.12.2006 + */ +public class EndpointFeature { + public final static String MTOM = "http://org.jboss.ws/mtom"; +} Modified: trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -1,3 +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. + */ package org.jboss.ws.metadata.config; import java.net.URI; @@ -2,2 +23,7 @@ +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 14.12.2006 + */ public class EndpointProperty Modified: trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -28,12 +28,15 @@ import org.jboss.ws.core.utils.DOMUtils; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; +import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; +import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; import org.w3c.dom.Element; import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; /** @@ -47,8 +50,8 @@ // provide logging private final Logger log = Logger.getLogger(JBossWSConfigFactory.class); - private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0"; - private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0"; + private static String URN_JAXRPC_CONFIG = "urn:jboss:jaxrpc-config:2.0"; + private static String URN_JAXWS_CONFIG = "urn:jboss:jaxws-config:2.0"; // Hide constructor private JBossWSConfigFactory() @@ -69,7 +72,6 @@ Object wsConfig; try { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); unmarshaller.setValidation(true); unmarshaller.setSchemaValidation(true); @@ -112,4 +114,55 @@ throw new WSException(ex); } } + + public CommonConfig getConfig(String configName, String configFile) + { + CommonConfig config; + + log.debug("getConfig: [name=" + configName + ",url=" + configFile + "]"); + + // Get the config root + URL configURL = filenameToURL(configFile); + Object configRoot = parse(configURL); + + // Get the endpoint config + if (configRoot instanceof ConfigRootJAXRPC) + { + config = ((ConfigRootJAXRPC)configRoot).getConfigByName(configName); + } + else + { + config = ((ConfigRootJAXWS)configRoot).getConfigByName(configName); + } + + if (config == null) + throw new WSException("Cannot obtain config: " + configName); + + + return config; + } + + private static URL filenameToURL(String configFile) { + URL configURL = null; + try + { + configURL = new URL(configFile); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try to get the URL as resource + if (configURL == null) + { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + configURL = cl.getResource(configFile); + if (configURL == null) + throw new WSException("Cannot get resource: " + configFile); + } + + return configURL; + } + } Modified: trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxrpc/ConfigRootJAXRPC.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -91,4 +91,12 @@ return config; } + + public CommonConfigJAXRPC getConfigByName(String name) + { + CommonConfigJAXRPC config = getClientConfigByName(name); + if(null == config) + config = getEndpointConfigByName(name); + return config; + } } Modified: trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/config/jaxws/ConfigRootJAXWS.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -91,4 +91,12 @@ return config; } + + public CommonConfigJAXWS getConfigByName(String name) + { + CommonConfigJAXWS config = getClientConfigByName(name); + if(null == config) + config = getEndpointConfigByName(name); + return config; + } } Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -23,19 +23,11 @@ // $Id$ -import java.net.MalformedURLException; -import java.net.URL; +import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.metadata.config.ConfigurationProvider; import javax.xml.namespace.QName; -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; -import org.jboss.ws.metadata.config.jaxws.ClientConfigJAXWS; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - /** * Client side endpoint meta data. * @@ -44,74 +36,16 @@ */ public class ClientEndpointMetaData extends EndpointMetaData { - // provide logging - private static Logger log = Logger.getLogger(ClientEndpointMetaData.class); - public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) { super(service, qname, interfaceQName, type); } - public void setConfigName(String configName) - { - super.setConfigName(configName); - endpointConfig = null; - } - - public void setConfigFile(String configFile) - { - super.setConfigFile(configFile); - endpointConfig = null; - } - - @Override - public Object getEndpointConfig() - { - if (endpointConfig == null) - { - String configName = getConfigName(); - String configFile = getConfigFile(); - - log.debug("getClientConfig: [name=" + configName + ",url=" + configFile + "]"); - - // Get the config root - URL configURL = filenameToURL(configFile); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - Object wsConfig = factory.parse(configURL); - - // Get the client config - if (wsConfig instanceof ConfigRootJAXRPC) - { - endpointConfig = ((ConfigRootJAXRPC)wsConfig).getClientConfigByName(configName); - } - else - { - endpointConfig = ((ConfigRootJAXWS)wsConfig).getClientConfigByName(configName); - } - - if (endpointConfig == null) - throw new WSException("Cannot obtain client config: " + configName); - } - - return endpointConfig; - } - - public void processEndpointConfig() { - - log.debug("Process endpoint config"); - - // rebuild handler from config - clearHandlers(); - ClientConfigJAXWS jaxwsConfig = (ClientConfigJAXWS)getEndpointConfig(); - addHandlers(jaxwsConfig.getHandlers(this, HandlerType.PRE)); - addHandlers(jaxwsConfig.getHandlers(this, HandlerType.POST)); - } - public String getConfigName() { String configName = super.getConfigName(); if (configName == null) { - configName = "Standard Client"; + configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; setConfigName(configName); } return configName; @@ -123,59 +57,37 @@ { if (getType() == Type.JAXRPC) { - configFile = "META-INF/standard-jaxrpc-client-config.xml"; + configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG; } else { - configFile = "META-INF/standard-jaxws-client-config.xml"; + configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG; } setConfigFile(configFile); } return configFile; } - private URL filenameToURL(String configFile) { - URL configURL = null; - try - { - configURL = new URL(configFile); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try to get the URL as resource - if (configURL == null) - { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - configURL = cl.getResource(configFile); - if (configURL == null) - throw new WSException("Cannot get resource: " + configFile); - } - return configURL; - } - public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); - buffer.append("\n type=" + getType()); - buffer.append("\n qname=" + getQName()); - buffer.append("\n address=" + getEndpointAddress()); - buffer.append("\n binding=" + getBindingId()); - buffer.append("\n seiName=" + getServiceEndpointInterfaceName()); - buffer.append("\n configFile=" + getConfigFile()); - buffer.append("\n configName=" + getConfigName()); - buffer.append("\n authMethod=" + getAuthMethod()); - buffer.append("\n properties=" + getProperties()); + buffer.append("\n type=").append(getType()); + buffer.append("\n qname=").append(getQName()); + buffer.append("\n address=" ).append(getEndpointAddress()); + buffer.append("\n binding=" ).append( getBindingId()); + buffer.append("\n seiName=" ).append( getServiceEndpointInterfaceName()); + buffer.append("\n configFile=" ).append( getConfigFile()); + buffer.append("\n configName=" ).append( getConfigName()); + buffer.append("\n authMethod=" ).append( getAuthMethod()); + buffer.append("\n properties=" ).append( getProperties()); for (OperationMetaData opMetaData : getOperations()) { - buffer.append("\n" + opMetaData); + buffer.append("\n" ).append( opMetaData); } for (HandlerMetaData hdlMetaData : getHandlerMetaData(HandlerType.ALL)) { - buffer.append("\n" + hdlMetaData); + buffer.append("\n" ).append( hdlMetaData); } return buffer.toString(); } Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -26,6 +26,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonBindingProvider; +import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.Use; @@ -36,7 +38,7 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.config.*; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import javax.jws.soap.SOAPBinding.ParameterStyle; @@ -53,6 +55,7 @@ * @since 12-May-2005 */ public abstract class EndpointMetaData extends ExtensibleMetaData + implements ConfigurationProvider, Configurable { // provide logging private static Logger log = Logger.getLogger(EndpointMetaData.class); @@ -66,7 +69,7 @@ private ServiceMetaData serviceMetaData; // The REQUIRED endpoint config - protected CommonConfig endpointConfig; + private CommonConfig endpointConfig; // The REQUIRED name private QName portName; @@ -133,37 +136,6 @@ return interfaceQName; } - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - this.endpointConfig = null; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - this.endpointConfig = null; - } - - public abstract Object getEndpointConfig(); - - /** - * Processing the endpoint configuration will - * reset parts of the meta data model and update it according to - * the configuration given. - */ - public abstract void processEndpointConfig(); - public String getEndpointAddress() { return endpointAddress; @@ -216,8 +188,7 @@ /** Get the class loader associated with the endpoint meta data */ public ClassLoader getClassLoader() { - ClassLoader classLoader = getServiceMetaData().getUnifiedMetaData().getClassLoader(); - return classLoader; + return getServiceMetaData().getUnifiedMetaData().getClassLoader(); } /** @@ -372,7 +343,7 @@ for (ParameterMetaData auxParam : auxOperation.getParameters()) { ParameterMode mode = auxParam.getMode(); - if (auxParam.isInHeader() == false && mode != ParameterMode.OUT) + if (!auxParam.isInHeader() && mode != ParameterMode.OUT) { paramMetaData = auxParam; break; @@ -583,4 +554,77 @@ } } } + + // --------------------------------------------------------------- + // Configuration provider impl + + /** + * Callback for components that require configuration through jbossws-dd + * + * @param configurable + */ + public void configure(Configurable configurable) { + + if(null == endpointConfig) + { + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + endpointConfig = factory.getConfig(getConfigName(), getConfigFile()); + } + + // SOAPBinding configuration + if(configurable instanceof CommonBindingProvider) + { + log.debug("Configure SOAPBinding"); + + if(endpointConfig.hasFeature(EndpointFeature.MTOM)) + { + ((CommonSOAPBinding)configurable).setMTOMEnabled(true); + log.debug("Enable MTOM on endpoint " + this.getQName()); + } + } + + // Configure EndpointMetaData + else if(configurable instanceof EndpointMetaData) + { + + log.debug("Configure EndpointMetaData"); + + List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); + clearHandlers(); + + List<HandlerMetaData> preHandlers = endpointConfig.getHandlers(this, HandlerType.PRE); + List<HandlerMetaData> postHandlers = endpointConfig.getHandlers(this, HandlerType.POST); + + addHandlers(preHandlers); + addHandlers(sepHandlers); + addHandlers(postHandlers); + + log.debug("Added " + preHandlers.size() + " PRE handlers"); + log.debug("Added " + postHandlers.size() + " POST handlers"); + } + + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + this.endpointConfig = null; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + this.endpointConfig = null; + } + } Modified: trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -23,19 +23,11 @@ // $Id$ -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.metadata.config.CommonConfig; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.metadata.config.ConfigurationProvider; import javax.management.ObjectName; import javax.xml.namespace.QName; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; /** * Client side endpoint meta data. @@ -46,9 +38,6 @@ */ public class ServerEndpointMetaData extends EndpointMetaData { - // provide logging - private static Logger log = Logger.getLogger(ServerEndpointMetaData.class); - public static final String SEPID_DOMAIN = "jboss.ws"; public static final String SEPID_PROPERTY_CONTEXT = "context"; public static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; @@ -72,27 +61,11 @@ // The bean that registers with the ServiceEndpointManager private String managedEndpointBean = "org.jboss.ws.core.server.ServiceEndpoint"; - private static final String DEFAULT_JAXRPC_CONFIG_FILE = "META-INF/standard-jaxrpc-endpoint-config.xml"; - private static final String DEFAULT_JAXWS_CONFIG_FILE = "META-INF/standard-jaxws-endpoint-config.xml"; - private static final String DEFAULT_CONFIG_NAME = "Standard Endpoint"; - public ServerEndpointMetaData(ServiceMetaData service, QName qname, QName interfaceQName, Type type) { super(service, qname, interfaceQName, type); } - public void setConfigName(String configName) - { - super.setConfigName(configName); - endpointConfig = null; - } - - public void setConfigFile(String configFile) - { - super.setConfigFile(configFile); - endpointConfig = null; - } - public String getLinkName() { return linkName; @@ -189,43 +162,11 @@ this.managedEndpointBean = managedEndpointBean; } - @Override - public CommonConfig getEndpointConfig() - { - if (endpointConfig == null) - { - String configName = getConfigName(); - String configFile = getConfigFile(); - - log.debug("getEndpointConfig: [name=" + configName + ",url=" + configFile + "]"); - - // Get the config root - URL configURL = filenameToURL(configFile); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - Object wsConfig = factory.parse(configURL); - - // Get the endpoint config - if (wsConfig instanceof ConfigRootJAXRPC) - { - endpointConfig = ((ConfigRootJAXRPC)wsConfig).getEndpointConfigByName(configName); - } - else - { - endpointConfig = ((ConfigRootJAXWS)wsConfig).getEndpointConfigByName(configName); - } - - if (endpointConfig == null) - throw new WSException("Cannot obtain endpoint config: " + configName); - } - - return endpointConfig; - } - public String getConfigName() { String configName = super.getConfigName(); if (configName == null) { - configName = DEFAULT_CONFIG_NAME; + configName = ConfigurationProvider.DEFAULT_ENDPOINT_CONFIG_NAME; setConfigName(configName); } return configName; @@ -238,57 +179,17 @@ { if (getType() == Type.JAXRPC) { - configFile = DEFAULT_JAXRPC_CONFIG_FILE; + configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; } else { - configFile = DEFAULT_JAXWS_CONFIG_FILE; + configFile = ConfigurationProvider.DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE; } setConfigFile(configFile); } return configFile; } - /** - * Processes an associated configuration and - * rebuilds the related meta data model. - */ - public void processEndpointConfig() - { - log.debug("Process endpoint config"); - - // update handler configuration - List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); - clearHandlers(); - - CommonConfig sepConfig = getEndpointConfig(); - addHandlers(sepConfig.getHandlers(this, HandlerType.PRE)); - addHandlers(sepHandlers); - addHandlers(sepConfig.getHandlers(this, HandlerType.POST)); - } - - private URL filenameToURL(String configFile) { - URL configURL = null; - try - { - configURL = new URL(configFile); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try to get the URL as resource - if (configURL == null) - { - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - configURL = cl.getResource(configFile); - if (configURL == null) - throw new WSException("Cannot get resource: " + configFile); - } - return configURL; - } - public String toString() { StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:"); Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -23,12 +23,11 @@ // $Id$ -import javax.xml.namespace.QName; - -import org.jboss.util.NotImplementedException; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; +import javax.xml.namespace.QName; + /** * Tools Endpoint Metadata * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana @@ -42,14 +41,4 @@ { super(service, name, interfaceQName, Type.JAXRPC); } - - @Override - public Object getEndpointConfig() - { - throw new NotImplementedException(); - } - - public void processEndpointConfig() { - throw new NotImplementedException(); - } } \ No newline at end of file Modified: trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml =================================================================== --- trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2006-12-18 12:26:19 UTC (rev 1665) @@ -3,36 +3,43 @@  <jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - </client-config> - - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerOutbound</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + </client-config> + + <client-config> + <config-name>Standard MTOM Client</config-name> + + <feature>http://org.jboss.ws/mtom</feature> + + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerOutbound</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + </jaxws-config> \ No newline at end of file Modified: trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2006-12-18 12:26:19 UTC (rev 1665) @@ -3,36 +3,44 @@  <jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurity Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerInbound</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - </endpoint-config> - + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + + <feature>http://org.jboss.ws/mtom</feature> + + </endpoint-config> + + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerInbound</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + </endpoint-config> + </jaxws-config> \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2006-12-18 12:26:19 UTC (rev 1665) @@ -77,12 +77,12 @@ ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); assertNotNull("Null config", config); - EndpointConfigJAXWS epConfig = config.getEndpointConfig().get(1); - assertTrue("Feature not set" , epConfig.getFeature("http://org.jboss.ws/mtom")); + EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard MTOM Endpoint"); + assertTrue("Feature not set" , epConfig.hasFeature("http://org.jboss.ws/mtom")); // disable feature epConfig.setFeature("http://org.jboss.ws/mtom", false); - assertFalse("Feature still set", epConfig.getFeature("http://org.jboss.ws/mtom")); + assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); } @@ -95,7 +95,7 @@ ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); assertNotNull("Null config", config); - EndpointConfigJAXWS epConfig = config.getEndpointConfig().get(1); + EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard WSSecurity Endpoint"); String value = epConfig.getProperty(EndpointProperty.MTOM_THRESHOLD); assertNotNull("Property does not exist", value); assertEquals("Wrong property valule", value, "5000"); Modified: trunk/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- trunk/src/test/resources/common/config/jaxws-endpoint-config.xml 2006-12-18 10:52:44 UTC (rev 1664) +++ trunk/src/test/resources/common/config/jaxws-endpoint-config.xml 2006-12-18 12:26:19 UTC (rev 1665) @@ -12,7 +12,14 @@ </endpoint-config> <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> <pre-handler-chains>

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1664 - in trunk/src/main/java/org/jboss/ws/core: . jaxws/binding server

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-12-18 05:52:44 -0500 (Mon, 18 Dec 2006) New Revision: 1664 Modified: trunk/src/main/java/org/jboss/ws/core/CommonBinding.java trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java trunk/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java trunk/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java Log: Prevent NPE in post process message Modified: trunk/src/main/java/org/jboss/ws/core/CommonBinding.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/CommonBinding.java 2006-12-17 22:04:17 UTC (rev 1663) +++ trunk/src/main/java/org/jboss/ws/core/CommonBinding.java 2006-12-18 10:52:44 UTC (rev 1664) @@ -52,5 +52,5 @@ void unbindResponseMessage(OperationMetaData opMetaData, Object resMessage, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException; /** bind an exception to a fault message */ - void bindFaultMessage(Exception ex); + Object bindFaultMessage(Exception ex); } Modified: trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-17 22:04:17 UTC (rev 1663) +++ trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-18 10:52:44 UTC (rev 1664) @@ -52,7 +52,6 @@ import org.jboss.ws.core.jaxrpc.StubExt; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxrpc.binding.BindingException; -import org.jboss.ws.core.jaxws.SOAPFaultHelperJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; @@ -533,7 +532,7 @@ } } - public void bindFaultMessage(Exception ex) + public Object bindFaultMessage(Exception ex) { SOAPMessage faultMessage = createFaultMessageFromException(ex); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -545,6 +544,7 @@ { log.warn("Cannot set fault message in message context"); } + return faultMessage; } protected abstract SOAPMessage createFaultMessageFromException(Exception ex); Modified: trunk/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2006-12-17 22:04:17 UTC (rev 1663) +++ trunk/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2006-12-18 10:52:44 UTC (rev 1664) @@ -27,6 +27,7 @@ import java.util.Map; import javax.xml.namespace.QName; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.Handler; import javax.xml.ws.http.HTTPBinding; @@ -68,7 +69,7 @@ throw new NotImplementedException(); } - public void bindFaultMessage(Exception ex) + public Object bindFaultMessage(Exception ex) { throw new NotImplementedException(); } Modified: trunk/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2006-12-17 22:04:17 UTC (rev 1663) +++ trunk/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2006-12-18 10:52:44 UTC (rev 1664) @@ -122,7 +122,7 @@ throw new NotImplementedException(); } - public void bindFaultMessage(Exception ex) + public Object bindFaultMessage(Exception ex) { SOAPMessage faultMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -134,6 +134,7 @@ { log.warn("Cannot set fault message in message context"); } + return faultMessage; } public List<Handler> getHandlerChain() Modified: trunk/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2006-12-17 22:04:17 UTC (rev 1663) +++ trunk/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2006-12-18 10:52:44 UTC (rev 1664) @@ -137,7 +137,7 @@ throw new NotImplementedException(); } - public void bindFaultMessage(Exception ex) + public Object bindFaultMessage(Exception ex) { SOAPMessage faultMessage = SOAPFaultHelperJAXWS.exceptionToFaultMessage(ex); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -149,6 +149,7 @@ { log.warn("Cannot set fault message in message context"); } + return faultMessage; } public List<Handler> getHandlerChain() Modified: trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java =================================================================== --- trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2006-12-17 22:04:17 UTC (rev 1663) +++ trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2006-12-18 10:52:44 UTC (rev 1664) @@ -201,9 +201,10 @@ // Invoke the service endpoint ServiceEndpointInvoker seInvoker = seInfo.getInvoker(); SOAPMessage resMessage = seInvoker.invoke(seInfo, context); + + if (resMessage != null) + postProcessResponse(headerSource, resMessage); - postProcessResponse(headerSource, resMessage); - return resMessage; } catch (Exception ex) @@ -216,10 +217,12 @@ { CommonBindingProvider bindingProvider = getCommonBindingProvider(); CommonBinding binding = bindingProvider.getCommonBinding(); - binding.bindFaultMessage(ex); + resMessage = (SOAPMessage)binding.bindFaultMessage(ex); } - postProcessResponse(headerSource, resMessage); + if (resMessage != null) + postProcessResponse(headerSource, resMessage); + return resMessage; } finally @@ -278,7 +281,7 @@ } catch (Exception ex) { - throw new JAXRPCException("Cannot create or send response message", ex); + throw new JAXRPCException("Faild to post process response message", ex); } }

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1663 - in branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260: scenario_B scenario_D scenario_M scenario_N scenario_P scenario_Q scenario_S scenario_T scenario_V scenario_W

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2006-12-17 17:04:17 -0500 (Sun, 17 Dec 2006) New Revision: 1663 Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml Log: JBWS-1260 - Modified tests to remove partial unwrapping and to remove unwrapping of attributes. Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String firstName, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_B/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>firstName</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>surname</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String firstName, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_D/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>firstName</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>surname</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String postcode, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_M/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>surname</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String postcode, java.lang.String surname) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_N/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -49,25 +49,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>surname</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.LookupResponse lookup(java.lang.String postcode, java.lang.String[] surname) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_P/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -34,19 +34,16 @@ <xml-element-name>number</xml-element-name> </variable-mapping> </java-xml-type-mapping> - -  -  -  - + </java-xml-type-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> @@ -62,25 +59,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>surname</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(java.lang.String postcode, java.lang.String[] surname) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Q/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -34,19 +34,16 @@ <xml-element-name>number</xml-element-name> </variable-mapping> </java-xml-type-mapping> - -  -  -  - + </java-xml-type-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> @@ -62,25 +59,15 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>java.lang.String[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>surname</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_S/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_T/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.LookupResponse lookup(org.jboss.test.ws.jbws1260.Lookup parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_V/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Lookup</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.LookupResponse</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/PhoneBook_PortType.java 2006-12-17 22:04:17 UTC (rev 1663) @@ -6,6 +6,6 @@ package org.jboss.test.ws.jbws1260; public interface PhoneBook_PortType extends java.rmi.Remote { - public java.lang.String lookup(java.lang.String postcode) throws + public org.jboss.test.ws.jbws1260.TelephoneNumber lookup(org.jboss.test.ws.jbws1260.Person parameters) throws java.rmi.RemoteException; } Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wrapped-mapping.xml 2006-12-17 22:04:17 UTC (rev 1663) @@ -41,20 +41,19 @@ <service-endpoint-method-mapping> <java-method-name>lookup</java-method-name> <wsdl-operation>lookup</wsdl-operation> - <wrapped-element/> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>java.lang.String</param-type> + <param-type>org.jboss.test.ws.jbws1260.Person</param-type> <wsdl-message-mapping> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>parameters</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> + <method-return-value>org.jboss.test.ws.jbws1260.TelephoneNumber</method-return-value> <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>postcode</wsdl-message-part-name> + <wsdl-message-part-name>result</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping>

19 years, 4 months

1
0
0 / 0

JBossWS SVN: r1662 - in branches/dlofthouse/JBWS-1260/src: main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers test/java/org/jboss/test/ws/tools/validation test/resources/tools/jbws1260/scenario_W test/resources/tools/jbws1260/scenario_Y test/resources/tools/jbws1260/scenario_Z

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2006-12-16 17:18:42 -0500 (Sat, 16 Dec 2006) New Revision: 1662 Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml Log: JBWS-1260 - Further fixes to unwrapping and tests, remaining failures are where we do not agree with the wscompile approach. Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-12-16 22:18:42 UTC (rev 1662) @@ -400,12 +400,7 @@ XSParticle particle = wrapper.getParticle(); if (particle == null) { - if (appendedAttribute) - { - buf.append(tempBuf); - } - - return true; + unwrappedElement = true; } else { @@ -597,7 +592,12 @@ if (unwrapper.unwrappedElement != null) { xt = unwrapper.unwrappedElement.getTypeDefinition(); + + if (unwrapper.xmlType != null) + xmlType = unwrapper.xmlType; + containingElement = containingElement + unwrapper.unwrappedElement.getName(); + if (unwrapper.array) arraySuffix = "[]"; } Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-12-16 22:18:42 UTC (rev 1662) @@ -260,6 +260,10 @@ { xmlType = new QName(containingElement); } + else if (unwrapper.xmlType != null) + { + xmlType = unwrapper.xmlType; + } } else if (unwrapper.unwrappedAttribute != null) { @@ -550,8 +554,7 @@ temp.append(">").append(name); localName = temp.toString(); jxtm.setAnonymousTypeQName(new QName(xt.getNamespace(), localName, "typeNS")); - - + } else { @@ -574,6 +577,11 @@ jwm.addJavaXmlTypeMappings(jxtm); // addJavaXMLTypeMapping(jwm, jxtm + // Add attributes + XSObjectList attributeUses = ((XSComplexTypeDefinition)xc).getAttributeUses(); + if (attributeUses != null) + addAttributeMappings(attributeUses, jxtm); + if (xm != null) { addVariableMappingMap(xm, jxtm, javaType); @@ -586,10 +594,6 @@ addJavaXMLTypeMap(simple, xc.getName(), "", "", jwm, skipWrapperArray); } - // Add attributes - XSObjectList attributeUses = ((XSComplexTypeDefinition)xc).getAttributeUses(); - if (attributeUses != null) - addAttributeMappings(attributeUses, jxtm); } if (xm != null) Modified: branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/main/java/org/jboss/ws/tools/helpers/ReturnTypeUnwrapper.java 2006-12-16 22:18:42 UTC (rev 1662) @@ -21,6 +21,8 @@ */ package org.jboss.ws.tools.helpers; +import javax.xml.namespace.QName; + import org.apache.xerces.xs.XSAttributeDeclaration; import org.apache.xerces.xs.XSAttributeUse; import org.apache.xerces.xs.XSComplexTypeDefinition; @@ -43,6 +45,7 @@ { public XSTypeDefinition xt; + public QName xmlType; public XSAttributeDeclaration unwrappedAttribute; public XSElementDeclaration unwrappedElement; public boolean array = false; @@ -102,6 +105,10 @@ else if (term instanceof XSElementDeclaration) { unwrappedElement = (XSElementDeclaration)term; + XSTypeDefinition type = unwrappedElement.getTypeDefinition(); + if (type.getAnonymous() == false) + xmlType = new QName(unwrappedElement.getTypeDefinition().getNamespace(), unwrappedElement.getTypeDefinition().getName()); + this.array = array; } Modified: branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/test/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2006-12-16 22:18:42 UTC (rev 1662) @@ -205,12 +205,25 @@ { bool = validateVariableMapping(vm1[i], vm2[i]); if (bool == false) - throw new IllegalStateException("VariableMapping" + vm1[i] + " does not match with " + vm2[i]); + throw new IllegalStateException("VariableMapping " + variableMappingToString(vm1[i]) + " does not match with " + variableMappingToString(vm2[i])); } return bool; } + private String variableMappingToString(VariableMapping vm) + { + StringBuffer sb = new StringBuffer("["); + sb.append("JavaVariableName=").append(vm.getJavaVariableName()); + sb.append(",XmlAttributeName=").append(vm.getXmlAttributeName()); + sb.append(",XmlElementName=").append(vm.getXmlElementName()); + sb.append(",XmlWildcard=").append(vm.getXmlWildcard()); + sb.append(",DataMember=").append(vm.isDataMember()); + sb.append("]"); + + return sb.toString(); + } + private boolean validateVariableMapping(VariableMapping vm1, VariableMapping vm2) { boolean bool = true; Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_W/wstools-config.xml 2006-12-16 22:18:42 UTC (rev 1662) @@ -1,5 +1,5 @@ <configuration> <wsdl-java location="resources/tools/jbws1260/scenario_W/Wrapped.wsdl" parameter-style="wrapped"> -  + <mapping file="wrapped-mapping.xml"/> </wsdl-java> </configuration> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Y/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) @@ -44,16 +44,19 @@ <xml-element-name>surname</xml-element-name> </variable-mapping> </java-xml-type-mapping> - <java-xml-type-mapping> + +  +  +  + <service-interface-mapping> <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name> Modified: branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml 2006-12-16 18:01:08 UTC (rev 1661) +++ branches/dlofthouse/JBWS-1260/src/test/resources/tools/jbws1260/scenario_Z/wrapped-mapping.xml 2006-12-16 22:18:42 UTC (rev 1662) @@ -44,16 +44,19 @@ <xml-element-name>surname</xml-element-name> </variable-mapping> </java-xml-type-mapping> - <java-xml-type-mapping> + +  +  +  + <service-interface-mapping> <service-interface>org.jboss.test.ws.jbws1260.PhoneBook_Service</service-interface> <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>

19 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2006