[jboss-cvs] JBossAS SVN: r73455 - in trunk: security/src/etc and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 16 15:51:42 EDT 2008
Author: sguilhen at redhat.com
Date: 2008-05-16 15:51:41 -0400 (Fri, 16 May 2008)
New Revision: 73455
Added:
trunk/security/src/etc/deploy/
trunk/security/src/etc/deploy/security-beans.xml
trunk/security/src/etc/deploy/security-policies-beans.xml
trunk/testsuite/src/resources/test-configs/jacc/deploy/security/
trunk/testsuite/src/resources/test-configs/jacc/deploy/security/jacc-policies-beans.xml
Removed:
trunk/server/src/etc/deploy/security-beans.xml
trunk/server/src/etc/deploy/security-policies-beans.xml
trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-beans.xml
Modified:
trunk/build/build-distr.xml
Log:
JBAS-5318: created the deploy/security folder to host all security configuration files.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-05-16 18:22:50 UTC (rev 73454)
+++ trunk/build/build-distr.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -917,23 +917,31 @@
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
- <!-- Copy the generated libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jbosssx-server.jar"/>
- </fileset>
- </copy>
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${install.all.lib}"/>
+ <copy todir="${install.all.lib}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jbosssx-server.jar"/>
+ </fileset>
+ </copy>
<!-- Copy client library to client dir -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${jboss.jbosssx.client.lib}">
- <include name="jbosssx-client.jar"/>
- </fileset>
- <fileset dir="${_module.output}/lib">
- <include name="jbosssx-as-client.jar"/>
- </fileset>
- </copy>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${jboss.jbosssx.client.lib}">
+ <include name="jbosssx-client.jar"/>
+ </fileset>
+ <fileset dir="${_module.output}/lib">
+ <include name="jbosssx-as-client.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the security configuration files -->
+ <mkdir dir="${install.all.deploy}/security"/>
+ <copy todir="${install.all.deploy}/security">
+ <fileset dir="${_module.output}/etc/deploy/">
+ <include name="*-beans.xml"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-security-all" depends="_module-security-most">
Added: trunk/security/src/etc/deploy/security-beans.xml
===================================================================
--- trunk/security/src/etc/deploy/security-beans.xml (rev 0)
+++ trunk/security/src/etc/deploy/security-beans.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Security beans
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+
+ <!-- JNDI Object Factory to establish SecurityDomainContext objects -->
+ <bean name="SecurityDomainObjectFactory"
+ class="org.jboss.security.integration.SecurityDomainObjectFactory">
+ <depends>SecurityConfig</depends>
+ </bean>
+
+ <!-- JNDI Context legacy establishment of java:/jaas/securityDomain -->
+ <bean name="JBossSecurityJNDIContextEstablishment"
+ class="org.jboss.security.integration.JNDIContextEstablishment">
+ <depends>SecurityConfig</depends>
+ </bean>
+
+ <!-- JNDI Based Security Management -->
+ <bean name="JNDIBasedSecurityManagement"
+ class="org.jboss.security.integration.JNDIBasedSecurityManagement">
+ <depends>SecurityConfig</depends>
+ </bean>
+
+ <!-- Instance of Policy Registration -->
+ <bean name="JBossSecurityPolicyRegistration"
+ class="org.jboss.security.plugins.JBossPolicyRegistration" />
+
+ <!-- Bind the PolicyRegistration to JNDI under java:/policyRegistration -->
+ <bean name="JNDIBasedSecurityPolicyRegistration"
+ class="org.jboss.security.integration.JNDIBasedSecurityPolicyRegistration">
+ <property name="policyRegistration"><inject bean="JBossSecurityPolicyRegistration" /></property>
+ </bean>
+
+
+ <!-- Establish the basic XML Based Configuration-->
+ <bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
+ <property name="configResource">login-config.xml</property>
+ </bean>
+
+ <bean name="SecurityConfig" class="org.jboss.security.plugins.SecurityConfig">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="loginConfig">jboss.security:service=XMLLoginConfig</property>
+ <depends>jboss.security:service=XMLLoginConfig</depends>
+ </bean>
+
+</deployment>
Added: trunk/security/src/etc/deploy/security-policies-beans.xml
===================================================================
--- trunk/security/src/etc/deploy/security-policies-beans.xml (rev 0)
+++ trunk/security/src/etc/deploy/security-policies-beans.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-web-policy" extends="other">
+ <authorization>
+ <policy-module code="org.jboss.security.authorization.modules.DelegatingAuthorizationModule" flag="required"/>
+ </authorization>
+ </application-policy>
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-ejb-policy" extends="other">
+ <authorization>
+ <policy-module code="org.jboss.security.authorization.modules.DelegatingAuthorizationModule" flag="required"/>
+ </authorization>
+ </application-policy>
+
+</deployment>
Deleted: trunk/server/src/etc/deploy/security-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/security-beans.xml 2008-05-16 18:22:50 UTC (rev 73454)
+++ trunk/server/src/etc/deploy/security-beans.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Security beans
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-
- <!-- JNDI Object Factory to establish SecurityDomainContext objects -->
- <bean name="SecurityDomainObjectFactory"
- class="org.jboss.security.integration.SecurityDomainObjectFactory">
- <depends>SecurityConfig</depends>
- </bean>
-
- <!-- JNDI Context legacy establishment of java:/jaas/securityDomain -->
- <bean name="JBossSecurityJNDIContextEstablishment"
- class="org.jboss.security.integration.JNDIContextEstablishment">
- <depends>SecurityConfig</depends>
- </bean>
-
- <!-- JNDI Based Security Management -->
- <bean name="JNDIBasedSecurityManagement"
- class="org.jboss.security.integration.JNDIBasedSecurityManagement">
- <depends>SecurityConfig</depends>
- </bean>
-
- <!-- Instance of Policy Registration -->
- <bean name="JBossSecurityPolicyRegistration"
- class="org.jboss.security.plugins.JBossPolicyRegistration" />
-
- <!-- Bind the PolicyRegistration to JNDI under java:/policyRegistration -->
- <bean name="JNDIBasedSecurityPolicyRegistration"
- class="org.jboss.security.integration.JNDIBasedSecurityPolicyRegistration">
- <property name="policyRegistration"><inject bean="JBossSecurityPolicyRegistration" /></property>
- </bean>
-
-
- <!-- Establish the basic XML Based Configuration-->
- <bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
- <property name="configResource">login-config.xml</property>
- </bean>
-
- <bean name="SecurityConfig" class="org.jboss.security.plugins.SecurityConfig">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="loginConfig">jboss.security:service=XMLLoginConfig</property>
- <depends>jboss.security:service=XMLLoginConfig</depends>
- </bean>
-
-</deployment>
Deleted: trunk/server/src/etc/deploy/security-policies-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/security-policies-beans.xml 2008-05-16 18:22:50 UTC (rev 73454)
+++ trunk/server/src/etc/deploy/security-policies-beans.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-web-policy" extends="other">
- <authorization>
- <policy-module code="org.jboss.security.authorization.modules.DelegatingAuthorizationModule" flag="required"/>
- </authorization>
- </application-policy>
-
- <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-ejb-policy" extends="other">
- <authorization>
- <policy-module code="org.jboss.security.authorization.modules.DelegatingAuthorizationModule" flag="required"/>
- </authorization>
- </application-policy>
-
-</deployment>
Added: trunk/testsuite/src/resources/test-configs/jacc/deploy/security/jacc-policies-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jacc/deploy/security/jacc-policies-beans.xml (rev 0)
+++ trunk/testsuite/src/resources/test-configs/jacc/deploy/security/jacc-policies-beans.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-web-policy" extends="other">
+ <authorization>
+ <policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
+ </authorization>
+ </application-policy>
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-ejb-policy" extends="other">
+ <authorization>
+ <policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
+ </authorization>
+ </application-policy>
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="jacc-test" extends="other">
+ <authorization>
+ <policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
+ </authorization>
+ </application-policy>
+
+</deployment>
Deleted: trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-beans.xml 2008-05-16 18:22:50 UTC (rev 73454)
+++ trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-beans.xml 2008-05-16 19:51:41 UTC (rev 73455)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-web-policy" extends="other">
- <authorization>
- <policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
- </authorization>
- </application-policy>
-
- <application-policy xmlns="urn:jboss:security-beans:1.0" name="jboss-ejb-policy" extends="other">
- <authorization>
- <policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
- </authorization>
- </application-policy>
-
- <application-policy xmlns="urn:jboss:security-beans:1.0" name="jacc-test" extends="other">
- <authorization>
- <policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
- </authorization>
- </application-policy>
-
-</deployment>
More information about the jboss-cvs-commits
mailing list