Author: thomas.diesler(a)jboss.com Date: 2007-06-20 11:47:16 -0400 (Wed, 20 Jun 2007) New Revision: 3667 Added: branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/context/META-INF/ branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/context/META-INF/jboss.xml Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml branches/jbossws-2.0/integration/native/build.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java Log: [JBWS-1339] @Security domain vs. <security-domain> Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -76,7 +76,6 @@ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){stacklibs}/jbossws-native50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; </sequential> @@ -125,7 +124,6 @@ </delete> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: branches/jbossws-2.0/integration/native/build.xml =================================================================== --- branches/jbossws-2.0/integration/native/build.xml 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/integration/native/build.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -109,14 +109,14 @@ </jar> <!-- Build jbossws-context.war --> - <mkdir dir="${native.output.lib.dir}"/> - <war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <mkdir dir="${native.output.lib.dir}/jbossws-context.war"/> + <copy todir="${native.output.lib.dir}/jbossws-context.war"> <fileset dir="${native.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> + <include name="WEB-INF/**"/> </fileset> - <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/> - </war> + </copy> <!-- Build jbossws-native-src.zip --> <zip zipfile="${native.output.lib.dir}/jbossws-native-src.zip" > @@ -129,21 +129,11 @@ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> - <!-- Build jbossws-context.war --> - <mkdir dir="${native.output.lib.dir}"/> - <war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${native.resources.dir}/jbossws-context.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/> - </war> - <!-- Build jbossws-native50.sar --> <jar jarfile="${native.output.lib.dir}/jbossws-native50.sar" manifest="${native.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service <fileset dir="${native.output.lib.dir}"> - <include name="jbossws-context.war"/> + <include name="jbossws-context.war/**"/> </fileset> --> <fileset dir="${core.dir}/output/lib"> @@ -182,7 +172,7 @@ <mkdir dir="${native.output.lib.dir}"/> <jar jarfile="${native.output.lib.dir}/jbossws-native42.sar" manifest="${native.output.etc.dir}/default.mf"> <fileset dir="${native.output.lib.dir}"> - <include name="jbossws-context.war"/> + <include name="jbossws-context.war/**"/> <include name="jbossws-native.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> @@ -218,7 +208,7 @@ <mkdir dir="${native.output.lib.dir}"/> <jar jarfile="${native.output.lib.dir}/jbossws-native40.sar" manifest="${native.output.etc.dir}/default.mf"> <fileset dir="${native.output.lib.dir}"> - <include name="jbossws-context.war"/> + <include name="jbossws-context.war/**"/> <include name="jbossws-native.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -6,9 +6,10 @@ <jboss-web> - <!-- - <security-domain>java:/jaas/jbossws</security-domain> + <!-- A security domain that restricts access + <security-domain>java:/jaas/JBossWS</security-domain> --> + <context-root>jbossws</context-root> </jboss-web> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -34,6 +34,32 @@ <url-pattern>/pclink</url-pattern> </servlet-mapping> + <!-- A security constraint that restricts access + <security-constraint> + <web-resource-collection> + <web-resource-name>ContextServlet</web-resource-name> + <description>An example security config that only allows users with the + role 'friend' to access the JBossWS console web application + </description> + <url-pattern>/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + <auth-constraint> + <role-name>friend</role-name> + </auth-constraint> + </security-constraint> + --> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>JBossWS Management Console</realm-name> + </login-config> + + <security-role> + <role-name>friend</role-name> + </security-role> + <!-- currently the W3C haven't settled on a media type for WSDL; http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -4,6 +4,9 @@ <jboss> + <!-- [JBWS-1339] @Security domain vs. <security-domain> --> + <security-domain>java:/jaas/JBossWS</security-domain> + <enterprise-beans> <session> <ejb-name>EJB3Client</ejb-name> Modified: branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/testsuite/ant-import/build-jars-jaxws.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -41,6 +41,9 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF"> + <include name="jboss.xml"/> + </metainf> </jar> <!-- jaxws-samples-eardeployment --> Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java =================================================================== --- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-06-20 14:34:10 UTC (rev 3666) +++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointEJB.java 2007-06-20 15:47:16 UTC (rev 3667) @@ -35,14 +35,16 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.wsf.spi.annotation.WebContext; @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/context") @SOAPBinding(style = Style.RPC) @Stateless @WebContext(contextRoot = "/jaxws-samples-context", urlPattern = "/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) -@SecurityDomain("JBossWS") + +// [JBWS-1339] @Security domain vs. <security-domain> +//@SecurityDomain("JBossWS") + @RolesAllowed("friend") public class EndpointEJB { Added: branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/context/META-INF/jboss.xml =================================================================== --- branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/context/META-INF/jboss.xml (rev 0) +++ branches/jbossws-2.0/testsuite/src/resources/jaxws/samples/context/META-INF/jboss.xml 2007-06-20 15:47:16 UTC (rev 3667) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <!-- [JBWS-1339] @Security domain vs. <security-domain> --> + <security-domain>java:/jaas/JBossWS</security-domain> + +</jboss> \ No newline at end of file