Author: thomas.diesler(a)jboss.com Date: 2008-05-30 11:37:47 -0400 (Fri, 30 May 2008) New Revision: 7239 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java Log: [JBWS-2107] Resolve dependency on @SecurityDomain Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarAddressingEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239) @@ -43,7 +43,6 @@ import javax.xml.ws.addressing.AddressingProperties; import javax.xml.ws.addressing.JAXWSAConstants; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; @@ -61,7 +60,8 @@ serviceName = "DarService") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL) -@SecurityDomain("JBossWS") +//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 +//@SecurityDomain("JBossWS") @WebContext(contextRoot="/dar", urlPattern="/*", authMethod="BASIC", Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239) @@ -43,7 +43,8 @@ serviceName = "DarService") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL) -@SecurityDomain("JBossWS") +//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 +//@SecurityDomain("JBossWS") @WebContext(contextRoot="/dar", urlPattern="/*", authMethod="BASIC", Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239) @@ -26,7 +26,6 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.BindingType; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.wsf.spi.annotation.WebContext; @@ -37,7 +36,8 @@ serviceName = "NewspaperMTOMService") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL) -@SecurityDomain("JBossWS") +//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 +//@SecurityDomain("JBossWS") @WebContext(contextRoot="/news", urlPattern="/newspaper/mtom", authMethod="BASIC", Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2008-05-30 13:36:11 UTC (rev 7238) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.java 2008-05-30 15:37:47 UTC (rev 7239) @@ -25,7 +25,6 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.wsf.spi.annotation.WebContext; @@ -36,7 +35,8 @@ serviceName = "NewspaperSWAService") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL) -@SecurityDomain("JBossWS") +//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 +//@SecurityDomain("JBossWS") @WebContext(contextRoot="/news", urlPattern="/newspaper/swa", authMethod="BASIC", Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-05-30 13:36:11 UTC (rev 7238) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2008-05-30 15:37:47 UTC (rev 7239) @@ -28,7 +28,6 @@ import javax.jws.soap.SOAPBinding; import javax.jws.soap.SOAPBinding.Style; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.wsf.spi.annotation.WebContext; @@ -37,7 +36,8 @@ @SOAPBinding(style = Style.RPC) @WebContext(contextRoot="/jaxws-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) -@SecurityDomain("JBossWS") +//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 +//@SecurityDomain("JBossWS") @RolesAllowed("friend") public class SecureEndpointImpl {