Author: darran.lofthouse(a)jboss.com Date: 2010-01-14 11:11:30 -0500 (Thu, 14 Jan 2010) New Revision: 11418 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java Log: [JBPAPP-3175] Service.create(java.net.URL, javax.xml.namespace.QName) should throw javax.xml.ws.WebServiceException not org.jboss.ws.metadata.wsdl.WSDLException Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 15:47:28 UTC (rev 11417) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-01-14 16:11:30 UTC (rev 11418) @@ -31,6 +31,7 @@ import javax.xml.transform.Source; import javax.xml.ws.Endpoint; import javax.xml.ws.EndpointReference; +import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.spi.Provider; @@ -59,9 +60,16 @@ @Override public ServiceDelegate createServiceDelegate(URL wsdlLocation, QName serviceName, Class serviceClass) { - ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass); - DOMUtils.clearThreadLocals(); - return delegate; + try + { + ServiceDelegateImpl delegate = new ServiceDelegateImpl(wsdlLocation, serviceName, serviceClass); + DOMUtils.clearThreadLocals(); + return delegate; + } + catch (RuntimeException e) + { + throw new WebServiceException(e); + } } @Override Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846 (from rev 11417, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 15:47:28 UTC (rev 11417) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 16:11:30 UTC (rev 11418) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2846; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceException; - -import org.jboss.wsf.test.JBossWSTest; - -/** - * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should - * throw javax.xml.ws.WebServiceException not - * org.jboss.ws.metadata.wsdl.WSDLException - * - * @author darran.lofthouse(a)jboss.com - * @since 14th January 2010 - * @see https://jira.jboss.org/jira/browse/JBWS-2846 - */ -public class JBWS2846TestCase extends JBossWSTest { - - // This endpoint is not deployed so the attempt to retrieve the WSDL will fail. - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/"; - - public void testCreate() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2846";, - "EndpointImplService"); - - try { - Service service = Service.create(wsdlURL, serviceName); - fail("Expected WebServiceException not thrown."); - } catch (WebServiceException expected) { - // Expected so ignore. - } - - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (from rev 11417, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2846/JBWS2846TestCase.java 2010-01-14 16:11:30 UTC (rev 11418) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2846; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceException; + +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-2846] Service.create(java.net.URL, javax.xml.namespace.QName) should + * throw javax.xml.ws.WebServiceException not + * org.jboss.ws.metadata.wsdl.WSDLException + * + * @author darran.lofthouse(a)jboss.com + * @since 14th January 2010 + * @see https://jira.jboss.org/jira/browse/JBWS-2846 + */ +public class JBWS2846TestCase extends JBossWSTest { + + // This endpoint is not deployed so the attempt to retrieve the WSDL will fail. + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2846/"; + + public void testCreate() throws Exception { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2846";, + "EndpointImplService"); + + try { + Service service = Service.create(wsdlURL, serviceName); + fail("Expected WebServiceException not thrown."); + } catch (WebServiceException expected) { + // Expected so ignore. + } + + } + +}