[jbossws-commits] JBossWS SVN: r3914 - in trunk/jbossws-core: src/main/java/org/jboss/ws/core/jaxrpc/client and 10 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-07-17 12:15:28 -0400 (Tue, 17 Jul 2007) New Revision: 3914 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java trunk/jbossws-core/src/test/resources/jaxws/webserviceref/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java trunk/jbossws-core/src/test/resources/jaxws/samples/webserviceref/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml Modified: trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt Log: Fix [JBWS-1684]: @WebServiceRef with SunRI Modified: trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-07-17 16:12:35 UTC (rev 3913) +++ trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -194,8 +194,45 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- Please add alphabetically --> + + <!-- jaxws-webserviceref --> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + + <!-- Please add alphabetically --> </target> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java 2007-07-17 16:12:35 UTC (rev 3913) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -44,11 +44,11 @@ { // logging support private static Logger log = Logger.getLogger(ServiceRefBinderJAXRPC.class); - + /** * Binds a Service into the callers ENC for every service-ref element */ - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef) + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException { String externalName = encCtx.getNameInNamespace() + "/" + encName; Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref) Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.webserviceref; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl") -@SOAPBinding(style = Style.RPC) -public interface SecureEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl") +@SOAPBinding(style = Style.RPC) +public interface SecureEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,83 +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.test.ws.jaxws.webserviceref; - -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService; - -public class SecureEndpointClient -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointClient.class); - - @WebServiceRef(name = "SecureService1") - static SecureEndpointService secureService1; - - @WebServiceRef(name = "SecureService2") - static Service secureService2; - - @WebServiceRef(name = "SecurePort1") - static SecureEndpoint securePort1; - - static String retStr; - - public static void main(String[] args) - { - String reqMsg = args[0]; - log.info("echo: " + reqMsg); - - String username = null; - if (args.length > 1) - username = args[1]; - - String password = null; - if (args.length > 2) - password = args[2]; - - SecureEndpoint port = secureService1.getSecureEndpointPort(); - String retMsg = invokeEndpoint(port, reqMsg, username, password); - - port = secureService2.getPort(SecureEndpoint.class); - retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); - - port = securePort1; - retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); - - retStr = retMsg; - } - - private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) - { - if (username != null && password != null) - { - BindingProvider bindingProvider = (BindingProvider)port; - bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); - bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); - } - - return port.echo(inStr); - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,83 @@ +/* + * 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 javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService; + +public class SecureEndpointClient +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointClient.class); + + @WebServiceRef(name = "SecureService1") + static SecureEndpointService secureService1; + + @WebServiceRef(name = "SecureService2") + static Service secureService2; + + @WebServiceRef(name = "SecurePort1") + static SecureEndpoint securePort1; + + static String retStr; + + public static void main(String[] args) + { + String reqMsg = args[0]; + log.info("echo: " + reqMsg); + + String username = null; + if (args.length > 1) + username = args[1]; + + String password = null; + if (args.length > 2) + password = args[2]; + + SecureEndpoint port = secureService1.getSecureEndpointPort(); + String retMsg = invokeEndpoint(port, reqMsg, username, password); + + port = secureService2.getPort(SecureEndpoint.class); + retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); + + port = securePort1; + retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); + + retStr = retMsg; + } + + private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) + { + if (username != null && password != null) + { + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); + } + + return port.echo(inStr); + } +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,53 +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.test.ws.jaxws.webserviceref; - -import javax.annotation.security.RolesAllowed; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.annotation.security.SecurityDomain; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") -@Stateless(name = "SecureEndpoint") -@SOAPBinding(style = Style.RPC) - -@WebContext(contextRoot="/jaxws-samples-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) -@SecurityDomain("JBossWS") -@RolesAllowed("friend") -public class SecureEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,53 @@ +/* + * 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 javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.annotation.security.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@Stateless(name = "SecureEndpoint") +@SOAPBinding(style = Style.RPC) + +@WebContext(contextRoot="/jaxws-samples-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) +@SecurityDomain("JBossWS") +@RolesAllowed("friend") +public class SecureEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,55 +0,0 @@ - -package org.jboss.test.ws.jaxws.webserviceref; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl") -public class SecureEndpointService - extends Service -{ - - private final static URL WSDL_LOCATION; - private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); - private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); - - static { - URL url = null; - try { - url = new URL("http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public SecureEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public SecureEndpointService() { - super(WSDL_LOCATION, SECUREENDPOINTSERVICE); - } - - /** - * - * @return - * returns SecureEndpoint - */ - @WebEndpoint(name = "SecureEndpointPort") - public SecureEndpoint getSecureEndpointPort() { - return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); - } - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,55 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl") +public class SecureEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); + + static { + URL url = null; + try { + url = new URL("http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SecureEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SecureEndpointService() { + super(WSDL_LOCATION, SECUREENDPOINTSERVICE); + } + + /** + * + * @return + * returns SecureEndpoint + */ + @WebEndpoint(name = "SecureEndpointPort") + public SecureEndpoint getSecureEndpointPort() { + return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); + } + +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,100 +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.test.ws.jaxws.webserviceref; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.test.JBossWSTestSetup; - -/** - * Test @WebServiceRef overrides in jboss-client.xml - * - * @author Thomas.Diesler(a)jboss.com - * @since 18-Jan-2007 - */ -public class ServiceRefOverridesTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - - if (TestEndpointClientTwo.iniCtx == null) - TestEndpointClientTwo.iniCtx = getInitialContext(); - } - - public void testService1() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testService2() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testService3() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testService4() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testPort1() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testPort2() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testPort3() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - private String invokeTest(String reqStr) throws Throwable - { - new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); - return TestEndpointClientTwo.testResult.get(reqStr); - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,100 @@ +/* + * 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 junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * Test @WebServiceRef overrides in jboss-client.xml + * + * @author Thomas.Diesler(a)jboss.com + * @since 18-Jan-2007 + */ +public class ServiceRefOverridesTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (TestEndpointClientTwo.iniCtx == null) + TestEndpointClientTwo.iniCtx = getInitialContext(); + } + + public void testService1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testService4() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testPort2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + private String invokeTest(String reqStr) throws Throwable + { + new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); + return TestEndpointClientTwo.testResult.get(reqStr); + } +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,89 +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.test.ws.jaxws.webserviceref; - -import java.net.URL; -import java.io.InputStream; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.test.JBossWSTestSetup; - -/** - * Test the JAXWS annotation: javax.xml.ws.WebServiceRef - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class StubPropertyTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure"; - - public static Test suite() - { - return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - InputStream inputStream = wsdlURL.openStream(); - assertNotNull(inputStream); - inputStream.close(); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); - Service service = Service.create(wsdlURL, qname); - SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); - bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - - String helloWorld = "Hello World"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testUnconfiguredStub() throws Throwable - { - String reqMsg = "Hello World"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); - } - - public void testConfiguredStub() throws Throwable - { - String reqMsg = "Hello World"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,89 @@ +/* + * 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.net.URL; +import java.io.InputStream; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * Test the JAXWS annotation: javax.xml.ws.WebServiceRef + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class StubPropertyTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure"; + + public static Test suite() + { + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + InputStream inputStream = wsdlURL.openStream(); + assertNotNull(inputStream); + inputStream.close(); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + Service service = Service.create(wsdlURL, qname); + SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + + String helloWorld = "Hello World"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testUnconfiguredStub() throws Throwable + { + String reqMsg = "Hello World"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + } + + public void testConfiguredStub() throws Throwable + { + String reqMsg = "Hello World"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + } +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,53 +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.test.ws.jaxws.webserviceref; - -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.WebResult; -import javax.jws.WebParam; -import javax.jws.soap.SOAPBinding; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,53 @@ +/* + * 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 javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebParam; +import javax.jws.soap.SOAPBinding; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,127 +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.test.ws.jaxws.webserviceref; - -import org.jboss.logging.Logger; - -import javax.naming.InitialContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; -import java.util.ArrayList; - -@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") - -// Test multiple on type -@WebServiceRefs( { - @WebServiceRef(name = "service2", value = TestEndpointService.class), - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) -public class TestEndpointClientOne -{ - // Provide logging - private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class); - - // Test on field with name - @WebServiceRef(name = "TestEndpointService3") - static TestEndpointService service3; - - // Test on field without name - @WebServiceRef - static TestEndpointService service4; - - // Test on method with name - @WebServiceRef(name = "TestEndpointService5") - static void setService5(TestEndpointService service) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service; - } - private static TestEndpointService service5; - - // Test on method without name - @WebServiceRef - static void setService6(TestEndpointService service) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service; - } - private static TestEndpointService service6; - - // Test on field with name and value - @WebServiceRef(name = "Port2", value = TestEndpointService.class) - static TestEndpoint port2; - - // Test on field with value - @WebServiceRef(value = TestEndpointService.class) - static TestEndpoint port3; - - // Test on field - @WebServiceRef - static TestEndpoint port4; - - // Test on field with name - @WebServiceRef (name = "Port5") - static TestEndpoint port5; - - static InitialContext iniCtx; - static String retStr; - - public static void main(String[] args) - { - String inStr = args[0]; - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr); - - ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); - try - { - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1")); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2")); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3); - ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3")); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4); - ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5); - } - catch (Exception ex) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex); - throw new WebServiceException(ex); - } - - for (TestEndpoint port : ports) - { - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new WebServiceException("Invalid echo return: " + inStr); - } - - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr; - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,127 @@ +/* + * 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 org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.util.ArrayList; + +@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + +// Test multiple on type +@WebServiceRefs( { + @WebServiceRef(name = "service2", value = TestEndpointService.class), + @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) +public class TestEndpointClientOne +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class); + + // Test on field with name + @WebServiceRef(name = "TestEndpointService3") + static TestEndpointService service3; + + // Test on field without name + @WebServiceRef + static TestEndpointService service4; + + // Test on method with name + @WebServiceRef(name = "TestEndpointService5") + static void setService5(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service; + } + private static TestEndpointService service5; + + // Test on method without name + @WebServiceRef + static void setService6(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service; + } + private static TestEndpointService service6; + + // Test on field with name and value + @WebServiceRef(name = "Port2", value = TestEndpointService.class) + static TestEndpoint port2; + + // Test on field with value + @WebServiceRef(value = TestEndpointService.class) + static TestEndpoint port3; + + // Test on field + @WebServiceRef + static TestEndpoint port4; + + // Test on field with name + @WebServiceRef (name = "Port5") + static TestEndpoint port5; + + static InitialContext iniCtx; + static String retStr; + + public static void main(String[] args) + { + String inStr = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr); + + ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + try + { + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (TestEndpoint port : ports) + { + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr; + } +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,206 +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.test.ws.jaxws.webserviceref; - -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint; -import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService; - -import javax.naming.InitialContext; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -@WebServiceRef(name = "Service1") -// Test multiple on type -@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) -public class TestEndpointClientTwo -{ - // provide logging - private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class); - - // Test on field - @WebServiceRef(name = "Service3") - static Service service3; - - // Test on field - @WebServiceRef(name = "Service4") - static TestEndpointService service4; - - // Test on field - @WebServiceRef(name = "Port2") - static TestEndpoint port2; - - // Test on field - @WebServiceRef(name = "Port3") - static TestEndpoint port3; - - static InitialContext iniCtx; - static Map<String, String> testResult = new HashMap<String, String>(); - - public static void main(String[] args) throws Exception - { - String testName = args[0]; - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo(); - Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); - try - { - String retStr = (String)method.invoke(client, testName); - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr); - } - catch (InvocationTargetException ex) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex); - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString()); - } - catch (Exception ex) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex); - org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString()); - } - } - - /** - * Customize service-class-name, service-qname - */ - public String testService1(String reqStr) throws Exception - { - TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1"); - TestEndpoint port = service.getTestEndpointPort(); - return port.echo(reqStr); - } - - /** - * Customize config-name, config-file - */ - public String testService2(String reqStr) throws Exception - { - Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2"); - - TestEndpoint port = service.getPort(TestEndpoint.class); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize service-class-name, service-qname - */ - public String testService3(String reqStr) throws Exception - { - TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort(); - String resStr1 = port.echo(reqStr); - - TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3"); - port = service.getTestEndpointPort(); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize config-name, config-file - */ - public String testService4(String reqStr) throws Exception - { - TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort(); - String resStr1 = port.echo(reqStr); - //verifyConfig((ConfigProvider)port); - - TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4"); - port = service.getTestEndpointPort(); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: port-qname, config-name, config-file - */ - public String testPort1(String reqStr) throws Exception - { - TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1"); - //verifyConfig((ConfigProvider)port); - - return port.echo(reqStr); - } - - /** - * Customize port-info: service-endpoint-interface, config-name, config-file - */ - public String testPort2(String reqStr) throws Exception - { - //verifyConfig((ConfigProvider)port2); - String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr); - - TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2"); - //verifyConfig((ConfigProvider)port); - - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - /** - * Customize port-info: service-endpoint-interface, port-qname, stub-property - */ - public String testPort3(String reqStr) throws Exception - { - String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr); - - BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3; - verifyProperties(bp.getRequestContext()); - - TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3"); - String resStr2 = port.echo(reqStr); - - return resStr1 + resStr2; - } - - private void verifyProperties(Map<String, Object> ctx) - { - String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); - if ("kermit".equals(username) == false) - throw new RuntimeException("Invalid username: " + username); - - String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); - if ("thefrog".equals(password) == false) - throw new RuntimeException("Invalid password: " + password); - } - - /*private void verifyConfig(ConfigProvider cp) - { - if ("Custom Client".equals(cp.getConfigName()) == false) - throw new RuntimeException("Invalid config name: " + cp.getConfigName()); - - if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) - throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); - } */ -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,206 @@ +/* + * 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 org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService; + +import javax.naming.InitialContext; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +@WebServiceRef(name = "Service1") +// Test multiple on type +@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) +public class TestEndpointClientTwo +{ + // provide logging + private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class); + + // Test on field + @WebServiceRef(name = "Service3") + static Service service3; + + // Test on field + @WebServiceRef(name = "Service4") + static TestEndpointService service4; + + // Test on field + @WebServiceRef(name = "Port2") + static TestEndpoint port2; + + // Test on field + @WebServiceRef(name = "Port3") + static TestEndpoint port3; + + static InitialContext iniCtx; + static Map<String, String> testResult = new HashMap<String, String>(); + + public static void main(String[] args) throws Exception + { + String testName = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo(); + Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); + try + { + String retStr = (String)method.invoke(client, testName); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr); + } + catch (InvocationTargetException ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString()); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString()); + } + } + + /** + * Customize service-class-name, service-qname + */ + public String testService1(String reqStr) throws Exception + { + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1"); + TestEndpoint port = service.getTestEndpointPort(); + return port.echo(reqStr); + } + + /** + * Customize config-name, config-file + */ + public String testService2(String reqStr) throws Exception + { + Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2"); + + TestEndpoint port = service.getPort(TestEndpoint.class); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize service-class-name, service-qname + */ + public String testService3(String reqStr) throws Exception + { + TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3"); + port = service.getTestEndpointPort(); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize config-name, config-file + */ + public String testService4(String reqStr) throws Exception + { + TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + //verifyConfig((ConfigProvider)port); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4"); + port = service.getTestEndpointPort(); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: port-qname, config-name, config-file + */ + public String testPort1(String reqStr) throws Exception + { + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1"); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize port-info: service-endpoint-interface, config-name, config-file + */ + public String testPort2(String reqStr) throws Exception + { + //verifyConfig((ConfigProvider)port2); + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2"); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: service-endpoint-interface, port-qname, stub-property + */ + public String testPort3(String reqStr) throws Exception + { + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr); + + BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3; + verifyProperties(bp.getRequestContext()); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3"); + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + private void verifyProperties(Map<String, Object> ctx) + { + String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); + if ("kermit".equals(username) == false) + throw new RuntimeException("Invalid username: " + username); + + String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); + if ("thefrog".equals(password) == false) + throw new RuntimeException("Invalid password: " + password); + } + + /*private void verifyConfig(ConfigProvider cp) + { + if ("Custom Client".equals(cp.getConfigName()) == false) + throw new RuntimeException("Invalid config name: " + cp.getConfigName()); + + if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) + throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); + } */ +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,43 +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.test.ws.jaxws.webserviceref; - -import org.jboss.logging.Logger; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class TestEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input); - return input; - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,43 @@ +/* + * 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 org.jboss.logging.Logger; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input); + return input; + } +} Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,75 +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.test.ws.jaxws.webserviceref; - - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import java.net.MalformedURLException; -import java.net.URL; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") -public class TestEndpointService - extends Service -{ - - private final static URL WSDL_LOCATION; - private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); - private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); - - static { - URL url = null; - try { - url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl"); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public TestEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public TestEndpointService() { - super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE); - } - - /** - * - * @return - * returns TestEndpoint - */ - @WebEndpoint(name = "TestEndpointPort") - public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() { - return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class); - } - -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,75 @@ +/* + * 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 javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); + + static { + URL url = null; + try { + url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class); + } + +} Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref) Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override) Deleted: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> - - <display-name>TestEndpointService</display-name> - -</application-client> Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>TestEndpointService</display-name> + +</application-client> Deleted: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <!-- - @WebServiceRef(name = "Service1") - --> - <service-ref> - <service-ref-name>Service1</service-ref-name> - <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Service2") - --> - <service-ref> - <service-ref-name>Service2</service-ref-name> - <config-name>Custom Client</config-name> - <config-file>META-INF/jbossws-client-config.xml</config-file> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Service3") - --> - <service-ref> - <service-ref-name>Service3</service-ref-name> - <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> - <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Service4") - --> - <service-ref> - <service-ref-name>Service4</service-ref-name> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> - <config-name>Custom Client</config-name> - <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-component-ref> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Port1", type = TestEndpoint.class) - --> - <service-ref> - <service-ref-name>Port1</service-ref-name> - <port-component-ref> - <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> - <config-name>Custom Client</config-name> - <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-component-ref> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Port2") - --> - <service-ref> - <service-ref-name>Port2</service-ref-name> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> - <config-name>Custom Client</config-name> - <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-component-ref> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Port3") - --> - <service-ref> - <service-ref-name>Port3</service-ref-name> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> - <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> - <stub-property> - <prop-name>javax.xml.ws.security.auth.username</prop-name> - <prop-value>kermit</prop-value> - </stub-property> - <stub-property> - <prop-name>javax.xml.ws.security.auth.password</prop-name> - <prop-value>thefrog</prop-value> - </stub-property> - </port-component-ref> - <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - -</jboss-client> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <!-- + @WebServiceRef(name = "Service1") + --> + <service-ref> + <service-ref-name>Service1</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Service2") + --> + <service-ref> + <service-ref-name>Service2</service-ref-name> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Service3") + --> + <service-ref> + <service-ref-name>Service3</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Service4") + --> + <service-ref> + <service-ref-name>Service4</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Port1", type = TestEndpoint.class) + --> + <service-ref> + <service-ref-name>Port1</service-ref-name> + <port-component-ref> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Port2") + --> + <service-ref> + <service-ref-name>Port2</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Port3") + --> + <service-ref> + <service-ref-name>Port3</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +</jboss-client> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- $Id$ --> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <client-config> - <config-name>Custom Client</config-name> - </client-config> - -</jaxrpc-config> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Custom Client</config-name> + </client-config> + +</jaxrpc-config> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl) Deleted: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,39 +0,0 @@ -<!-- - wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/TestEndpoint.wsdl ---> -<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - - <message name='TestEndpoint_echo'> - <part name='arg0' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoResponse'> - <part name='return' type='xsd:string'/> - </message> - - <portType name='TestEndpoint'> - <operation name='echo' parameterOrder='arg0'> - <input message='tns:TestEndpoint_echo'/> - <output message='tns:TestEndpoint_echoResponse'/> - </operation> - </portType> - - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> - </output> - </operation> - </binding> - - <service name='TestEndpointService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> - </port> - </service> - -</definitions> Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl) =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl (rev 0) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,39 @@ +<!-- + wsimport -d ../../../java -keep -p org.jboss.test.ws.jaxws.webserviceref META-INF/wsdl/TestEndpoint.wsdl +--> +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <message name='TestEndpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </output> + </operation> + </binding> + + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + </port> + </service> + +</definitions> Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure) Deleted: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> - - <display-name>SecureEndpointService</display-name> - -</application-client> Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>SecureEndpointService</display-name> + +</application-client> Deleted: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>SecureService1</service-ref-name> - <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class> - <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> - <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> - <stub-property> - <prop-name>javax.xml.ws.security.auth.username</prop-name> - <prop-value>kermit</prop-value> - </stub-property> - <stub-property> - <prop-name>javax.xml.ws.security.auth.password</prop-name> - <prop-value>thefrog</prop-value> - </stub-property> - </port-component-ref> - <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> - </service-ref> - - <service-ref> - <service-ref-name>SecureService2</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> - <port-component-ref> - <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> - <stub-property> - <prop-name>javax.xml.ws.security.auth.username</prop-name> - <prop-value>kermit</prop-value> - </stub-property> - <stub-property> - <prop-name>javax.xml.ws.security.auth.password</prop-name> - <prop-value>thefrog</prop-value> - </stub-property> - </port-component-ref> - <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> - </service-ref> - - <service-ref> - <service-ref-name>SecurePort1</service-ref-name> - <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> - <stub-property> - <prop-name>javax.xml.ws.security.auth.username</prop-name> - <prop-value>kermit</prop-value> - </stub-property> - <stub-property> - <prop-name>javax.xml.ws.security.auth.password</prop-name> - <prop-value>thefrog</prop-value> - </stub-property> - </port-component-ref> - <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> - </service-ref> - -</jboss-client> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml (from rev 3895, branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-07-17 16:15:28 UTC (rev 3914) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>SecureService1</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>SecureService2</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>SecurePort1</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + +</jboss-client> \ No newline at end of file Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt 2007-07-17 16:12:35 UTC (rev 3913) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt 2007-07-17 16:15:28 UTC (rev 3914) @@ -2,7 +2,7 @@ org/jboss/test/ws/jaxrpc/jbws723/** # benchmark tests -org/jboss/test/ws/benchmark +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-07-17 16:12:35 UTC (rev 3913) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,5 +1,5 @@ # benchmark tests -org/jboss/test/ws/benchmark +org/jboss/test/ws/benchmark/** # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** Modified: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-07-17 16:12:35 UTC (rev 3913) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-07-17 16:15:28 UTC (rev 3914) @@ -1,5 +1,5 @@ # benchmark tests -org/jboss/test/ws/benchmark +org/jboss/test/ws/benchmark/** # Fix before JBoss50 goes final org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*