Author: thomas.diesler(a)jboss.com Date: 2007-01-17 18:09:05 -0500 (Wed, 17 Jan 2007) New Revision: 1991 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefParserTestCase.java Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml Log: Add <service-ref> parser test Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-01-17 16:17:23 UTC (rev 1990) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-01-17 23:09:05 UTC (rev 1991) @@ -120,7 +120,7 @@ if (refEl != null) ref.setConfigFile(DOMUtils.getTextContent(refEl)); - refEl = DOMUtils.getFirstChildElement(root, "wsdl-location"); + refEl = DOMUtils.getFirstChildElement(root, "wsdl-override"); if (refEl != null) ref.setWsdlLocation(DOMUtils.getTextContent(refEl)); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java 2007-01-17 16:17:23 UTC (rev 1990) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMappingFactory.java 2007-01-17 23:09:05 UTC (rev 1991) @@ -30,7 +30,6 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.core.utils.IOUtils; import org.jboss.ws.core.utils.ResourceURL; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-17 16:17:23 UTC (rev 1990) +++ trunk/jbossws-tests/build.xml 2007-01-17 23:09:05 UTC (rev 1991) @@ -172,6 +172,7 @@ <pathelement location="${thirdparty.dir}/stax-api.jar"/> <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.server.lib}/jboss.jar"/> </path> <!-- The test client classpath --> Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefParserTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefParserTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefParserTestCase.java 2007-01-17 23:09:05 UTC (rev 1991) @@ -0,0 +1,44 @@ +/* + * 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.webserviceref; + +import java.io.File; + +import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory; +import org.jboss.test.ws.JBossWSTest; + +/** + * Test the JAXWS annotation: javax.xml.ws.WebServiceRef + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class ServiceRefParserTestCase extends JBossWSTest +{ + public void testServiceRefParser() throws Exception + { + File ddFile = new File("resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml"); + assertTrue (ddFile.exists()); + + JBossClientDDObjectFactory.parse(ddFile.toURL(), null); + } +} Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefParserTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-01-17 16:17:23 UTC (rev 1990) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-01-17 23:09:05 UTC (rev 1991) @@ -21,6 +21,7 @@ */ package org.jboss.test.ws.jaxws.webserviceref; +import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -31,6 +32,7 @@ import junit.framework.Test; import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.ejb3.metamodel.JBossClientDDObjectFactory; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; Modified: trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-01-17 16:17:23 UTC (rev 1990) +++ trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-01-17 23:09:05 UTC (rev 1991) @@ -7,16 +7,52 @@ <service-ref> <service-ref-name>SecureService1</service-ref-name> + <service-class-name>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-class-name> + <!--service-qname xmlns:ns1='http://org.jboss.ws/wsref'>ns1:SecureEndpointService</service-qname--> + <port-info> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <!--wsdl-port xmlns:ns1='http://org.jboss.ws/wsref'>ns1:SecureEndpointPort</wsdl-port--> + <stub-property> + <name>javax.xml.ws.security.auth.password</name> + <value>j2ee</value> + </stub-property> + <stub-property> + <name>javax.xml.ws.security.auth.username</name> + <value>j2ee</value> + </stub-property> + </port-info> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>SecureService2</service-ref-name> + <port-info> + <!--wsdl-port xmlns:ns1='http://org.jboss.ws/wsref'>ns1:SecureEndpointPort</wsdl-port--> + <stub-property> + <name>javax.xml.ws.security.auth.password</name> + <value>j2ee</value> + </stub-property> + <stub-property> + <name>javax.xml.ws.security.auth.username</name> + <value>j2ee</value> + </stub-property> + </port-info> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>SecurePort1</service-ref-name> + <port-info> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <stub-property> + <name>javax.xml.ws.security.auth.password</name> + <value>j2ee</value> + </stub-property> + <stub-property> + <name>javax.xml.ws.security.auth.username</name> + <value>j2ee</value> + </stub-property> + </port-info> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> </service-ref>