[jbossws-commits] JBossWS SVN: r14638 - in stack/native/trunk/modules/testsuite: native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directories.

Author: richard.opalka(a)jboss.com Date: 2011-06-28 06:20:14 -0400 (Tue, 28 Jun 2011) New Revision: 14638 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java stack/native/trunk/modules/testsuite/pom.xml Log: [JBMETA-334] use EJB3 annotations for now. There's no support for DD driven security-domain configuration on AS7 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2011-06-28 10:16:12 UTC (rev 14637) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2011-06-28 10:20:14 UTC (rev 14638) @@ -32,13 +32,14 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; +import org.jboss.ejb3.annotation.SecurityDomain; - @Stateless @WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1988") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*") @EndpointConfig(configName = "Standard WSSecurity Endpoint") +@SecurityDomain(value="JBossWSDigest") @RolesAllowed({"friend"}) public class HelloJavaBean { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2011-06-28 10:16:12 UTC (rev 14637) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2011-06-28 10:20:14 UTC (rev 14638) @@ -29,16 +29,17 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.WebServiceContext; +import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; - @Stateless @WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws1991") @SOAPBinding(style = SOAPBinding.Style.RPC) @WebContext(contextRoot = "/jaxws-jbws1991", urlPattern = "/*") @EndpointConfig(configName = "Standard WSSecurity Endpoint") +@SecurityDomain(value="JBossWS") @RolesAllowed({"friend"}) public class HelloJavaBean { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-06-28 10:16:12 UTC (rev 14637) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-06-28 10:20:14 UTC (rev 14638) @@ -46,7 +46,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar"); + return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar", !isTargetJBoss6()); } public void testAuth() throws Exception Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-06-28 10:16:12 UTC (rev 14637) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-28 10:20:14 UTC (rev 14638) @@ -833,11 +833,7 @@ <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for supporting deployment of different security domains --> <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> - - <!-- TODO: implement EJB security integration --> - <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude> </excludes> </configuration> </plugin>