Author: alessio.soldano(a)jboss.com Date: 2008-03-21 03:45:18 -0400 (Fri, 21 Mar 2008) New Revision: 6049 Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss.xml stack/native/trunk/src/test/resources/jaxws/jbws1991/META-INF/jboss.xml Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java Log: Fixing JBWS-1988 and JBWS-1991 failing tests: declaring the security domain in jboss.xml for now. Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-20 17:03:57 UTC (rev 6048) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-21 07:45:18 UTC (rev 6049) @@ -686,6 +686,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/jbws1988/META-INF"> <include name="jboss-wsse-server.xml"/> + <include name="jboss.xml"/> </metainf> </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1988.sar"> @@ -705,6 +706,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/jbws1991/META-INF"> <include name="jboss-wsse-server.xml"/> + <include name="jboss.xml"/> </metainf> </jar> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2008-03-20 17:03:57 UTC (rev 6048) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1988/HelloJavaBean.java 2008-03-21 07:45:18 UTC (rev 6049) @@ -29,7 +29,6 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.WebServiceContext; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; @@ -40,7 +39,8 @@ @SOAPBinding(style = SOAPBinding.Style.RPC) @WebContext(contextRoot = "/jaxws-jbws1988", urlPattern = "/*") @EndpointConfig(configName = "Standard WSSecurity Endpoint") -@SecurityDomain("JBossWSDigest") +//We're declaring the domain in the jboss.xml since we have different annotation packages for AS5 and AS42 +//@SecurityDomain("JBossWSDigest") @RolesAllowed({"friend"}) public class HelloJavaBean { Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2008-03-20 17:03:57 UTC (rev 6048) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/HelloJavaBean.java 2008-03-21 07:45:18 UTC (rev 6049) @@ -29,7 +29,6 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.WebServiceContext; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.logging.Logger; import org.jboss.ws.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; @@ -40,7 +39,8 @@ @SOAPBinding(style = SOAPBinding.Style.RPC) @WebContext(contextRoot = "/jaxws-jbws1991", urlPattern = "/*") @EndpointConfig(configName = "Standard WSSecurity Endpoint") -@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 HelloJavaBean { Added: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss.xml 2008-03-21 07:45:18 UTC (rev 6049) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd"> + +<jboss> + <security-domain>java:/jaas/JBossWSDigest</security-domain> +</jboss> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1988/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/trunk/src/test/resources/jaxws/jbws1991/META-INF/jboss.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1991/META-INF/jboss.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/jbws1991/META-INF/jboss.xml 2008-03-21 07:45:18 UTC (rev 6049) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd"> + +<jboss> + <security-domain>java:/jaas/JBossWS</security-domain> +</jboss> \ No newline at end of file Property changes on: stack/native/trunk/src/test/resources/jaxws/jbws1991/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF