August 2007 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 17:53:51 -0400 (Wed, 01 Aug 2007) New Revision: 4067 Added: spi/ Log: Create jbossws/spi

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4066 - branches/jbossws-2.0.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-08-01 14:03:02 -0400 (Wed, 01 Aug 2007) New Revision: 4066 Modified: branches/jbossws-2.0/mergeinfo.txt Log: mergeinfo for JBWS-1536 Modified: branches/jbossws-2.0/mergeinfo.txt =================================================================== --- branches/jbossws-2.0/mergeinfo.txt 2007-08-01 18:02:25 UTC (rev 4065) +++ branches/jbossws-2.0/mergeinfo.txt 2007-08-01 18:03:02 UTC (rev 4066) @@ -61,3 +61,6 @@ darran.lofthouse(a)jboss.com 31-Jul-07 svn merge -r 4030:4031 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 + +darran.lofthouse(a)jboss.com 01-Aug-07 +svn merge -r 4063:4064 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4065 - in trunk/jbossws-core/src: test/java/org/jboss/test/ws/tools and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-08-01 14:02:25 -0400 (Wed, 01 Aug 2007) New Revision: 4065 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1536/ trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java Log: JBWS-1536 - NPE in WSDL to Java when webservices.xml requested but no global package mapping. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-08-01 17:29:10 UTC (rev 4064) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-08-01 18:02:25 UTC (rev 4065) @@ -330,7 +330,7 @@ if (wsdl.getInterfaces().length == 1) { - String seiPackage = wsdlToJava.getNamespacePackageMap().get(wsdl.getTargetNamespace()); + String seiPackage = getPackageName(wsdl, glc); seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]); } Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536 (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536) Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-01 17:29:10 UTC (rev 4064) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-01 18:02:25 UTC (rev 4065) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.jbws1536; - -import java.io.FileInputStream; - -import org.jboss.util.xml.DOMUtils; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.spi.test.JBossWSTest; -import org.w3c.dom.Element; - -/** - * [JBWS-1536] NPE in WSDL to Java when webservices.xml requested but no global package mapping - * - * @see http://jira.jboss.com/jira/browse/JBWS-1536 - * - * @author darran.lofthouse(a)jboss.com - * @since Aug 1, 2007 - */ -public class JBWS1536TestCase extends JBossWSTest -{ - - public final void testGenerate() throws Exception - { - String resourceDir = "resources/tools/jbws1536"; - String toolsDir = "tools/jbws1536"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - - new WSTools().generate(args); - - Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1536/webservices.xml")); - Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml")); - assertEquals(expected, was); - } - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-01 18:02:25 UTC (rev 4065) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1536; + +import java.io.FileInputStream; + +import org.jboss.util.xml.DOMUtils; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.test.JBossWSTest; +import org.w3c.dom.Element; + +/** + * [JBWS-1536] NPE in WSDL to Java when webservices.xml requested but no global package mapping + * + * @see http://jira.jboss.com/jira/browse/JBWS-1536 + * + * @author darran.lofthouse(a)jboss.com + * @since Aug 1, 2007 + */ +public class JBWS1536TestCase extends JBossWSTest +{ + + public final void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1536"; + String toolsDir = "tools/jbws1536"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + + new WSTools().generate(args); + + Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1536/webservices.xml")); + Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml")); + assertEquals(expected, was); + } + +} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1536 (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536) Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-01 17:29:10 UTC (rev 4064) +++ trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-01 18:02:25 UTC (rev 4065) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1536' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1536/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1536' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1536/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1536/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='areaCode' nillable='true' type='string'/> - <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 Copied: trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-01 18:02:25 UTC (rev 4065) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1536' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1536/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1536' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1536/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1536/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='areaCode' nillable='true' type='string'/> + <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 Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml 2007-08-01 17:29:10 UTC (rev 4064) +++ trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml 2007-08-01 18:02:25 UTC (rev 4065) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> - <webservice-description> - <webservice-description-name>PhoneBook</webservice-description-name> - <wsdl-file>META-INF/wsdl/PhoneBook.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/null</jaxrpc-mapping-file> - <port-component> - <port-component-name>PhoneBookPort</port-component-name> - <wsdl-port xmlns:portNS='http://test.jboss.org/ws/jbws1536'>portNS:PhoneBookPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jbws1536.PhoneBook_PortType</service-endpoint-interface> - <service-impl-bean> - <ejb-link>PhoneBook</ejb-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml 2007-08-01 18:02:25 UTC (rev 4065) @@ -0,0 +1,15 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>PhoneBook</webservice-description-name> + <wsdl-file>META-INF/wsdl/PhoneBook.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/null</jaxrpc-mapping-file> + <port-component> + <port-component-name>PhoneBookPort</port-component-name> + <wsdl-port xmlns:portNS='http://test.jboss.org/ws/jbws1536'>portNS:PhoneBookPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jbws1536.PhoneBook_PortType</service-endpoint-interface> + <service-impl-bean> + <ejb-link>PhoneBook</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml 2007-08-01 17:29:10 UTC (rev 4064) +++ trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml 2007-08-01 18:02:25 UTC (rev 4065) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <wsdl-java location="resources/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare"> - <webservices ejb-link="PhoneBook" /> - </wsdl-java> - -</configuration> Copied: trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml (from rev 4064, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml 2007-08-01 18:02:25 UTC (rev 4065) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <wsdl-java location="resources/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare"> + <webservices ejb-link="PhoneBook" /> + </wsdl-java> + +</configuration>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4064 - in branches/jbossws-2.0/jbossws-core/src: test/java/org/jboss/test/ws/tools and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-08-01 13:29:10 -0400 (Wed, 01 Aug 2007) New Revision: 4064 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java Log: JBWS-1536 - NPE in WSDL to Java when webservices.xml requested but no global package mapping. Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-08-01 15:55:28 UTC (rev 4063) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-08-01 17:29:10 UTC (rev 4064) @@ -331,7 +331,7 @@ if (wsdl.getInterfaces().length == 1) { - String seiPackage = wsdlToJava.getNamespacePackageMap().get(wsdl.getTargetNamespace()); + String seiPackage = getPackageName(wsdl, glc); seiName = seiPackage + "." + wsdlToJava.getServiceEndpointInterfaceName(wsdl.getInterfaces()[0]); } Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2007-08-01 17:29:10 UTC (rev 4064) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1536; + +import java.io.FileInputStream; + +import org.jboss.util.xml.DOMUtils; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.w3c.dom.Element; + +/** + * [JBWS-1536] NPE in WSDL to Java when webservices.xml requested but no global package mapping + * + * @see http://jira.jboss.com/jira/browse/JBWS-1536 + * + * @author darran.lofthouse(a)jboss.com + * @since Aug 1, 2007 + */ +public class JBWS1536TestCase extends JBossWSTest +{ + + public final void testGenerate() throws Exception + { + String resourceDir = "resources/tools/jbws1536"; + String toolsDir = "tools/jbws1536"; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + + new WSTools().generate(args); + + Element expected = DOMUtils.parse(new FileInputStream("resources/tools/jbws1536/webservices.xml")); + Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml")); + assertEquals(expected, was); + } + +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl 2007-08-01 17:29:10 UTC (rev 4064) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1536' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1536/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1536' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1536/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1536/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='areaCode' nillable='true' type='string'/> + <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/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml 2007-08-01 17:29:10 UTC (rev 4064) @@ -0,0 +1,15 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>PhoneBook</webservice-description-name> + <wsdl-file>META-INF/wsdl/PhoneBook.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/null</jaxrpc-mapping-file> + <port-component> + <port-component-name>PhoneBookPort</port-component-name> + <wsdl-port xmlns:portNS='http://test.jboss.org/ws/jbws1536'>portNS:PhoneBookPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jbws1536.PhoneBook_PortType</service-endpoint-interface> + <service-impl-bean> + <ejb-link>PhoneBook</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/webservices.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml 2007-08-01 17:29:10 UTC (rev 4064) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + + <wsdl-java location="resources/tools/jbws1536/PhoneBook.wsdl" parameter-style="bare"> + <webservices ejb-link="PhoneBook" /> + </wsdl-java> + +</configuration> Property changes on: branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1536/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4063 - trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 11:55:28 -0400 (Wed, 01 Aug 2007) New Revision: 4063 Removed: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory Log: Use DefaultServiceRefHandlerFactory Deleted: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory 2007-08-01 15:34:38 UTC (rev 4062) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory 2007-08-01 15:55:28 UTC (rev 4063) @@ -1 +0,0 @@ -org.jboss.wsf.container.jboss50.serviceref.ServiceRefHandlerFactoryImpl \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4062 - trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 11:34:38 -0400 (Wed, 01 Aug 2007) New Revision: 4062 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java Log: Fix ref to ServiceRefBinder Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2007-08-01 15:33:59 UTC (rev 4061) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2007-08-01 15:34:38 UTC (rev 4062) @@ -65,7 +65,7 @@ private ServiceRefBinder getJaxwsBinder() { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXRPC); + return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXWS); } public ServiceRefMetaData newServiceRefMetaData()

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4061 - trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 11:33:59 -0400 (Wed, 01 Aug 2007) New Revision: 4061 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java Log: Fix ref to ServiceRefBinder Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2007-08-01 15:18:43 UTC (rev 4060) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2007-08-01 15:33:59 UTC (rev 4061) @@ -37,8 +37,12 @@ import org.jboss.ws.integration.ServiceRefMetaData; import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.WSFException; import org.jboss.wsf.spi.serviceref.ServiceRefBinder; +import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; +import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -52,22 +56,16 @@ private ServiceRefObjectFactory objectFactory = new ServiceRefObjectFactory(); - enum Type {JAXRPC, JAXWS}; - - /* binds jaxrpc deployments */ - private ServiceRefBinder jaxrpcBinder; - - /* binds jaxws deployments */ - private ServiceRefBinder jaxwsBinder; - - public void setJaxrpcBinder(ServiceRefBinder binder) + private ServiceRefBinder getJaxrpcBinder() { - this.jaxrpcBinder = binder; + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXRPC); } - public void setJaxwsBinder(ServiceRefBinder binder) + private ServiceRefBinder getJaxwsBinder() { - this.jaxwsBinder = binder; + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXRPC); } public ServiceRefMetaData newServiceRefMetaData() @@ -120,12 +118,12 @@ { if (getServiceRefType(serviceRef, loader) == Type.JAXRPC) { - jaxrpcBinder.setupServiceRef(encCtx, encName, null, serviceRef.delegate, loader); + getJaxrpcBinder().setupServiceRef(encCtx, encName, null, serviceRef.delegate, loader); } else { AnnotatedElement anElement = (AnnotatedElement)sref.getAnnotatedElement(); - jaxwsBinder.setupServiceRef(encCtx, encName, anElement, serviceRef.delegate, loader); + getJaxwsBinder().setupServiceRef(encCtx, encName, anElement, serviceRef.delegate, loader); } } finally

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4060 - trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-01 11:18:43 -0400 (Wed, 01 Aug 2007) New Revision: 4060 Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java Log: Implement SPIView marker Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2007-08-01 15:01:13 UTC (rev 4059) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2007-08-01 15:18:43 UTC (rev 4060) @@ -21,11 +21,13 @@ */ package org.jboss.wsf.spi.serviceref; +import org.jboss.wsf.spi.SPIView; + /** * @author Thomas.Diesler(a)jboss.com * @since 01-Aug-2007 */ -public interface ServiceRefBinderFactory +public interface ServiceRefBinderFactory extends SPIView { ServiceRefBinder newServiceRefBinder(ServiceRefHandler.Type type); } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java 2007-08-01 15:01:13 UTC (rev 4059) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java 2007-08-01 15:18:43 UTC (rev 4060) @@ -21,10 +21,12 @@ */ package org.jboss.wsf.spi.serviceref; +import org.jboss.wsf.spi.SPIView; + //$Id$ -public interface ServiceRefHandlerFactory +public interface ServiceRefHandlerFactory extends SPIView { ServiceRefHandler getServiceRefHandler(); } \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4059 - in trunk/integration: jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-01 11:01:13 -0400 (Wed, 01 Aug 2007) New Revision: 4059 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java Removed: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerFactoryImpl.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerImpl.java Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefElement.java trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingCallPropertyMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainsMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingInitParamMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingPortComponentRefMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingServiceRefMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingStubPropertyMetaData.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefObjectFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java Log: Add DefaultServiceRefHandler to framework Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -26,10 +26,7 @@ import org.jboss.kernel.Kernel; /** - * Locate the single instance of the kernel - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 + * @deprecated */ public class KernelLocator { Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefElement.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefElement.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefElement.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -26,10 +26,7 @@ import java.io.Serializable; /** - * A marker for all <service-ref> related objects. - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-Mar-2007 + * @deprecated */ public abstract class ServiceRefElement implements Serializable { Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -30,10 +30,7 @@ import org.xml.sax.Attributes; /** - * An implementation of this interface handles all service-ref binding concerns - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2004 + * @deprecated */ public interface ServiceRefHandler { Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -28,10 +28,7 @@ import org.w3c.dom.Element; /** - * An abstract service-ref meta data object. - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-Mar-2007 + * @deprecated */ public abstract class ServiceRefMetaData extends ServiceRefElement implements Serializable { Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -30,12 +30,7 @@ import java.net.URLClassLoader; /** - * Load resources through a URLClassLoader.<br> - * NOTE: The associated classloader doesn't do parent delegation. - * - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 + * @deprecated */ public class URLLoaderAdapter implements UnifiedVirtualFile { Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -28,11 +28,7 @@ import java.net.URL; /** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 + * @deprecated */ public interface UnifiedVirtualFile extends Serializable { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingCallPropertyMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingCallPropertyMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingCallPropertyMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -27,7 +27,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; /** - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingCallPropertyMetaData extends ServiceRefElement { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -29,10 +29,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** - * The metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingHandlerChainMetaData extends ServiceRefElement { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainsMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainsMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerChainsMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -30,18 +30,15 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; /** - * The metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingHandlerChainsMetaData extends ServiceRefElement { UnifiedHandlerChainsMetaData delegate; - + public DelegatingHandlerChainsMetaData() { - delegate = new UnifiedHandlerChainsMetaData(); + delegate = new UnifiedHandlerChainsMetaData(); } public void addHandlerChain(UnifiedHandlerChainMetaData handlerChain) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingHandlerMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -30,7 +30,7 @@ import org.w3c.dom.Element; /** - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingHandlerMetaData extends ServiceRefElement { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingInitParamMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingInitParamMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingInitParamMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -27,7 +27,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; /** - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingInitParamMetaData extends ServiceRefElement { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingPortComponentRefMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingPortComponentRefMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingPortComponentRefMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -29,7 +29,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; /** - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingPortComponentRefMetaData extends ServiceRefElement { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingServiceRefMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingServiceRefMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingServiceRefMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -34,10 +34,7 @@ import org.w3c.dom.Element; /** - * The metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingServiceRefMetaData extends ServiceRefMetaData { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingStubPropertyMetaData.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingStubPropertyMetaData.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/DelegatingStubPropertyMetaData.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -27,7 +27,7 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; /** - * @author Thomas.Diesler(a)jboss.org + * @deprecated */ public class DelegatingStubPropertyMetaData extends ServiceRefElement { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -38,19 +38,12 @@ import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.serviceref.ServiceRefBinder; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; /** - * Bind service refs in the client's ENC - * for every service-ref element in the deployment descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.com - * - * @since 04-Nov-2006 + * @deprecated */ public class ServiceRefHandlerImpl implements ServiceRefHandler { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefObjectFactory.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefObjectFactory.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefObjectFactory.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -30,9 +30,7 @@ import org.xml.sax.Attributes; /** - * A object model factory for <service-ref> - * - * @author Thomas.Diesler(a)jboss.com + * @deprecated */ public class ServiceRefObjectFactory { Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerFactoryImpl.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerFactoryImpl.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -1,41 +0,0 @@ -/* - * 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.wsf.container.jboss50.serviceref; - -//$Id: ServiceRefHandlerFactory.java 4049 2007-08-01 11:26:30Z thomas.diesler(a)jboss.com $ - -import org.jboss.wsf.spi.serviceref.ServiceRefHandler; -import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory; - -/** - * A factory for the ServiceRefHandler - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2004 - */ -public class ServiceRefHandlerFactoryImpl implements ServiceRefHandlerFactory -{ - public ServiceRefHandler getServiceRefHandler() - { - return new ServiceRefHandlerImpl(); - } -} Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerImpl.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/serviceref/ServiceRefHandlerImpl.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -1,187 +0,0 @@ -/* - * 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.wsf.container.jboss50.serviceref; - -// $Id: ServiceRefHandlerImpl.java 4043 2007-07-31 17:11:42Z thomas.diesler(a)jboss.com $ - -import java.io.File; -import java.lang.reflect.AnnotatedElement; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.Context; -import javax.naming.NamingException; - -import org.jboss.logging.Logger; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; -import org.jboss.wsf.framework.serviceref.ServiceRefObjectFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.serviceref.ServiceRefBinder; -import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; -import org.jboss.wsf.spi.serviceref.ServiceRefElement; -import org.jboss.wsf.spi.serviceref.ServiceRefHandler; -import org.jboss.wsf.spi.serviceref.ServiceRefMetaData; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * Bind service refs in the client's ENC - * for every service-ref element in the deployment descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @author Heiko.Braun(a)jboss.com - * - * @since 04-Nov-2006 - */ -public class ServiceRefHandlerImpl implements ServiceRefHandler -{ - // logging support - private static Logger log = Logger.getLogger(ServiceRefHandlerImpl.class); - - private ServiceRefObjectFactory objectFactory = new ServiceRefObjectFactory(); - - private ServiceRefBinder getJaxrpcBinder() - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXRPC); - } - - private ServiceRefBinder getJaxwsBinder() - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXWS); - } - - public ServiceRefMetaData newServiceRefMetaData() - { - return new UnifiedServiceRefMetaData(); - } - - public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException - { - if (sref.isProcessed()) - { - log.debug("Attempt to rebind the service-ref: " + sref.getServiceRefName()); - return; - } - - // In case of an .war deployment the associated root file doesn't point to - // the expanded war file structure and thus breaks service-ref usage for servlet clients. - // This needs to be fixed in org.jboss.web.AbstractWebDeployer (JBOSS_AS/server module) - if (vfsRoot instanceof URLLoaderAdapter) - { - URLLoaderAdapter ula = (URLLoaderAdapter)vfsRoot; - URL rootURL = ula.toURL(); - if ("file".equals(rootURL.getProtocol()) && rootURL.getFile().endsWith(".war")) - { - String fileName = rootURL.getFile(); - - if (!new File(fileName).exists()) // might be an exploded directory - { - // There is a filename convention for exploded directories - fileName = fileName.substring(0, fileName.indexOf(".war")) + "-exp.war"; - - File expandedDirectory = new File(fileName); - if (!expandedDirectory.exists()) - throw new WSFException("Failed to bind service-ref, the deployment root expandedDirectory doesn't exist: " + fileName); - - // update the rootFile - try - { - vfsRoot = new URLLoaderAdapter(expandedDirectory.toURL()); - } - catch (MalformedURLException e) - { - } - } - - } - } - - UnifiedServiceRefMetaData serviceRef = (UnifiedServiceRefMetaData)sref; - serviceRef.setVfsRoot(vfsRoot); - try - { - if (getServiceRefType(serviceRef, loader) == Type.JAXRPC) - { - getJaxrpcBinder().setupServiceRef(encCtx, encName, null, serviceRef, loader); - } - else - { - AnnotatedElement anElement = (AnnotatedElement)sref.getAnnotatedElement(); - getJaxwsBinder().setupServiceRef(encCtx, encName, anElement, serviceRef, loader); - } - } - finally - { - sref.setProcessed(true); - } - } - - public Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - return objectFactory.newChild(ref, navigator, namespaceURI, localName, attrs); - } - - public void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - objectFactory.setValue(ref, navigator, namespaceURI, localName, value); - } - - private Type getServiceRefType(UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException - { - // The service-ref-type is JAXWS specific - String serviceRefType = serviceRef.getServiceRefType(); - if (serviceRefType != null || serviceRef.getAnnotatedElement() != null) - return Type.JAXWS; - - // The mapping-file is JAXRPC specific - if (serviceRef.getMappingFile() != null) - return Type.JAXRPC; - - String siName = serviceRef.getServiceInterface(); - if (siName == null) - throw new IllegalStateException("<service-interface> cannot be null"); - - if (siName.equals("javax.xml.rpc.Service")) - return Type.JAXRPC; - - try - { - Class siClass = loader.loadClass(siName); - if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) - return Type.JAXWS; - else if (javax.xml.rpc.Service.class.isAssignableFrom(siClass)) - return Type.JAXRPC; - else - throw new IllegalStateException("Illegal service interface: " + siName); - } - catch (ClassNotFoundException e) - { - throw new IllegalStateException("Cannot load <service-interface>: " + siName); - } - } -} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-01 14:55:50 UTC (rev 4058) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -29,6 +29,8 @@ import org.jboss.wsf.framework.http.DefaultHttpContextFactory; import org.jboss.wsf.framework.http.DefaultHttpServerFactory; import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory; +import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandler; +import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.WSFException; @@ -100,6 +102,10 @@ { returnType = (T)loadService(spiType, DefaultResourceInjectorFactory.class.getName()); } + else if (ServiceRefHandlerFactory.class.equals(spiType)) + { + returnType = (T)loadService(spiType, DefaultServiceRefHandlerFactory.class.getName()); + } // SPI provided by either container or stack integration @@ -127,10 +133,6 @@ { returnType = (T)loadService(spiType, null); } - else if (ServiceRefHandlerFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, null); - } else if (WebServiceContextFactory.class.equals(spiType)) { returnType = (T)loadService(spiType, null); Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -0,0 +1,186 @@ +/* + * 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.wsf.framework.serviceref; + +// $Id: ServiceRefHandlerImpl.java 4043 2007-07-31 17:11:42Z thomas.diesler(a)jboss.com $ + +import java.io.File; +import java.lang.reflect.AnnotatedElement; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.Context; +import javax.naming.NamingException; + +import org.jboss.logging.Logger; +import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; +import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; +import org.jboss.wsf.spi.serviceref.ServiceRefElement; +import org.jboss.wsf.spi.serviceref.ServiceRefHandler; +import org.jboss.wsf.spi.serviceref.ServiceRefMetaData; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * Bind service refs in the client's ENC + * for every service-ref element in the deployment descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com + * + * @since 04-Nov-2006 + */ +public class DefaultServiceRefHandler implements ServiceRefHandler +{ + // logging support + private static Logger log = Logger.getLogger(DefaultServiceRefHandler.class); + + private ServiceRefObjectFactory objectFactory = new ServiceRefObjectFactory(); + + private ServiceRefBinder getJaxrpcBinder() + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXRPC); + } + + private ServiceRefBinder getJaxwsBinder() + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + return spiProvider.getSPI(ServiceRefBinderFactory.class).newServiceRefBinder(Type.JAXWS); + } + + public ServiceRefMetaData newServiceRefMetaData() + { + return new UnifiedServiceRefMetaData(); + } + + public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ClassLoader loader, ServiceRefMetaData sref) throws NamingException + { + if (sref.isProcessed()) + { + log.debug("Attempt to rebind the service-ref: " + sref.getServiceRefName()); + return; + } + + // In case of an .war deployment the associated root file doesn't point to + // the expanded war file structure and thus breaks service-ref usage for servlet clients. + // This needs to be fixed in org.jboss.web.AbstractWebDeployer (JBOSS_AS/server module) + if (vfsRoot instanceof URLLoaderAdapter) + { + URLLoaderAdapter ula = (URLLoaderAdapter)vfsRoot; + URL rootURL = ula.toURL(); + if ("file".equals(rootURL.getProtocol()) && rootURL.getFile().endsWith(".war")) + { + String fileName = rootURL.getFile(); + + if (!new File(fileName).exists()) // might be an exploded directory + { + // There is a filename convention for exploded directories + fileName = fileName.substring(0, fileName.indexOf(".war")) + "-exp.war"; + + File expandedDirectory = new File(fileName); + if (!expandedDirectory.exists()) + throw new WSFException("Failed to bind service-ref, the deployment root expandedDirectory doesn't exist: " + fileName); + + // update the rootFile + try + { + vfsRoot = new URLLoaderAdapter(expandedDirectory.toURL()); + } + catch (MalformedURLException e) + { + } + } + + } + } + + UnifiedServiceRefMetaData serviceRef = (UnifiedServiceRefMetaData)sref; + serviceRef.setVfsRoot(vfsRoot); + try + { + if (getServiceRefType(serviceRef, loader) == Type.JAXRPC) + { + getJaxrpcBinder().setupServiceRef(encCtx, encName, null, serviceRef, loader); + } + else + { + AnnotatedElement anElement = (AnnotatedElement)sref.getAnnotatedElement(); + getJaxwsBinder().setupServiceRef(encCtx, encName, anElement, serviceRef, loader); + } + } + finally + { + sref.setProcessed(true); + } + } + + public Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + { + return objectFactory.newChild(ref, navigator, namespaceURI, localName, attrs); + } + + public void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + { + objectFactory.setValue(ref, navigator, namespaceURI, localName, value); + } + + private Type getServiceRefType(UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException + { + // The service-ref-type is JAXWS specific + String serviceRefType = serviceRef.getServiceRefType(); + if (serviceRefType != null || serviceRef.getAnnotatedElement() != null) + return Type.JAXWS; + + // The mapping-file is JAXRPC specific + if (serviceRef.getMappingFile() != null) + return Type.JAXRPC; + + String siName = serviceRef.getServiceInterface(); + if (siName == null) + throw new IllegalStateException("<service-interface> cannot be null"); + + if (siName.equals("javax.xml.rpc.Service")) + return Type.JAXRPC; + + try + { + Class siClass = loader.loadClass(siName); + if (javax.xml.ws.Service.class.isAssignableFrom(siClass)) + return Type.JAXWS; + else if (javax.xml.rpc.Service.class.isAssignableFrom(siClass)) + return Type.JAXRPC; + else + throw new IllegalStateException("Illegal service interface: " + siName); + } + catch (ClassNotFoundException e) + { + throw new IllegalStateException("Cannot load <service-interface>: " + siName); + } + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java 2007-08-01 15:01:13 UTC (rev 4059) @@ -0,0 +1,41 @@ +/* + * 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.wsf.framework.serviceref; + +//$Id: ServiceRefHandlerFactory.java 4049 2007-08-01 11:26:30Z thomas.diesler(a)jboss.com $ + +import org.jboss.wsf.spi.serviceref.ServiceRefHandler; +import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory; + +/** + * A factory for the ServiceRefHandler + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2004 + */ +public class DefaultServiceRefHandlerFactory implements ServiceRefHandlerFactory +{ + public ServiceRefHandler getServiceRefHandler() + { + return new DefaultServiceRefHandler(); + } +}

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4058 - in trunk: integration/sunri and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-01 10:55:50 -0400 (Wed, 01 Aug 2007) New Revision: 4058 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/sunri/int-sunri.iml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java Log: Update WSProvideTestCase for Sun-RI Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-01 14:52:29 UTC (rev 4057) +++ trunk/JBossWS-Trunk.iws 2007-08-01 14:55:50 UTC (rev 4058) @@ -20,16 +20,16 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/build.xml" afterPath="$PROJECT_DIR$/integration/spi/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml" afterPath="$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/build.xml" afterPath="$PROJECT_DIR$/integration/xfire/build.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml" afterPath="$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/build.xml" afterPath="$PROJECT_DIR$/integration/sunri/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/spi/src/main/etc/default.mf" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -205,7 +205,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java" line="63" class="org.jboss.ws.integration.ResourceLoaderAdapter" package="org.jboss.ws.integration"> + <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java" line="97" class="com.sun.tools.ws.processor.modeler.annotation.WebServiceWrapperGenerator" package="com.sun.tools.ws.processor.modeler.annotation"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -218,7 +218,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java" line="97" class="com.sun.tools.ws.processor.modeler.annotation.WebServiceWrapperGenerator" package="com.sun.tools.ws.processor.modeler.annotation"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -231,7 +231,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -244,7 +244,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/spi/ProviderLoader.java" line="72" class="javax.xml.ws.spi.ProviderLoader" package="javax.xml.ws.spi"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -257,7 +257,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java" line="60" class="org.jboss.wsf.common.ServiceLoader" package="org.jboss.wsf.common"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="115" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -270,6 +270,45 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="83" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java" line="91" class="com.sun.tools.ws.wscompile.WsgenTool" package="com.sun.tools.ws.wscompile"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -338,15 +377,89 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-testsuite.xml"> + <file leaf-file-name="SunRIProviderImpl.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="36" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.53995156"> + <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="WsgenTool.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebServiceVisitor.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="352" column="18" selection-start="15735" selection-end="15735" vertical-scroll-proportion="0.33415842"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ModelBuilder.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="56" column="18" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.60024303"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebServiceWrapperGenerator.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebServiceAP.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="106" column="19" selection-start="3831" selection-end="3831" vertical-scroll-proportion="0.19183168"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AnnotationProcessorContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WsimportListener.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CalculatorBean.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="41" column="0" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.48481166"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -439,6 +552,14 @@ <option name="myItemId" value="JBossWS-Trunk.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -446,9 +567,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -456,14 +589,196 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/ant-import" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build/ant-import" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -530,17 +845,24 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.client"> - <tempConfiguration default="false" name="Comparator" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.Comparator" /> + <tempConfiguration default="false" name="WSProvideTestCase.testOutputDirectory" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.ws.jaxws.tools.*" /> + <module name="testsuite" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" /> + <option name="METHOD_NAME" value="testOutputDirectory" /> + <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> + <option name="PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="testsuite" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="36149" /> + <option name="DEBUG_PORT" value="60976" /> <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="true" /> </RunnerSettings> @@ -731,7 +1053,7 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -742,7 +1064,7 @@ <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27592593" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25432098" order="0" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.51376146" order="2" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25617284" order="2" /> <window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -750,7 +1072,7 @@ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38417432" order="1" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="4" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25555557" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25555557" order="1" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -779,7 +1101,7 @@ <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" /> + <option name="LAST_COMMIT_MESSAGE" value="Display information about output and source directories being used" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> @@ -792,6 +1114,7 @@ <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> + <MESSAGE value="Display information about output and source directories being used" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -839,113 +1162,115 @@ </component> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="jbossws-core" /> + <option name="myLastEditedConfigurable" value="int-sunri" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java"> + <entry file="file://$PROJECT_DIR$/build/ant.properties.example"> <provider selected="true" editor-type-id="text-editor"> - <state line="60" column="0" selection-start="2482" selection-end="2482" vertical-scroll-proportion="0.19007264"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-thirdparty.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="61" column="41" selection-start="4394" selection-end="4394" vertical-scroll-proportion="0.7820823"> + <state line="176" column="12" selection-start="6518" selection-end="6518" vertical-scroll-proportion="0.7514863"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="56" column="96" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.79809976"> + <state line="32" column="35" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.24851367"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="56" column="96" selection-start="1846" selection-end="1942" vertical-scroll-proportion="0.79809976"> + <state line="46" column="36" selection-start="1534" selection-end="1534" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-thirdparty.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> + <state line="41" column="0" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.48481166"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/etc/default.mf"> + <entry file="jar://$PROJECT_DIR$/integration/sunri/thirdparty/jaxws-tools.jar!/com/sun/tools/ws/wscompile/WsgenTool.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="17" column="10" selection-start="898" selection-end="898" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/build.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="34" selection-start="3586" selection-end="3586" vertical-scroll-proportion="0.30992737"> + <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="486" selection-end="486" vertical-scroll-proportion="0.25302663"> + <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="84" selection-start="3477" selection-end="3477" vertical-scroll-proportion="-1.5411623"> + <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="131" column="36" selection-start="5806" selection-end="5828" vertical-scroll-proportion="0.5290557"> + <state line="352" column="18" selection-start="15735" selection-end="15735" vertical-scroll-proportion="0.33415842"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/etc/default.mf"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="10" column="64" selection-start="524" selection-end="524" vertical-scroll-proportion="0.22592153"> + <state line="56" column="18" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.60024303"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/build.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="29" selection-start="2464" selection-end="2464" vertical-scroll-proportion="0.0"> + <state line="106" column="19" selection-start="3831" selection-end="3831" vertical-scroll-proportion="0.19183168"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-thirdparty.xml"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="20" selection-start="1406" selection-end="1406" vertical-scroll-proportion="0.13801453"> + <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="2" selection-start="491" selection-end="491" vertical-scroll-proportion="-0.311138"> + <state line="188" column="16" selection-start="5832" selection-end="5832" vertical-scroll-proportion="0.42284325"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="36" selection-start="2341" selection-end="2341" vertical-scroll-proportion="0.53995156"> + <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046"> <folding /> </state> </provider> Modified: trunk/integration/sunri/int-sunri.iml =================================================================== --- trunk/integration/sunri/int-sunri.iml 2007-08-01 14:52:29 UTC (rev 4057) +++ trunk/integration/sunri/int-sunri.iml 2007-08-01 14:55:50 UTC (rev 4058) @@ -8,26 +8,17 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="spi" /> + <orderEntry type="module" module-name="sunri-sources" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jaxb-xjc.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="spi" /> - <orderEntry type="module" module-name="sunri-sources" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -67,15 +58,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/saaj-api.jar!/" /> </CLASSES> <JAVADOC /> @@ -199,7 +181,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java 2007-08-01 14:55:50 UTC (rev 4058) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.tools; + +import javax.jws.WebService; +import javax.jws.WebMethod; + +@WebService(targetNamespace = "http://foo.bar.com/calculator") +public class CalculatorBean +{ + @WebMethod + public int add(int a, int b) + { + return a+b; + } + + @WebMethod + public int subtract(int a, int b) + { + return a-b; + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java 2007-08-01 14:52:29 UTC (rev 4057) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java 2007-08-01 14:55:50 UTC (rev 4058) @@ -24,6 +24,7 @@ import junit.framework.TestCase; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.tools.WSContractProvider; +import org.jboss.wsf.test.JBossWSTest; import org.w3c.dom.Element; import javax.jws.WebMethod; @@ -40,7 +41,7 @@ * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ -public class WSProvideTestCase extends TestCase +public class WSProvideTestCase extends JBossWSTest { // tools delegate WSContractProvider provider; @@ -139,13 +140,13 @@ { File wsdl = new File( outputDirectory.getAbsolutePath()+ - "/WSProvideTestCase$CalculatorBeanService.wsdl" + "/CalculatorBeanService.wsdl" ); assertTrue("WSDL not generated", wsdl.exists()); Element root = DOMUtils.parse( new FileInputStream(wsdl)); Element serviceElement = DOMUtils.getFirstChildElement(root, "service"); - assertEquals(serviceElement.getAttribute("name"), "WSProvideTestCase$CalculatorBeanService"); + assertEquals(serviceElement.getAttribute("name"), "CalculatorBeanService"); } /** @@ -181,6 +182,13 @@ */ public void testMessageStream() throws Exception { + + if(isIntegrationSunRI()) + { + System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly redirected"); + return; + } + ByteArrayOutputStream bout = new ByteArrayOutputStream(); PrintStream pout = new PrintStream(bout); @@ -204,19 +212,4 @@ provider.provide(CalculatorBean.class); } - @WebService(targetNamespace = "http://foo.bar.com/calculator") - public class CalculatorBean - { - @WebMethod - public int add(int a, int b) - { - return a+b; - } - - @WebMethod - public int subtract(int a, int b) - { - return a-b; - } - } }

17 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007