[jbossws-commits] JBossWS SVN: r14486 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: samples/wssecurity and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2011-06-07 12:01:48 -0400 (Tue, 07 Jun 2011) New Revision: 14486 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java Log: [JBWS-3257] Use new option for deploying security domain Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-06-07 16:01:14 UTC (rev 14485) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-06-07 16:01:48 UTC (rev 14486) @@ -56,7 +56,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war"); + return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war", !isTargetJBoss6()); } public void testNoSecurity() throws Exception Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-06-07 16:01:14 UTC (rev 14485) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-06-07 16:01:48 UTC (rev 14486) @@ -59,7 +59,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war"); + return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", !isTargetJBoss6()); } @Override Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-06-07 16:01:14 UTC (rev 14485) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-06-07 16:01:48 UTC (rev 14486) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.samples.wssecurity; -import java.io.File; import java.net.URL; import java.util.Map; @@ -48,7 +47,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war"); + return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", !isTargetJBoss6()); } @Override