Author: richard.opalka(a)jboss.com Date: 2011-06-28 06:16:12 -0400 (Tue, 28 Jun 2011) New Revision: 14637 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java Log: [JBMETA-334] use EJB3 annotations for now. There's no support for DD driven security-domain configuration on AS7 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2011-06-27 20:00:23 UTC (rev 14636) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2011-06-28 10:16:12 UTC (rev 14637) @@ -41,6 +41,7 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; +import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.ws.common.DOMWriter; import org.jboss.ws.api.util.DOMUtils; import org.jboss.ws.api.annotation.AuthMethod; @@ -67,8 +68,7 @@ ) // [JBWS-1339] @Security domain vs. <security-domain> -//@SecurityDomain("JBossWS") - +@SecurityDomain("JBossWS") @RolesAllowed("friend") public class EndpointEJB { Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-06-27 20:00:23 UTC (rev 14636) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-06-28 10:16:12 UTC (rev 14637) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.samples.context; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -45,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar"); + return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", !isTargetJBoss6()); } public void setUp() throws Exception