[jbossws-commits] JBossWS SVN: r5099 - in stack/native/trunk: ant-import and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-11-22 05:29:41 -0500 (Thu, 22 Nov 2007) New Revision: 5099 Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import/build-release.xml stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java stack/native/trunk/src/test/resources/test-excludes-jboss500.txt stack/native/trunk/version.properties Log: Merge missing bits from 2.0.2.GA Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/ant-import/build-release.xml 2007-11-22 10:29:41 UTC (rev 5099) @@ -112,7 +112,7 @@ <xmlproperty file="${core.dir}/output/svn-info.xml"/> <condition property="framework.externals.ok"> <or> - <contains string="${info.entry.url}" substring="https://svn.jboss.org/repos/jbossws/framework/tags"/... + <contains string="${info.entry.url}" substring="jbossws/framework/tags"/> <equals arg1="${repository.id}" arg2="snapshot"/> </or> </condition> Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-11-22 10:29:41 UTC (rev 5099) @@ -190,6 +190,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.class"/> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/> </fileset> </jar> Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -238,9 +238,13 @@ // load all service endpoint interface classes for (UnifiedPortComponentRefMetaData pcr : serviceRef.getPortComponentRefs()) { - Class seiClass = contextCL.loadClass(pcr.getServiceEndpointInterface()); - if (Remote.class.isAssignableFrom(seiClass) == false) - throw new IllegalArgumentException("The SEI does not implement java.rmi.Remote: " + seiClass.getName()); + String seiName = pcr.getServiceEndpointInterface(); + if (seiName != null) + { + Class seiClass = contextCL.loadClass(seiName); + if (Remote.class.isAssignableFrom(seiClass) == false) + throw new IllegalArgumentException("The SEI does not implement java.rmi.Remote: " + seiClass.getName()); + } } // Setup the handler chain Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -34,11 +34,11 @@ @WebService(name = "EJB3Bean", serviceName = "EJB3BeanService", targetNamespace = "http://org.jboss.ws/jbws944") @WebContext(contextRoot = "/jaxws-jbws944", urlPattern = "/FooBean01") @SOAPBinding(style = SOAPBinding.Style.RPC) -(a)Remote(EJB3RemoteInterface.class) +(a)Remote({EJB3RemoteBusinessInterface.class,EJB3RemoteInterface.class}) @RemoteHome(EJB3RemoteHome.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") @Stateless(name = "FooBean01") -public class EJB3Bean01 implements EJB3RemoteInterface +public class EJB3Bean01 implements EJB3RemoteBusinessInterface { @WebMethod public String echo(String input) Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java (from rev 5087, stack/native/tags/jbossws-native-2.0.2.GA/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteBusinessInterface.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -0,0 +1,33 @@ +/* + * 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.jbws944; + +/** + * An EJB3 remote business interface + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2005 + */ +public interface EJB3RemoteBusinessInterface +{ + String echo(String input); +} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated + * Copyright 2007, JBoss Inc., and individual contributors as indicated * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -21,13 +21,15 @@ */ package org.jboss.test.ws.jaxws.jbws944; +import javax.ejb.EJBObject; + /** - * An EJB3 remote interface - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2005 + * EJB2.1 Remote Interface + * + * @author <mailto:andrew.rubinger@redhat.com>ALR</a> + * @version $Revision$ */ -public interface EJB3RemoteInterface +public interface EJB3RemoteInterface extends EJBObject { String echo(String input); } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - EJB3RemoteInterface ejb3Remote = (EJB3RemoteInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("/ejb3/EJB3EndpointInterface"); String helloWorld = "Hello world!"; Object retObj = ejb3Remote.echo(helloWorld); @@ -73,6 +73,7 @@ System.out.println("FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface"); return; } + InitialContext iniCtx = getInitialContext(); Object obj = iniCtx.lookup("/ejb3/EJB3EndpointInterface"); EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -57,16 +57,25 @@ 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; + if (reqMsg.equals("SecureService1")) + { + SecureEndpoint port = secureService1.getSecureEndpointPort(); + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else if (reqMsg.equals("SecureService2")) + { + SecureEndpoint port = secureService2.getPort(SecureEndpoint.class); + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else if (reqMsg.equals("SecurePort1")) + { + SecureEndpoint port = securePort1; + retStr = invokeEndpoint(port, reqMsg, username, password); + } + else + { + throw new IllegalArgumentException("Invalid req messge: " + reqMsg); + } } private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-11-22 10:29:41 UTC (rev 5099) @@ -73,17 +73,45 @@ assertEquals(helloWorld, retObj); } - public void testUnconfiguredStub() throws Throwable + public void testExplicitSecureService1() throws Throwable { - String reqMsg = "Hello World"; + String reqMsg = "SecureService1"; new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + assertEquals(reqMsg, SecureEndpointClient.retStr); } - public void testConfiguredStub() throws Throwable + public void testExplicitSecureService2() throws Throwable { - String reqMsg = "Hello World"; + String reqMsg = "SecureService2"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testExplicitSecurePort1() throws Throwable + { + String reqMsg = "SecurePort1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecureService1() throws Throwable + { + String reqMsg = "SecureService1"; new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + assertEquals(reqMsg, SecureEndpointClient.retStr); } + + public void testImplicitSecureService2() throws Throwable + { + String reqMsg = "SecureService2"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } + + public void testImplicitSecurePort1() throws Throwable + { + String reqMsg = "SecurePort1"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals(reqMsg, SecureEndpointClient.retStr); + } } Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2007-11-22 10:29:41 UTC (rev 5099) @@ -1,47 +1,6 @@ # Fix BPEL before AS50 goes final org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -# [JBAS-4901] Reverse paths are not allowed (containing a . or ..) -org/jboss/test/ws/jaxws/jbws1798/** -org/jboss/test/ws/jaxrpc/jbws153/** - -# [JBAS-4902] nested jar not deployed -org/jboss/test/ws/jaxrpc/jbws128/** -org/jboss/test/ws/jaxrpc/jbws165/** -org/jboss/test/ws/jaxrpc/jbws331/** -org/jboss/test/ws/jaxrpc/jbws358/** -org/jboss/test/ws/jaxrpc/jbws772/** -org/jboss/test/ws/jaxws/jbws1813/** -org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/** -org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/** -org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/** -org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/** - -# [JBAS-4940] Deployment.types not propagated -org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/** -org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/** - -# [JBAS-4890] EJBAccessException: Caller unauthorized -org/jboss/test/ws/jaxws/samples/context/** - -# [JBAS-4903] EJB 2.1 view cannot be realized -org/jboss/test/ws/jaxws/jbws944/** - -# [JBAS-4923] No valid security context for the caller identity -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* - # [JBAS-4930] Cannot lookup ejb3 remote proxy -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.* - -# [JBAS-4931] Fix ejb3 ClientLaucher -org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.* -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBAS-4932] Invalid principal: anonymous -org/jboss/test/ws/jaxrpc/jbws723/** -org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.* -org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.* - -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* +org/jboss/test/ws/jaxrpc/jbws331/** +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* \ No newline at end of file Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-11-22 10:25:51 UTC (rev 5098) +++ stack/native/trunk/version.properties 2007-11-22 10:29:41 UTC (rev 5099) @@ -25,17 +25,17 @@ # Dependend integration projects jbossws-spi=1.0.0.GA -jbossws-common=snapshot +jbossws-common=1.0.2.GA jbossws-framework=2.0.2.GA -jbossws-jboss40=2.0.2.GA -jbossws-jboss42=2.0.1.GA +jbossws-jboss40=4.0.5.GA +jbossws-jboss42=4.2.1.GA # JBossAS-5.0 jboss-jbossxb-jboss50=snapshot -jboss-remoting-jboss50=2.2.2.SP1 +jboss-remoting-jboss50=2.2.2.SP2 # JBossAS-4.2 -jboss-jbossxb-jboss42=1.0.0.GA +jboss-jbossxb-jboss42=1.0.0.SP1 jboss-remoting-jboss42=2.2.2.SP1 # JBossAS-4.0 @@ -69,7 +69,6 @@ junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 -sun-hudson=1.93 sun-jaf=1.1 sun-javamail=1.4 sun-servlet=2.4