[jboss-cvs] JBossAS SVN: r75414 - in projects/security/security-jboss-sx/trunk: identity and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jul 6 10:53:03 EDT 2008
Author: sguilhen at redhat.com
Date: 2008-07-06 10:53:02 -0400 (Sun, 06 Jul 2008)
New Revision: 75414
Added:
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ACLPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ACLMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml
Modified:
projects/security/security-jboss-sx/trunk/acl/.classpath
projects/security/security-jboss-sx/trunk/identity/.classpath
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/.classpath
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ApplicationPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuditPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthenticationPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthorizationPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BaseAuthenticationPolicy.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyModule.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/IdentityTrustPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/LoginModuleStackBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/RoleMappingPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/StackRefPolicyModule.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ApplicationPolicyMetaDataFactory.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuditMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthenticationMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthorizationMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BaseModuleMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BasePolicyMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/FlaggedModuleMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/IdentityTrustMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/JASPIAuthenticationMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/LoginModuleStackMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ModuleOptionMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/RoleMappingMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/SecurityPolicyMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/StackRefModuleMetaData.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/resources/schema/security-beans_1_0.xsd
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyTestSuite.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/InvalidApplicationPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ManagersInjectionTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuditManager.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthenticationManager.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthorizationManager.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockIdentityTrustManager.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockMappingManager.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityDomain.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityManagement.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/TestBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx/.classpath
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java
Log:
SECURITY-259: ApplicationPolicyMetaDataFactory is now capable of handling ACL configurations. A test case has been added to test the creation of application policies that specify ACL modules. The headers of the source files have also been changed to fix the year (2006 to 2008).
Modified: projects/security/security-jboss-sx/trunk/acl/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/acl/.classpath 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/acl/.classpath 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,45 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/*.java" including="JBossORG-EULA.txt" kind="src" path=""/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" including="**/*.dtd|**/*.xsd" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/tests/java"/>
- <classpathentry excluding="**/*.java" including="**/*.xml" kind="src" output="target/test-classes" path="src/tests/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR2/jboss-security-spi-2.0.2.CR2.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.7.1.GA/javassist-3.7.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/identity"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="." including="JBossORG-EULA.txt" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" including="**/*.dtd|**/*.xsd" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/tests/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/tests/resources" output="target/test-classes" including="**/*.xml" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.3.GA/javassist-3.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+</classpath>
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/identity/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/identity/.classpath 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/identity/.classpath 2008-07-06 14:53:02 UTC (rev 75414)
@@ -9,7 +9,6 @@
<classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.Beta5/identity-spi-2.0.2.Beta5.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
@@ -17,6 +16,7 @@
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
Modified: projects/security/security-jboss-sx/trunk/jbosssx/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/.classpath 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx/.classpath 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,70 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/*.java" including="JBossORG-EULA.txt" kind="src" path=""/>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry excluding="**/*.java" including="**/*.dtd|**/*.xsd" kind="src" path="src/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/tests"/>
- <classpathentry kind="src" path="target/generated-sources/javacc"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.4/jaxb-impl-2.1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-xjc/2.1.4/jaxb-xjc-2.1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.Beta3/jboss-javaee-5.0.0.Beta3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaxs-api/1.2.0.20070913080910/jboss-jaxs-api-1.2.0.20070913080910.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.1.GA/jboss-jmx-4.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR3/jboss-security-spi-2.0.2.CR3.jar" sourcepath="/M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR3/jboss-security-spi-2.0.2.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-sunxacml/2.0.2.GA/jboss-sunxacml-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.2.GA/jboss-xacml-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/>
- <classpathentry kind="var" path="M2_REPO/sleepycat/je/3.2.43/je-3.2.43.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jnpserver/5.0.0.Beta3/jnpserver-5.0.0.Beta3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/1.0.0-BUILD04/opends-core-1.0.0-BUILD04.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xalan/xalan/j_2.7.0/xalan-j_2.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="." including="JBossORG-EULA.txt" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" path="src/resources" including="**/*.dtd|**/*.xsd" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/tests" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/tests/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="target/generated-sources/javacc"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.4/jaxb-impl-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-xjc/2.1.4/jaxb-xjc-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.Beta3/jboss-javaee-5.0.0.Beta3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaxs-api/1.2.0.20070913080910/jboss-jaxs-api-1.2.0.20070913080910.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.1.GA/jboss-jmx-4.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-sunxacml/2.0.2.GA/jboss-sunxacml-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.2.GA/jboss-xacml-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR10/jbossxb-2.0.0.CR10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sleepycat/je/3.2.43/je-3.2.43.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jnpserver/5.0.0.Beta3/jnpserver-5.0.0.Beta3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/1.0.0-BUILD04/opends-core-1.0.0-BUILD04.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xalan/xalan/j_2.7.0/xalan-j_2.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+</classpath>
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfo.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.security.auth.login;
import java.security.AccessController;
@@ -34,76 +34,82 @@
import javax.security.auth.login.AppConfigurationEntry;
import org.jboss.security.SecurityConstants;
+import org.jboss.security.config.BaseSecurityInfo;
-/** The login module configuration information.
-
- @author Scott.Stark at jboss.org
- @version $Revision$
+/**
+ * The login module configuration information.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
*/
public class AuthenticationInfo extends BaseAuthenticationInfo
{
public static final AuthPermission GET_CONFIG_ENTRY_PERM = new AuthPermission("getLoginConfiguration");
+
public static final AuthPermission SET_CONFIG_ENTRY_PERM = new AuthPermission("setLoginConfiguration");
+
private CallbackHandler callbackHandler;
public AuthenticationInfo()
{
this(null);
}
+
public AuthenticationInfo(String name)
{
this.name = name;
}
- /** Get a copy of the application authentication configuration. This requires
- an AuthPermission("getLoginConfiguration") access.
+ /**
+ * Get a copy of the application authentication configuration. This requires an
+ * AuthPermission("getLoginConfiguration") access.
*/
public AppConfigurationEntry[] copyAppConfigurationEntry()
{
SecurityManager sm = System.getSecurityManager();
- if( sm != null )
- sm.checkPermission(GET_CONFIG_ENTRY_PERM);
+ if (sm != null)
+ sm.checkPermission(GET_CONFIG_ENTRY_PERM);
AppConfigurationEntry[] copy = new AppConfigurationEntry[moduleEntries.size()];
- for(int i = 0; i < copy.length; i ++)
- {
+ for (int i = 0; i < copy.length; i++)
+ {
AppConfigurationEntry entry = (AppConfigurationEntry) moduleEntries.get(i);
- HashMap<String,Object> options = new HashMap<String,Object>(entry.getOptions());
- if(!disableSecurityDomainInOptions())
+ HashMap<String, Object> options = new HashMap<String, Object>(entry.getOptions());
+ if (!disableSecurityDomainInOptions())
{
options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
}
- copy[i] = new AppConfigurationEntry(entry.getLoginModuleName(),
- entry.getControlFlag(), options);
+ copy[i] = new AppConfigurationEntry(entry.getLoginModuleName(), entry.getControlFlag(), options);
}
return copy;
}
public void addAppConfigurationEntry(AppConfigurationEntry entry)
- {
+ {
moduleEntries.add(entry);
}
-
- /** Get an application authentication configuration. This requires an
- AuthPermission("getLoginConfiguration") access.
+
+ /**
+ * Get an application authentication configuration. This requires an AuthPermission("getLoginConfiguration") access.
*/
public AppConfigurationEntry[] getAppConfigurationEntry()
{
SecurityManager sm = System.getSecurityManager();
- if( sm != null )
- sm.checkPermission(GET_CONFIG_ENTRY_PERM);
+ if (sm != null)
+ sm.checkPermission(GET_CONFIG_ENTRY_PERM);
AppConfigurationEntry[] entries = new AppConfigurationEntry[moduleEntries.size()];
moduleEntries.toArray(entries);
return entries;
}
- /** Set an application authentication configuration. This requires an
- AuthPermission("setLoginConfiguration") access.
+
+ /**
+ * Set an application authentication configuration. This requires an AuthPermission("setLoginConfiguration") access.
*/
public void setAppConfigurationEntry(AppConfigurationEntry[] loginModules)
{
SecurityManager sm = System.getSecurityManager();
- if( sm != null )
+ if (sm != null)
sm.checkPermission(SET_CONFIG_ENTRY_PERM);
-
+
moduleEntries.addAll(Arrays.asList(loginModules));
}
@@ -113,29 +119,31 @@
{
return callbackHandler;
}
+
public void setAppCallbackHandler(CallbackHandler handler)
{
this.callbackHandler = handler;
}
+ @Override
@SuppressWarnings("unchecked")
public String toString()
{
StringBuffer buffer = new StringBuffer("AppConfigurationEntry[]:\n");
- for(int i = 0; i < moduleEntries.size(); i ++)
+ for (int i = 0; i < moduleEntries.size(); i++)
{
AppConfigurationEntry entry = (AppConfigurationEntry) moduleEntries.get(i);
- buffer.append("["+i+"]");
- buffer.append("\nLoginModule Class: "+entry.getLoginModuleName());
- buffer.append("\nControlFlag: "+entry.getControlFlag());
+ buffer.append("[" + i + "]");
+ buffer.append("\nLoginModule Class: " + entry.getLoginModuleName());
+ buffer.append("\nControlFlag: " + entry.getControlFlag());
buffer.append("\nOptions:");
- Map<String,?> options = entry.getOptions();
+ Map<String, ?> options = entry.getOptions();
Iterator iter = options.entrySet().iterator();
- while( iter.hasNext() )
+ while (iter.hasNext())
{
Entry e = (Entry) iter.next();
- buffer.append("name="+e.getKey());
- buffer.append(", value="+e.getValue());
+ buffer.append("name=" + e.getKey());
+ buffer.append(", value=" + e.getValue());
buffer.append("\n");
}
}
@@ -144,13 +152,19 @@
private boolean disableSecurityDomainInOptions()
{
- String sysprop = (String)AccessController.doPrivileged(new PrivilegedAction<String>()
+ String sysprop = AccessController.doPrivileged(new PrivilegedAction<String>()
{
public String run()
{
return System.getProperty(SecurityConstants.DISABLE_SECDOMAIN_OPTION);
}
});
- return "true".equalsIgnoreCase(sysprop);
+ return "true".equalsIgnoreCase(sysprop);
}
+
+ @Override
+ protected BaseSecurityInfo<Object> create(String name)
+ {
+ return new AuthenticationInfo(name);
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -29,52 +29,54 @@
import java.util.Map.Entry;
import org.jboss.security.auth.container.config.AuthModuleEntry;
+import org.jboss.security.config.BaseSecurityInfo;
-//$Id$
+// $Id$
/**
- * AuthenticationInfo based on JSR-196
- * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- * @since Dec 21, 2005
+ * AuthenticationInfo based on JSR-196
+ *
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @since Dec 21, 2005
*/
@SuppressWarnings("unchecked")
public class JASPIAuthenticationInfo extends BaseAuthenticationInfo
-{
- Map loginModuleStack = Collections.synchronizedMap(new HashMap());
-
+{
+ Map loginModuleStack = Collections.synchronizedMap(new HashMap());
+
public JASPIAuthenticationInfo()
{
- super();
+ super();
}
-
+
public JASPIAuthenticationInfo(String name)
{
- super(name);
- }
-
+ super(name);
+ }
+
public void add(LoginModuleStackHolder lmsHolder)
{
- loginModuleStack.put(lmsHolder.getName(),lmsHolder );
+ loginModuleStack.put(lmsHolder.getName(), lmsHolder);
}
-
+
public void add(AuthModuleEntry ame)
{
moduleEntries.add(ame);
}
-
+
public AuthModuleEntry[] getAuthModuleEntry()
{
AuthModuleEntry[] entries = new AuthModuleEntry[moduleEntries.size()];
moduleEntries.toArray(entries);
return entries;
}
-
+
public LoginModuleStackHolder getLoginModuleStackHolder(String name)
{
LoginModuleStackHolder info = (LoginModuleStackHolder) loginModuleStack.get(name);
return info;
- }
-
+ }
+
public LoginModuleStackHolder[] getLoginModuleStackHolder()
{
ArrayList alist = new ArrayList(this.loginModuleStack.values());
@@ -82,39 +84,50 @@
alist.toArray(lmshArr);
return lmshArr;
}
-
-
+
public LoginModuleStackHolder removeLoginModuleStackHolder(String name)
{
LoginModuleStackHolder info = (LoginModuleStackHolder) loginModuleStack.remove(name);
return info;
- }
-
+ }
+
public void copy(JASPIAuthenticationInfo pc)
{
loginModuleStack.putAll(pc.loginModuleStack);
moduleEntries.addAll(pc.moduleEntries);
}
-
+
+ @Override
public String toString()
{
StringBuffer buffer = new StringBuffer("AuthModuleEntry[]:\n");
- for(int i = 0; i < moduleEntries.size(); i ++)
+ for (int i = 0; i < moduleEntries.size(); i++)
{
AuthModuleEntry entry = (AuthModuleEntry) moduleEntries.get(i);
- buffer.append("["+i+"]");
- buffer.append("\nAuthModule Class: "+entry.getAuthModuleName());
+ buffer.append("[" + i + "]");
+ buffer.append("\nAuthModule Class: " + entry.getAuthModuleName());
buffer.append("\nOptions:");
Map options = entry.getOptions();
Iterator iter = options.entrySet().iterator();
- while( iter.hasNext() )
+ while (iter.hasNext())
{
Entry e = (Entry) iter.next();
- buffer.append("name="+e.getKey());
- buffer.append(", value="+e.getValue());
+ buffer.append("name=" + e.getKey());
+ buffer.append(", value=" + e.getValue());
buffer.append("\n");
}
}
return buffer.toString();
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.auth.login.BaseAuthenticationInfo#create(java.lang.String)
+ */
+ @Override
+ protected BaseSecurityInfo<Object> create(String name)
+ {
+ return new JASPIAuthenticationInfo(name);
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/.classpath 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/.classpath 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,41 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR1/authorization-spi-2.0.2.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR1/identity-spi-2.0.2.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0-SNAPSHOT/jboss-dependency-2.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0-SNAPSHOT/jboss-kernel-2.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0-SNAPSHOT/jboss-kernel-2.0.0-SNAPSHOT-tests.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.0.0.Beta12/jboss-managed-2.0.0.Beta12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta15/jboss-mdr-2.0.0.Beta15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.0.0.Beta12/jboss-metatype-2.0.0.Beta12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi-bare/2.0.2.CR1/jboss-security-spi-bare-2.0.2.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.2-SNAPSHOT/jbosssx-client-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.2-SNAPSHOT/jbosssx-client-2.0.2-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR8/jbossxb-2.0.0.CR8.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.4/jaxb-impl-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-xjc/2.1.4/jaxb-xjc-2.1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta15/jboss-dependency-2.0.0.Beta15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.CR1/jboss-jacc-api-1.1.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.CR1/jboss-jaspi-api-1.0.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.0.Beta3/jboss-javaee-5.0.0.Beta3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaxs-api/1.2.0.20070913080910/jboss-jaxs-api-1.2.0.20070913080910.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.1.GA/jboss-jmx-4.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta15/jboss-kernel-2.0.0.Beta15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta15/jboss-mdr-2.0.0.Beta15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta12/jboss-reflect-2.0.0.Beta12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2-SNAPSHOT/jboss-security-acl-impl-2.0.2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-servlet-api/2.5.0.CR1/jboss-servlet-api-2.5.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-sunxacml/2.0.2.GA/jboss-sunxacml-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.CR1/jboss-transaction-api-1.0.1.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.2.GA/jboss-xacml-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-bare/2.0.2-SNAPSHOT/jbosssx-bare-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-bare/2.0.2-SNAPSHOT/jbosssx-bare-2.0.2-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR10/jbossxb-2.0.0.CR10.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xalan/xalan/j_2.7.0/xalan-j_2.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ACLPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ACLPolicyBean.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ACLPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.microcontainer.beans;
+
+import org.jboss.security.acl.config.ACLProviderEntry;
+import org.jboss.security.config.ACLInfo;
+import org.jboss.security.config.ControlFlag;
+
+/**
+ * <p>
+ * This class represents an authorization policy.
+ * </p>
+ *
+ * @author <a href="mailto:sguilhen at redhat.com">Stefan Guilhen</a>
+ */
+public class ACLPolicyBean extends BasePolicyBean<FlaggedPolicyModule, ACLInfo>
+{
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.microcontainer.beans.BasePolicyBean#getPolicyInfo(java.lang.String)
+ */
+ @Override
+ public ACLInfo getPolicyInfo(String domainName)
+ {
+ ACLInfo info = new ACLInfo(domainName);
+ for (FlaggedPolicyModule module : super.modules)
+ {
+ ACLProviderEntry entry = new ACLProviderEntry(module.getCode(), module.getOptions());
+ entry.setControlFlag(new ControlFlag(module.getFlag()));
+ info.add(entry);
+ }
+ return info;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("ACL Policy:\n");
+ for (int i = 0; i < super.modules.size(); i++)
+ {
+ FlaggedPolicyModule module = super.modules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ return buffer.toString();
+ }
+}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ApplicationPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ApplicationPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ApplicationPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -46,6 +46,7 @@
*
* @see org.jboss.security.microcontainer.beans.BaseAuthenticationPolicy
* @see org.jboss.security.microcontainer.beans.AuthorizationPolicyBean
+ * @see org.jboss.security.microcontainer.beans.ACLPolicyBean
* @see org.jboss.security.microcontainer.beans.RoleMappingPolicyBean
* @see org.jboss.security.microcontainer.beans.AuditPolicyBean
* @see org.jboss.security.microcontainer.beans.IdentityTrustPolicyBean
@@ -68,6 +69,9 @@
/** the authorization policy configured as part of this application policy. */
private AuthorizationPolicyBean authorizationPolicy;
+ /** the acl (instance-based authorization) policy configured as part of this application policy. */
+ private ACLPolicyBean aclPolicy;
+
/** the role-mapping policy configured as part of this application policy. */
private RoleMappingPolicyBean roleMappingPolicy;
@@ -171,6 +175,7 @@
/**
* <p>
* Sets the authorization policy to be used by this application policy.
+ * </p>
*
* @param authorizationPolicy an {@code AuthorizationPolicyBean} representing the policy to be set.
*/
@@ -181,6 +186,30 @@
/**
* <p>
+ * Obtains the acl policy that has been configured as part of this application policy.
+ * </p>
+ *
+ * @return an {@code ACLPolicyBean} representing the configured acl policy.
+ */
+ public ACLPolicyBean getAclPolicy()
+ {
+ return aclPolicy;
+ }
+
+ /**
+ * <p>
+ * Sets the acl policy to be used by this application policy.
+ * </p>
+ *
+ * @param aclPolicy an {@code ACLPolicyBean} representing the policy to be set.
+ */
+ public void setAclPolicy(ACLPolicyBean aclPolicy)
+ {
+ this.aclPolicy = aclPolicy;
+ }
+
+ /**
+ * <p>
* Obtains the role-mapping policy that has been configured as part of this application policy.
* </p>
*
@@ -398,6 +427,8 @@
policy.setAuthenticationInfo(this.authenticationPolicy.getPolicyInfo(this.name));
if (this.authorizationPolicy != null)
policy.setAuthorizationInfo(this.authorizationPolicy.getPolicyInfo(this.name));
+ if (this.aclPolicy != null)
+ policy.setAclInfo(this.aclPolicy.getPolicyInfo(this.name));
if (this.roleMappingPolicy != null)
policy.setRoleMappingInfo(this.roleMappingPolicy.getPolicyInfo(this.name));
if (this.auditPolicy != null)
@@ -419,7 +450,16 @@
StringBuffer buffer = new StringBuffer("Application Policy Contents: " + this.name + "\n\n");
if (this.authenticationPolicy != null)
buffer.append(this.authenticationPolicy.toString());
- // TODO: add toString to the other policy beans.
+ if (this.authorizationPolicy != null)
+ buffer.append(this.authorizationPolicy.toString());
+ if (this.aclPolicy != null)
+ buffer.append(this.aclPolicy.toString());
+ if (this.roleMappingPolicy != null)
+ buffer.append(this.roleMappingPolicy.toString());
+ if (this.auditPolicy != null)
+ buffer.append(this.auditPolicy.toString());
+ if (this.identityTrustPolicy != null)
+ buffer.append(this.identityTrustPolicy.toString());
return buffer.toString();
}
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuditPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuditPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuditPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -51,4 +51,21 @@
return info;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("Audit Policy:\n");
+ for (int i = 0; i < super.modules.size(); i++)
+ {
+ BasePolicyModule module = super.modules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthenticationPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthenticationPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthenticationPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -65,9 +65,9 @@
public String toString()
{
StringBuffer buffer = new StringBuffer("Authentication Policy:\n");
- for (int i = 0; i < modules.size(); i++)
+ for (int i = 0; i < super.modules.size(); i++)
{
- FlaggedPolicyModule module = modules.get(i);
+ FlaggedPolicyModule module = super.modules.get(i);
buffer.append("Module[" + i + "]\n");
buffer.append(module.toString());
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthorizationPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthorizationPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthorizationPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -54,4 +54,21 @@
return info;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("Authorization Policy:\n");
+ for (int i = 0; i < super.modules.size(); i++)
+ {
+ FlaggedPolicyModule module = super.modules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BaseAuthenticationPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BaseAuthenticationPolicy.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BaseAuthenticationPolicy.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -83,4 +83,5 @@
* @return the generated info object.
*/
public abstract I getPolicyInfo(String domainName);
+
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyModule.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/BasePolicyModule.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -97,4 +97,20 @@
{
this.options = options;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("Login module class: " + this.code);
+ buffer.append("\nLogin module options: \n");
+ for (Map.Entry<String, Object> entry : this.options.entrySet())
+ buffer.append("\tname= " + entry.getKey() + ", value= " + entry.getValue() + "\n");
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/IdentityTrustPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/IdentityTrustPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/IdentityTrustPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -53,4 +53,21 @@
return info;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("Identity-Trust Policy:\n");
+ for (int i = 0; i < super.modules.size(); i++)
+ {
+ FlaggedPolicyModule module = super.modules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -97,4 +97,25 @@
return info;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("JASPI-Authentication Policy:\n");
+ // string representation of the auth-modules.
+ for (int i = 0; i < super.modules.size(); i++)
+ {
+ StackRefPolicyModule module = super.modules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ // string representation of the login-module stacks.
+ for (LoginModuleStackBean stackBean : this.moduleStacks)
+ buffer.append(stackBean.toString());
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/LoginModuleStackBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/LoginModuleStackBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/LoginModuleStackBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -118,4 +118,22 @@
return holder;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("Login-Module Stack: " + this.name + "\n");
+ for (int i = 0; i < this.loginModules.size(); i++)
+ {
+ FlaggedPolicyModule module = this.loginModules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/RoleMappingPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/RoleMappingPolicyBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/RoleMappingPolicyBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -50,4 +50,22 @@
}
return info;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer("Role-Mapping Policy:\n");
+ for (int i = 0; i < super.modules.size(); i++)
+ {
+ BasePolicyModule module = super.modules.get(i);
+ buffer.append("Module[" + i + "]\n");
+ buffer.append(module.toString());
+ }
+ return buffer.toString();
+ }
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/StackRefPolicyModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/StackRefPolicyModule.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/StackRefPolicyModule.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,6 +21,8 @@
*/
package org.jboss.security.microcontainer.beans;
+import java.util.Map;
+
/**
* <p>
* This class represents a policy module that contains a reference to a login-module stack configured in a JASPI policy.
@@ -58,4 +60,20 @@
this.stackRef = stackRef;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.microcontainer.beans.BasePolicyModule#toString()
+ */
+ @Override
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("Login module class: " + super.code);
+ buffer.append("\nLogin module stack-ref: " + this.stackRef);
+ buffer.append("\nLogin module options: \n");
+ for (Map.Entry<String, Object> entry : super.options.entrySet())
+ buffer.append("\tname= " + entry.getKey() + ", value= " + entry.getValue() + "\n");
+ return buffer.toString();
+ }
}
Added: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ACLMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ACLMetaData.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ACLMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.microcontainer.beans.metadata;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * <p>
+ * This class represents the {@code <acl>} configuration in an application policy and contains the acl (instance-based
+ * authorization) metadata information extracted by the XB parser.
+ * </p>
+ * <p>
+ * The following policy excerpt shows an example of {@code <acl>} configuration:
+ *
+ * <pre>
+ * <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy1">
+ * <authentication>
+ * ...
+ * </authentication>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.ACLModule1" flag="required">
+ * <module-option name="aclOption1">acl1.value1</module-option>
+ * </acl-module>
+ * <acl-module code="org.jboss.security.authz.ACLModule2" flag="required">
+ * <module-option name="aclOption1">acl2.value1</module-option>
+ * <module-option name="aclOption2">acl2.value2</module-option>
+ * </acl-module>
+ * </acl>
+ * ...
+ * </application-policy>
+ * </pre>
+ *
+ * The metadata that results from the XB parsing is used by the microcontainer to create an instance of
+ * {@code ACLPolicyBean} and inject this instance into the {@code ApplicationPolicyBean} that represents the application
+ * policy as a whole.
+ * </p>
+ *
+ * @author <a href="mailto:sguilhen at redhat.com">Stefan Guilhen</a>
+ */
+public class ACLMetaData extends BasePolicyMetaData
+{
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.microcontainer.beans.metadata.BasePolicyMetaData#setModules(java.util.List)
+ */
+ @Override
+ @XmlElement(name = "acl-module", type = FlaggedModuleMetaData.class)
+ public void setModules(List<BaseModuleMetaData> modules)
+ {
+ super.modules = modules;
+ }
+
+}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ApplicationPolicyMetaDataFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ApplicationPolicyMetaDataFactory.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ApplicationPolicyMetaDataFactory.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -36,6 +36,7 @@
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.logging.Logger;
+import org.jboss.security.microcontainer.beans.ACLPolicyBean;
import org.jboss.security.microcontainer.beans.ApplicationPolicyBean;
import org.jboss.security.microcontainer.beans.AuditPolicyBean;
import org.jboss.security.microcontainer.beans.AuthenticationPolicyBean;
@@ -80,7 +81,7 @@
*/
@JBossXmlSchema(namespace = "urn:jboss:security-beans:1.0", elementFormDefault = XmlNsForm.QUALIFIED)
@XmlRootElement(name = "application-policy")
- at XmlType(name = "applicationPolicyType", propOrder = {"authentication", "jaspiAuthentication", "authorization",
+ at XmlType(name = "applicationPolicyType", propOrder = {"authentication", "jaspiAuthentication", "authorization", "acl",
"roleMapping", "audit", "identityTrust"})
public class ApplicationPolicyMetaDataFactory implements BeanMetaDataFactory
{
@@ -105,6 +106,9 @@
/** the metadata of the authorization policy. */
private AuthorizationMetaData authzMetaData;
+ /** the metadata of the acl policy. */
+ private ACLMetaData aclMetaData;
+
/** the metadata of the role-mapping policy. */
private RoleMappingMetaData mappingMetaData;
@@ -206,6 +210,19 @@
/**
* <p>
+ * Sets the metadata generated as a result of parsing the <acl> element in an application policy configuration.
+ * </p>
+ *
+ * @param aclMetaData a reference to the generated {@code ACLMetaData}.
+ */
+ @XmlElement(name = "acl", type = ACLMetaData.class)
+ public void setAcl(ACLMetaData aclMetaData)
+ {
+ this.aclMetaData = aclMetaData;
+ }
+
+ /**
+ * <p>
* Sets the metadata generated as a result of parsing the <rolemapping> element in an application policy
* configuration.
* </p>
@@ -307,6 +324,19 @@
policyBuilder.addPropertyMetaData("authorizationPolicy", injectAuthorizationPolicy);
}
+ // acl (instance-based authorization) metadata.
+ if (this.aclMetaData != null)
+ {
+ logger.trace("Generating acl metadata for policy " + this.policyName);
+ // get the metadata for the acl policy bean.
+ String aclPolicyName = this.policyName + "$ACLPolicy";
+ result.addAll(this.aclMetaData.getBeans(aclPolicyName, ACLPolicyBean.class.getName()));
+
+ // inject the authorization policy into the application policy.
+ ValueMetaData injectACLPolicy = policyBuilder.createInject(aclPolicyName);
+ policyBuilder.addPropertyMetaData("aclPolicy", injectACLPolicy);
+ }
+
// role-mappoing metadata.
if (this.mappingMetaData != null)
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuditMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuditMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuditMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthenticationMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthenticationMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthenticationMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthorizationMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthorizationMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/AuthorizationMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BaseModuleMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BaseModuleMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BaseModuleMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BasePolicyMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BasePolicyMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/BasePolicyMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -108,7 +108,7 @@
/**
* <p>
* This method allows subclasses to add policy-specific metadata to the collection of {@code BeanMetaData} that is
- * being constructed by the {@code getBeans(String, String)} method.
+ * constructed by the {@code getBeans(String, String)} method.
* </p>
*
* @param policyName the name of the policy bean to be created.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/FlaggedModuleMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/FlaggedModuleMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/FlaggedModuleMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/IdentityTrustMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/IdentityTrustMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/IdentityTrustMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/JASPIAuthenticationMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/JASPIAuthenticationMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/JASPIAuthenticationMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/LoginModuleStackMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/LoginModuleStackMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/LoginModuleStackMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ModuleOptionMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ModuleOptionMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/ModuleOptionMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/RoleMappingMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/RoleMappingMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/RoleMappingMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/SecurityPolicyMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/SecurityPolicyMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/SecurityPolicyMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/StackRefModuleMetaData.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/StackRefModuleMetaData.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/metadata/StackRefModuleMetaData.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/resources/schema/security-beans_1_0.xsd
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/resources/schema/security-beans_1_0.xsd 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/resources/schema/security-beans_1_0.xsd 2008-07-06 14:53:02 UTC (rev 75414)
@@ -38,6 +38,7 @@
<xsd:element ref="authentication-jaspi"/>
</xsd:choice>
<xsd:element ref="authorization" minOccurs="0"/>
+ <xsd:element ref="acl" minOccurs="0"/>
<xsd:element ref="rolemapping" minOccurs="0"/>
<xsd:element ref="audit" minOccurs="0"/>
<xsd:element ref="identity-trust" minOccurs="0"/>
@@ -85,6 +86,18 @@
</xsd:sequence>
</xsd:complexType>
+ <xsd:element name="acl" type="aclType"/>
+ <xsd:complexType name="aclType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[An ACL Policy Configuration]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="acl-module" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
<xsd:element name="rolemapping" type="roleMappingType"/>
<xsd:complexType name="roleMappingType">
<xsd:annotation>
@@ -226,6 +239,21 @@
</xsd:complexType>
</xsd:element>
+ <xsd:element name="acl-module">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[An ACL Module Configuration]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="module-option" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="code" type="xsd:string" use="required"/>
+ <xsd:attribute name="flag" type="module-option-flag" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+
<xsd:element name="mapping-module">
<xsd:complexType>
<xsd:annotation>
Added: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -0,0 +1,151 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.security.microcontainer.metadata;
+
+import org.jboss.security.auth.login.XMLLoginConfigImpl;
+import org.jboss.security.config.ApplicationPolicy;
+import org.jboss.security.microcontainer.beans.ACLPolicyBean;
+import org.jboss.security.microcontainer.beans.ApplicationPolicyBean;
+
+/**
+ * <p>
+ * Extends the {@code BasicApplicationPolicyTestCase} to test the configuration of acl (instance-based authorization)
+ * policies along with the basic authentication policies.
+ * </p>
+ * <p>
+ * The first scenario tests the configuration of an acl policy toghether with an authentication policy:
+ *
+ * <pre>
+ * <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy1">
+ * <authentication>
+ * <login-module code="org.jboss.security.auth.AuthModule1" flag="required">
+ * <module-option name="authOption1">value1</module-option>
+ * <module-option name="authOption2">value2</module-option>
+ * </login-module>
+ * <login-module code="org.jboss.security.auth.AuthModule2" flag="optional">
+ * <module-option name="authOption3">value3</module-option>
+ * <module-option name="authOption4">value4</module-option>
+ * </login-module>
+ * </authentication>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.AuthorizationModule1" flag="required">
+ * <module-option name="aclOption1">value1</module-option>
+ * <module-option name="aclOption2">value2</module-option>
+ * </acl-module>
+ * <acl-module code="org.jboss.security.authz.AuthorizationModule2" flag="required">
+ * <module-option name="aclOption3">value3</module-option>
+ * <module-option name="aclOption4">value4</module-option>
+ * </acl-module>
+ * </acl>
+ * </application-policy>
+ * </pre>
+ *
+ * while the second scenario tests the configuration of the acl policy toghether with an authentication-jaspi policy:
+ *
+ * <pre>
+ * <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy2">
+ * <authentication-jaspi>
+ * <login-module-stack name="ModuleStack1">
+ * <login-module code="org.jboss.security.auth.AuthModule3" flag="required">
+ * <module-option name="authOption5">value5</module-option>
+ * </login-module>
+ * <login-module code="org.jboss.security.auth.AuthModule4" flag="optional"/>
+ * </login-module-stack>
+ * <login-module-stack name="ModuleStack2">
+ * <login-module code="org.jboss.security.auth.AuthModule5" flag="required">
+ * <module-option name="authOption6">value6</module-option>
+ * <module-option name="authOption7">value7</module-option>
+ * </login-module>
+ * </login-module-stack>
+ * <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ * <module-option name="authOption1">value1</module-option>
+ * <module-option name="authOption2">value2</module-option>
+ * </auth-module>
+ * </authentication-jaspi>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.AuthorizationModule1" flag="required">
+ * <module-option name="aclOption1">value1</module-option>
+ * <module-option name="aclOption2">value2</module-option>
+ * </acl-module>
+ * <acl-module code="org.jboss.security.authz.AuthorizationModule2" flag="required">
+ * <module-option name="aclOption3">value3</module-option>
+ * <module-option name="aclOption4">value4</module-option>
+ * </acl-module>
+ * </acl>
+ * </application-policy>
+ *
+ * </pre>
+ *
+ * </p>
+ *
+ * @author <a href="mailto:sguilhen at redhat.com">Stefan Guilhen</a>
+ */
+public class ACLPolicyTestCase extends BasicApplicationPolicyTestCase
+{
+
+ /**
+ * <p>
+ * Creates an instance of {@code ACLPolicyTestCase} with the specified name.
+ * </p>
+ *
+ * @param name a {@code String} representing the name of this test case.
+ */
+ public ACLPolicyTestCase(String name)
+ {
+ super(name);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.test.security.microcontainer.metadata.BasicApplicationPolicyTestCase#testApplicationPoliciesCreation()
+ */
+ @Override
+ public void testApplicationPoliciesCreation() throws Exception
+ {
+ super.testApplicationPoliciesCreation();
+
+ // validate the acl-policy beans have been properly created.
+ ApplicationPolicyBean policyBean1 = (ApplicationPolicyBean) super.getBean("TestPolicy1");
+ assertNotNull("Unexpected null acl policy found", policyBean1.getAclPolicy());
+
+ ApplicationPolicyBean policyBean2 = (ApplicationPolicyBean) super.getBean("TestPolicy2");
+ assertNotNull("Unexpected null acl policy found", policyBean2.getAclPolicy());
+
+ ACLPolicyBean aclBean = (ACLPolicyBean) super.getBean("TestPolicy1$ACLPolicy");
+ // assert the bean retrieved from the microcontainer is the same that has been injected into the app policy.
+ assertEquals(policyBean1.getAclPolicy(), aclBean);
+ BeanValidator.validateACLBean(aclBean);
+
+ aclBean = (ACLPolicyBean) super.getBean("TestPolicy2$ACLPolicy");
+ assertEquals(policyBean2.getAclPolicy(), aclBean);
+ BeanValidator.validateACLBean(aclBean);
+
+ // verify the contents of the acl policies.
+ ApplicationPolicy policy = XMLLoginConfigImpl.getInstance().getApplicationPolicy("TestPolicy1");
+ PolicyValidator.validateACLPolicy("TestPolicy1", policy.getAclInfo());
+
+ policy = XMLLoginConfigImpl.getInstance().getApplicationPolicy("TestPolicy2");
+ PolicyValidator.validateACLPolicy("TestPolicy2", policy.getAclInfo());
+
+ }
+}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,6 +21,7 @@
*/
package org.jboss.test.security.microcontainer.metadata;
+import org.jboss.security.auth.login.AuthenticationInfo;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.config.ApplicationPolicy;
import org.jboss.security.config.RoleMappingInfo;
@@ -48,6 +49,12 @@
* <module-option name="authzOption2">value2</module-option>
* </policy-module>
* </authorization>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.ACLModule1" flag="required">
+ * <module-option name="aclOption1">value1</module-option>
+ * <module-option name="aclOption2">value2</module-option>
+ * </acl-module>
+ * </acl>
* <rolemapping>
* <mapping-module code="org.jboss.security.mapping.RoleMappingModule1">
* <module-option name="mappingOption1">value1</module-option>
@@ -78,6 +85,12 @@
* <module-option name="authzOption4">value4</module-option>
* </policy-module>
* </authorization>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.ACLModule2" flag="required">
+ * <module-option name="aclOption3">value3</module-option>
+ * <module-option name="aclOption4">value4</module-option>
+ * </acl-module>
+ * </acl>
* <audit>
* <provider-module code="org.jboss.security.audit.AuditModule2">
* <module-option name="auditOption2">value2</module-option>
@@ -139,11 +152,12 @@
ApplicationPolicy policy = XMLLoginConfigImpl.getInstance().getApplicationPolicy("TestPolicy2");
assertNotNull("Application policy not found", policy);
- // TODO: fix the authentication info merge method to return the specific authentication type.
- // PolicyValidator.validateAuthenticationPolicy((AuthenticationInfo) policy.getAuthenticationInfo());
-
+ // validate the constructed authentication policy.
+ PolicyValidator.validateAuthenticationPolicy("TestPolicy2", (AuthenticationInfo) policy.getAuthenticationInfo());
// validate the constructed authorization policy.
PolicyValidator.validateAuthorizationPolicy("TestPolicy2", policy.getAuthorizationInfo());
+ // validate the constructed acl policy.
+ PolicyValidator.validateACLPolicy("TestPolicy2", policy.getAclInfo());
// validate the constructed role-mapping policy, whose configuration comes exclusively from the parent policy.
PolicyValidator.validateRoleMappingPolicy("TestPolicy1", (RoleMappingInfo) policy.getRoleMappingInfo());
// validate the constructed audit policy.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyTestSuite.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyTestSuite.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyTestSuite.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -45,6 +45,7 @@
TestSuite suite = new TestSuite("Application policy tests");
suite.addTestSuite(BasicApplicationPolicyTestCase.class);
suite.addTestSuite(AuthorizationPolicyTestCase.class);
+ suite.addTestSuite(ACLPolicyTestCase.class);
suite.addTestSuite(RoleMappingPolicyTestCase.class);
suite.addTestSuite(AuditPolicyTestCase.class);
suite.addTestSuite(IdentityTrustPolicyTestCase.class);
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -125,7 +125,7 @@
assertNotNull("Unexpected null audit policy found", policyBean1.getAuditPolicy());
ApplicationPolicyBean policyBean2 = (ApplicationPolicyBean) super.getBean("TestPolicy2");
- assertNotNull("Unexpected null audit policy found", policyBean1.getAuditPolicy());
+ assertNotNull("Unexpected null audit policy found", policyBean2.getAuditPolicy());
AuditPolicyBean auditBean = (AuditPolicyBean) super.getBean("TestPolicy1$AuditPolicy");
// assert the bean retrieved from the microcontainer is the same that has been injected into the app policy.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -130,7 +130,7 @@
assertNotNull("Unexpected null authorization policy found", policyBean1.getAuthorizationPolicy());
ApplicationPolicyBean policyBean2 = (ApplicationPolicyBean) super.getBean("TestPolicy2");
- assertNotNull("Unexpected null authorization policy found", policyBean1.getAuthorizationPolicy());
+ assertNotNull("Unexpected null authorization policy found", policyBean2.getAuthorizationPolicy());
AuthorizationPolicyBean authzBean = (AuthorizationPolicyBean) super.getBean("TestPolicy1$AuthorizationPolicy");
// assert the bean retrieved from the microcontainer is the same that has been injected into the app policy.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -149,11 +149,12 @@
ApplicationPolicy policy1 = XMLLoginConfigImpl.getInstance().getApplicationPolicy("TestPolicy1");
assertNotNull("Application policy TestPolicy1 not found", policy1);
assertEquals("TestPolicy1", policy1.getName());
- PolicyValidator.validateAuthenticationPolicy((AuthenticationInfo) policy1.getAuthenticationInfo());
+ PolicyValidator.validateAuthenticationPolicy("TestPolicy1", (AuthenticationInfo) policy1.getAuthenticationInfo());
ApplicationPolicy policy2 = XMLLoginConfigImpl.getInstance().getApplicationPolicy("TestPolicy2");
assertNotNull("Application policy TestPolicy2 not found", policy2);
assertEquals("TestPolicy2", policy2.getName());
- PolicyValidator.validateJaspiAuthenticationPolicy((JASPIAuthenticationInfo) policy2.getAuthenticationInfo());
+ PolicyValidator.validateJaspiAuthenticationPolicy("TestPolicy2", (JASPIAuthenticationInfo) policy2
+ .getAuthenticationInfo());
}
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -26,6 +26,7 @@
import junit.framework.Assert;
+import org.jboss.security.microcontainer.beans.ACLPolicyBean;
import org.jboss.security.microcontainer.beans.AuditPolicyBean;
import org.jboss.security.microcontainer.beans.AuthenticationPolicyBean;
import org.jboss.security.microcontainer.beans.AuthorizationPolicyBean;
@@ -245,6 +246,59 @@
/**
* <p>
+ * Validates the contents of an {@code ACLPolicyBean} generated by the metadata factory from an acl configuration
+ * like the following:
+ *
+ * <pre>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.ACLModule1" flag="required">
+ * <module-option name="aclOption1">value1</module-option>
+ * <module-option name="aclOption2">value2</module-option>
+ * </acl-module>
+ * <acl-module code="org.jboss.security.authz.ACLModule2" flag="required">
+ * <module-option name="aclOption3">value3</module-option>
+ * <module-option name="aclOption4">value4</module-option>
+ * </acl-module>
+ * </acl>
+ * </pre>
+ *
+ * </p>
+ *
+ * @param bean the {@code ACLPolicyBean} instance being validated.
+ * @throws Exception if an error occurs while running the validation tests.
+ */
+ public static void validateACLBean(ACLPolicyBean bean) throws Exception
+ {
+ Assert.assertNotNull("Invalid null bean", bean);
+
+ // check the acl-modules that have been specified in the acl configuration.
+ List<FlaggedPolicyModule> modules = bean.getModules();
+ Assert.assertNotNull("Invalid null list of modules found", modules);
+ Assert.assertEquals("Invalid number of modules", 2, modules.size());
+
+ // first module should be the org.jboss.security.authz.ACLModule1.
+ Assert.assertEquals("org.jboss.security.authz.ACLModule1", modules.get(0).getCode());
+ Assert.assertEquals("required", modules.get(0).getFlag());
+ Map<String, ?> options = modules.get(0).getOptions();
+ Assert.assertNotNull("Unexpected null options map", options);
+ Assert.assertTrue("Option aclOption1 was not found", options.containsKey("aclOption1"));
+ Assert.assertEquals("value1", options.get("aclOption1"));
+ Assert.assertTrue("Option aclOption2 was not found", options.containsKey("aclOption2"));
+ Assert.assertEquals("value2", options.get("aclOption2"));
+
+ // second module should be the org.jboss.security.authz.ACLModule2.
+ Assert.assertEquals("org.jboss.security.authz.ACLModule2", modules.get(1).getCode());
+ Assert.assertEquals("required", modules.get(1).getFlag());
+ options = modules.get(1).getOptions();
+ Assert.assertNotNull("Unexpected null options map", options);
+ Assert.assertTrue("Option aclOption3 was not found", options.containsKey("aclOption3"));
+ Assert.assertEquals("value3", options.get("aclOption3"));
+ Assert.assertTrue("Option aclOption4 was not found", options.containsKey("aclOption4"));
+ Assert.assertEquals("value4", options.get("aclOption4"));
+ }
+
+ /**
+ * <p>
* Validates the contents of a {@code RoleMappingPolicyBean} generated by the metadata factory from a role-mapping
* configuration like the following:
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -122,7 +122,7 @@
assertNotNull("Unexpected null identity-trust policy found", policyBean1.getIdentityTrustPolicy());
ApplicationPolicyBean policyBean2 = (ApplicationPolicyBean) super.getBean("TestPolicy2");
- assertNotNull("Unexpected null identity-trust policy found", policyBean1.getIdentityTrustPolicy());
+ assertNotNull("Unexpected null identity-trust policy found", policyBean2.getIdentityTrustPolicy());
IdentityTrustPolicyBean trustBean = (IdentityTrustPolicyBean) super.getBean("TestPolicy1$IdentityTrustPolicy");
// assert the bean retrieved from the microcontainer is the same that has been injected into the app policy.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/InvalidApplicationPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/InvalidApplicationPolicyTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/InvalidApplicationPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ManagersInjectionTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ManagersInjectionTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ManagersInjectionTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -28,12 +28,14 @@
import junit.framework.Assert;
+import org.jboss.security.acl.config.ACLProviderEntry;
import org.jboss.security.audit.config.AuditProviderEntry;
import org.jboss.security.auth.container.config.AuthModuleEntry;
import org.jboss.security.auth.login.AuthenticationInfo;
import org.jboss.security.auth.login.JASPIAuthenticationInfo;
import org.jboss.security.auth.login.LoginModuleStackHolder;
import org.jboss.security.authorization.config.AuthorizationModuleEntry;
+import org.jboss.security.config.ACLInfo;
import org.jboss.security.config.AuditInfo;
import org.jboss.security.config.AuthorizationInfo;
import org.jboss.security.config.IdentityTrustInfo;
@@ -72,14 +74,15 @@
*
* </p>
*
+ * @param appPolicyName the name of the application-policy that specifies the authentication configuration.
* @param authInfo the {@code AuthenticationInfo} instance being validated.
* @throws Exception if an error occurs while running the validation tests.
*/
- public static void validateAuthenticationPolicy(AuthenticationInfo authInfo) throws Exception
+ public static void validateAuthenticationPolicy(String appPolicyName, AuthenticationInfo authInfo) throws Exception
{
Assert.assertNotNull("Authentication policy not found", authInfo);
- Assert.assertEquals("Authentication policy has unexpected name", "TestPolicy1", authInfo.getName());
+ Assert.assertEquals("Authentication policy has unexpected name", appPolicyName, authInfo.getName());
AppConfigurationEntry[] entries = authInfo.getAppConfigurationEntry();
Assert.assertNotNull("Invalid AppConfigurationEntry array", entries);
@@ -134,14 +137,16 @@
*
* </p>
*
+ * @param appPolicyName the name of the application-policy that specifies the authentication-jaspi configuration.
* @param authInfo the {@code JASPIAuthenticationInfo} instance being validated.
* @throws Exception if an error occurs while running the validation tests.
*/
- public static void validateJaspiAuthenticationPolicy(JASPIAuthenticationInfo authInfo) throws Exception
+ public static void validateJaspiAuthenticationPolicy(String appPolicyName, JASPIAuthenticationInfo authInfo)
+ throws Exception
{
// validate the contents of the authentication policy defined.
Assert.assertNotNull("Authentication policy not found", authInfo);
- Assert.assertEquals("Authentication policy has unexpected name", "TestPolicy2", authInfo.getName());
+ Assert.assertEquals("Authentication policy has unexpected name", appPolicyName, authInfo.getName());
// validate the login-modules stacks defined by the authentication-jaspi configuration.
LoginModuleStackHolder[] stacks = authInfo.getLoginModuleStackHolder();
@@ -251,6 +256,60 @@
/**
* <p>
+ * Validates the contents of an {@code ACLInfo} object that has been generated by the {@code ACLPolicyBean} that
+ * corresponds to the following acl configuration:
+ *
+ * <pre>
+ * <acl>
+ * <acl-module code="org.jboss.security.authz.AuthorizationModule1" flag="required">
+ * <module-option name="aclOption1">value1</module-option>
+ * <module-option name="aclOption2">value2</module-option>
+ * </acl-module>
+ * <acl-module code="org.jboss.security.authz.AuthorizationModule2" flag="required">
+ * <module-option name="aclOption3">value3</module-option>
+ * <module-option name="aclOption4">value4</module-option>
+ * </acl-module>
+ * </acl>
+ * </pre>
+ *
+ * </p>
+ *
+ * @param appPolicyName the name of the application-policy that specifies the acl configuration.
+ * @param aclInfo the {@code ACLInfo} instance being validated.
+ * @throws Exception if an error occurs while running the validation tests.
+ */
+ public static void validateACLPolicy(String appPolicyName, ACLInfo aclInfo) throws Exception
+ {
+ Assert.assertNotNull("ACL policy not found", aclInfo);
+ Assert.assertEquals("ACL policy has unexpected name", appPolicyName, aclInfo.getName());
+
+ ACLProviderEntry[] entries = aclInfo.getACLProviderEntry();
+ Assert.assertNotNull("Invalid null ACLProviderEntry array", entries);
+ Assert.assertEquals("Unexpected number of acl entries", 2, entries.length);
+
+ // first entry should be the org.jboss.security.authz.ACLModule1.
+ Assert.assertEquals("org.jboss.security.authz.ACLModule1", entries[0].getAclProviderName());
+ Assert.assertEquals("required", entries[0].getControlFlag().toString());
+ Map<String, ?> options = entries[0].getOptions();
+ Assert.assertNotNull("Unexpected null options map", options);
+ Assert.assertTrue("Option aclOption1 was not found", options.containsKey("aclOption1"));
+ Assert.assertEquals("value1", options.get("aclOption1"));
+ Assert.assertTrue("Option aclOption2 was not found", options.containsKey("aclOption2"));
+ Assert.assertEquals("value2", options.get("aclOption2"));
+
+ // second entry should be the org.jboss.security.authz.ACLModule2.
+ Assert.assertEquals("org.jboss.security.authz.ACLModule2", entries[1].getAclProviderName());
+ Assert.assertEquals("required", entries[1].getControlFlag().toString());
+ options = entries[1].getOptions();
+ Assert.assertNotNull("Unexpected null options map", options);
+ Assert.assertTrue("Option aclOption3 was not found", options.containsKey("aclOption3"));
+ Assert.assertEquals("value3", options.get("aclOption3"));
+ Assert.assertTrue("Option aclOption4 was not found", options.containsKey("aclOption4"));
+ Assert.assertEquals("value4", options.get("aclOption4"));
+ }
+
+ /**
+ * <p>
* Validates the contents of a {@code RoleMappingInfo} object that has been generated by the
* {@code RoleMappingPolicyBean} that corresponds to the following rolemapping configuration:
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -131,7 +131,7 @@
assertNotNull("Unexpected null role-mapping policy found", policyBean1.getRoleMappingPolicy());
ApplicationPolicyBean policyBean2 = (ApplicationPolicyBean) super.getBean("TestPolicy2");
- assertNotNull("Unexpected null role-mapping policy found", policyBean1.getRoleMappingPolicy());
+ assertNotNull("Unexpected null role-mapping policy found", policyBean2.getRoleMappingPolicy());
RoleMappingPolicyBean mappingBean = (RoleMappingPolicyBean) super.getBean("TestPolicy1$RoleMappingPolicy");
// assert the bean retrieved from the microcontainer is the same that has been injected into the app policy.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuditManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuditManager.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuditManager.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthenticationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthenticationManager.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthenticationManager.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -58,6 +58,7 @@
*
* @see org.jboss.security.AuthenticationManager#getActiveSubject()
*/
+ @Deprecated
public Subject getActiveSubject()
{
return null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthorizationManager.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockAuthorizationManager.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -73,7 +73,8 @@
/*
* (non-Javadoc)
*
- * @see org.jboss.security.AuthorizationManager#authorize(org.jboss.security.authorization.Resource, javax.security.auth.Subject)
+ * @see org.jboss.security.AuthorizationManager#authorize(org.jboss.security.authorization.Resource,
+ * javax.security.auth.Subject)
*/
public int authorize(Resource resource, javax.security.auth.Subject subject) throws AuthorizationException
{
@@ -150,6 +151,7 @@
*
* @see org.jboss.security.AuthorizationManager#getUserRoles(java.security.Principal)
*/
+ @Deprecated
public Set<Principal> getUserRoles(Principal principal)
{
return null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockIdentityTrustManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockIdentityTrustManager.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockIdentityTrustManager.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockMappingManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockMappingManager.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockMappingManager.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityDomain.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityDomain.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityDomain.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityManagement.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityManagement.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/MockSecurityManagement.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/TestBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/TestBean.java 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/support/TestBean.java 2008-07-06 14:53:02 UTC (rev 75414)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
Added: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml (rev 0)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml 2008-07-06 14:53:02 UTC (rev 75414)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- the security management bean -->
+ <bean name="JNDIBasedSecurityManagement"
+ class="org.jboss.test.security.microcontainer.metadata.support.MockSecurityManagement"/>
+
+ <!-- an application policy that specifies authentication and acl configurations -->
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy1">
+ <authentication>
+ <login-module code="org.jboss.security.auth.AuthModule1" flag="required">
+ <module-option name="authOption1">value1</module-option>
+ <module-option name="authOption2">value2</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.AuthModule2" flag="optional">
+ <module-option name="authOption3">value3</module-option>
+ <module-option name="authOption4">value4</module-option>
+ </login-module>
+ </authentication>
+ <acl>
+ <acl-module code="org.jboss.security.authz.ACLModule1" flag="required">
+ <module-option name="aclOption1">value1</module-option>
+ <module-option name="aclOption2">value2</module-option>
+ </acl-module>
+ <acl-module code="org.jboss.security.authz.ACLModule2" flag="required">
+ <module-option name="aclOption3">value3</module-option>
+ <module-option name="aclOption4">value4</module-option>
+ </acl-module>
+ </acl>
+ </application-policy>
+
+ <!-- an application policy that specifies authentication-jaspi and acl configurations -->
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy2">
+ <authentication-jaspi>
+ <login-module-stack name="ModuleStack1">
+ <login-module code="org.jboss.security.auth.AuthModule3" flag="required">
+ <module-option name="authOption5">value5</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.AuthModule4" flag="optional"/>
+ </login-module-stack>
+ <login-module-stack name="ModuleStack2">
+ <login-module code="org.jboss.security.auth.AuthModule5" flag="required">
+ <module-option name="authOption6">value6</module-option>
+ <module-option name="authOption7">value7</module-option>
+ </login-module>
+ </login-module-stack>
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <module-option name="authOption1">value1</module-option>
+ <module-option name="authOption2">value2</module-option>
+ </auth-module>
+ </authentication-jaspi>
+ <acl>
+ <acl-module code="org.jboss.security.authz.ACLModule1" flag="required">
+ <module-option name="aclOption1">value1</module-option>
+ <module-option name="aclOption2">value2</module-option>
+ </acl-module>
+ <acl-module code="org.jboss.security.authz.ACLModule2" flag="required">
+ <module-option name="aclOption3">value3</module-option>
+ <module-option name="aclOption4">value4</module-option>
+ </acl-module>
+ </acl>
+ </application-policy>
+
+</deployment>
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml 2008-07-06 14:47:34 UTC (rev 75413)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml 2008-07-06 14:53:02 UTC (rev 75414)
@@ -20,6 +20,12 @@
<module-option name="authzOption2">value2</module-option>
</policy-module>
</authorization>
+ <acl>
+ <acl-module code="org.jboss.security.authz.ACLModule1" flag="required">
+ <module-option name="aclOption1">value1</module-option>
+ <module-option name="aclOption2">value2</module-option>
+ </acl-module>
+ </acl>
<rolemapping>
<mapping-module code="org.jboss.security.mapping.RoleMappingModule1">
<module-option name="mappingOption1">value1</module-option>
@@ -51,6 +57,12 @@
<module-option name="authzOption4">value4</module-option>
</policy-module>
</authorization>
+ <acl>
+ <acl-module code="org.jboss.security.authz.ACLModule2" flag="required">
+ <module-option name="aclOption3">value3</module-option>
+ <module-option name="aclOption4">value4</module-option>
+ </acl-module>
+ </acl>
<audit>
<provider-module code="org.jboss.security.audit.AuditModule2">
<module-option name="auditOption2">value2</module-option>
More information about the jboss-cvs-commits
mailing list