[jbossws-commits] JBossWS SVN: r15762 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 7 other directories.

Author: ropalka Date: 2012-02-27 10:12:44 -0500 (Mon, 27 Feb 2012) New Revision: 15762 Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15761 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15761 | ropalka | 2012-02-27 16:07:39 +0100 (Mon, 27 Feb 2012) | 1 line [JBWS-3444] enabling appclient tests (WIP) ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -2026,11 +2026,15 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1010-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1010-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1010/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2040,7 +2044,12 @@ <include name="wsdl/**"/> </metainf> </jar> - + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1010-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws1010-appclient.jar"/> + </fileset> + </jar> + <!-- jaxrpc-jbws1011 --> <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1011.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -446,23 +446,32 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-ejb3.xml"/> <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF"> <include name="application-client.xml"/> - <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-secureejb-appclient.jar"/> + </fileset> + </jar> <!-- jaxrpc-samples-serviceref --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF/web.xml"> @@ -478,19 +487,27 @@ <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF"> <include name="application-client.xml"/> - <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-serviceref-appclient.jar"/> + </fileset> + </jar> <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase.java 2012-02-27 15:12:44 UTC (rev 15762) @@ -41,10 +41,11 @@ { private static InheritenceChildInterface port; - + private static InitialContext iniCtx; + public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-client.jar"); + return new JBossWSTestSetup(JBWS1010TestCase.class, "jaxrpc-jbws1010.war, jaxrpc-jbws1010-appclient.ear#jaxrpc-jbws1010-appclient.jar"); } public void setUp() throws Exception @@ -52,12 +53,21 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/TestService"); port = (InheritenceChildInterface)service.getPort(InheritenceChildInterface.class); } } + public void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + } + public void testGetA() throws Exception { String response = port.getA(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2012-02-27 15:12:44 UTC (rev 15762) @@ -46,12 +46,29 @@ { public static final String USERNAME = "kermit"; public static final String PASSWORD = "thefrog"; + private InitialContext appclientCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar"); + return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-appclient.ear#jaxrpc-samples-secureejb-appclient.jar", true); } + public void setUp() throws Exception + { + super.setUp(); + appclientCtx = getAppclientInitialContext(); + } + + public void tearDown() throws Exception + { + if (appclientCtx != null) + { + appclientCtx.close(); + appclientCtx = null; + } + super.tearDown(); + } + public void testRoleSecuredWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/RoleSecured?wsdl"); @@ -62,8 +79,7 @@ public void testRoleSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); + Service service = (Service)appclientCtx.lookup("java:service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -85,22 +101,9 @@ assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } - /** Test that the remote access to this bean is unchecked - */ - public void testBasicSecuredSLSB() throws Exception - { - InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB"); - - OrganizationRemote bean = home.create(); - String info = bean.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - public void testBasicSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); + Service service = (Service)appclientCtx.lookup("java:service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -132,8 +135,7 @@ public void testConfidentialServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); + Service service = (Service)appclientCtx.lookup("java:service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "ConfidentialPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -153,10 +155,5 @@ { // ignore expected exception } - - // test confidential access - //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-samples-ejb/ConfidentialSecured"); - //String info = port.getContactInfo("mafia"); - //assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ApplicationClient.java 2012-02-27 15:12:44 UTC (rev 15762) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.samples.serviceref; - -import java.rmi.RemoteException; -import java.util.ArrayList; - -import javax.naming.InitialContext; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.Service; - -import org.jboss.logging.Logger; - -public class ApplicationClient -{ - // Provide logging - private static Logger log = Logger.getLogger(ApplicationClient.class); - - public static InitialContext encCtx; - public static String retStr; - - public static void main(String[] args) throws RemoteException - { - String inStr = args[0]; - log.info("echo: " + inStr); - - ArrayList ports = new ArrayList(); - try - { - ports.add((TestEndpoint)((Service)encCtx.lookup("java:comp/env/service1")).getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)encCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); - } - catch (Exception ex) - { - log.error("Cannot add port", ex); - throw new JAXRPCException(ex); - } - - for (int i = 0; i < ports.size(); i++) - { - TestEndpoint port = (TestEndpoint)ports.get(i); - String outStr = port.echo(inStr); - if (inStr.equals(outStr) == false) - throw new JAXRPCException("Invalid echo return: " + inStr); - } - - retStr = inStr; - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase.java 2012-02-27 15:12:44 UTC (rev 15762) @@ -25,6 +25,7 @@ import java.net.MalformedURLException; import java.net.URL; +import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceException; @@ -50,7 +51,7 @@ public static Test suite() { - return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-client.jar"); + return new JBossWSTestSetup(ServiceRefClientTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-appclient.ear#jaxrpc-samples-serviceref-appclient.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -96,9 +97,24 @@ public void testApplicationClient() throws Exception { - String helloWorld = "Hello World!"; - ApplicationClient.encCtx = getInitialContext(); - ApplicationClient.main(new String[] { helloWorld }); - assertEquals(helloWorld, ApplicationClient.retStr); + InitialContext ctx = null; + try + { + ctx = getAppclientInitialContext(); + final TestEndpoint port1 = (TestEndpoint)((Service)ctx.lookup("java:service1")).getPort(TestEndpoint.class); + final TestEndpoint port2 = ((TestEndpointService)ctx.lookup("java:service2")).getTestEndpointPort(); + final String msg = "Hello World!"; + + assertEquals(msg, port1.echo(msg)); + assertEquals(msg, port2.echo(msg)); + } + finally + { + if (ctx != null) + { + ctx.close(); + } + } } + } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-27 15:12:44 UTC (rev 15762) @@ -74,12 +74,23 @@ public void testEJBClient() throws Exception { - InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejbclient//EJBClient!" + EJBRemoteHome.class.getName()); - EJBRemote ejbRemote = ejbHome.create(); + InitialContext iniCtx = null; + try + { + iniCtx = getServerInitialContext(); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejbclient//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemote ejbRemote = ejbHome.create(); - String helloWorld = "Hello World!"; - Object retObj = ejbRemote.echo(helloWorld); - assertEquals(helloWorld, retObj); + String helloWorld = "Hello World!"; + Object retObj = ejbRemote.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/application-client.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/application-client.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1010/META-INF/jboss-client.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -6,7 +6,7 @@ <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestService</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1010?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -8,19 +8,19 @@ <display-name>webservice client app</display-name> <service-ref> - <service-ref-name>service/BasicSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/BasicSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/RoleSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/RoleSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/ConfidentialSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/ConfidentialSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml (from rev 15761, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>RoleSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>BasicSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>ConfidentialSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/application-client.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service1</service-ref-name> + <service-ref-name>java:jboss/exported/service1</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> @@ -18,7 +18,7 @@ </service-ref> <service-ref> - <service-ref-name>service2</service-ref-name> + <service-ref-name>java:jboss/exported/service2</service-ref-name> <service-interface>org.jboss.test.ws.jaxrpc.samples.serviceref.TestEndpointService</service-interface> <wsdl-file>META-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/serviceref/META-INF/jboss-client.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-27 15:07:39 UTC (rev 15761) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-27 15:12:44 UTC (rev 15762) @@ -1135,7 +1135,6 @@ <testExcludes> <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher --> <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> </testExcludes> </configuration> <goals> @@ -1174,18 +1173,10 @@ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher --> <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - <!-- # TODO: appclient --> - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> - - <!-- # TODO: remote JNDI support (non EJB objects) --> - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> - <!-- # [JBWS-3234] JNDI over RMI not available on AS7 --> <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> @@ -1201,7 +1192,6 @@ <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryEJBTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/enventry/EnvEntryJSETestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude>