Author: ropalka Date: 2012-03-07 02:38:35 -0500 (Wed, 07 Mar 2012) New Revision: 15892 Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss710/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml Log: Merged revisions 15836,15840,15873,15880,15883,15890-15891 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15836 | ropalka | 2012-03-05 09:19:33 +0100 (Mon, 05 Mar 2012) | 1 line sync. with AS7 upstream ....... r15840 | ropalka | 2012-03-05 09:45:38 +0100 (Mon, 05 Mar 2012) | 1 line sync. appclient config with AS7 upstream + remove support for AS 710 Final ....... r15873 | ropalka | 2012-03-05 14:56:08 +0100 (Mon, 05 Mar 2012) | 1 line [JBWS-3435] don't call Exit in killer ....... r15880 | ropalka | 2012-03-06 14:32:44 +0100 (Tue, 06 Mar 2012) | 1 line [JBWS-3444] fix typo ....... r15883 | ropalka | 2012-03-06 14:52:29 +0100 (Tue, 06 Mar 2012) | 1 line [JBWS-3435] speed up appclient tests ....... r15890 | ropalka | 2012-03-07 07:32:58 +0100 (Wed, 07 Mar 2012) | 1 line [JBWS-3444] fix context leak ....... r15891 | ropalka | 2012-03-07 08:21:34 +0100 (Wed, 07 Mar 2012) | 1 line [JBWS-3435] use exact remote naming version we wanna use ....... 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,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15861,15871 + /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,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15861,15871,15873,15880-15883,15890-15891 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-07 07:38:35 UTC (rev 15892) @@ -46,6 +46,7 @@ break; } } + System.out.println("forcibly stopped in AppclientKiller"); System.exit(1); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-07 07:38:35 UTC (rev 15892) @@ -82,7 +82,6 @@ public void testRoleSecuredServiceAccess() throws Exception { - iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -123,7 +122,6 @@ public void testBasicSecuredServiceAccess() throws Exception { - iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -156,7 +154,6 @@ public void testConfidentialServiceAccess() throws Exception { - iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-07 07:38:35 UTC (rev 15892) @@ -52,7 +52,7 @@ { return new JBossWSTestSetup(AddressingReplyToTestCase.class, "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," + - "jaxrpc-samples-wsaddr-hello-appclient.jar#jaxrpc-samples-wsaddr-hello-appclient.jar"); + "jaxrpc-samples-wsaddr-hello-appclient.ear#jaxrpc-samples-wsaddr-hello-appclient.jar"); } protected void setUp() throws Exception 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-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-07 07:38:35 UTC (rev 15892) @@ -1056,16 +1056,25 @@ <groupId>org.jboss.remoting3</groupId> <artifactId>jboss-remoting</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> - <version>1.0.3.Final</version> + <version>1.0.4.Final</version> <exclusions> <exclusion> <groupId>org.jboss.remoting3</groupId> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-07 07:21:34 UTC (rev 15891) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-07 07:38:35 UTC (rev 15892) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<server xmlns="urn:jboss:domain:1.1"> +<server xmlns="urn:jboss:domain:1.2"> <extensions> <extension module="org.jboss.as.connector"/>