[jboss-cvs] JBossAS SVN: r75513 - in projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src: test/java/org/jboss/test/security/microcontainer/metadata and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 8 19:52:39 EDT 2008
Author: sguilhen at redhat.com
Date: 2008-07-08 19:52:39 -0400 (Tue, 08 Jul 2008)
New Revision: 75513
Added:
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/Util.java
Modified:
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/AuthorizationPolicyBean.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/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java
Log:
Added an utility class that converts strings to ControlFlag objects.
Modified: 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 2008-07-08 23:17:37 UTC (rev 75512)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/ACLPolicyBean.java 2008-07-08 23:52:39 UTC (rev 75513)
@@ -23,7 +23,6 @@
import org.jboss.security.acl.config.ACLProviderEntry;
import org.jboss.security.config.ACLInfo;
-import org.jboss.security.config.ControlFlag;
/**
* <p>
@@ -47,7 +46,7 @@
for (FlaggedPolicyModule module : super.modules)
{
ACLProviderEntry entry = new ACLProviderEntry(module.getCode(), module.getOptions());
- entry.setControlFlag(new ControlFlag(module.getFlag()));
+ entry.setControlFlag(Util.getControlFlag(module.getFlag()));
info.add(entry);
}
return info;
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-08 23:17:37 UTC (rev 75512)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/AuthorizationPolicyBean.java 2008-07-08 23:52:39 UTC (rev 75513)
@@ -23,7 +23,6 @@
import org.jboss.security.authorization.config.AuthorizationModuleEntry;
import org.jboss.security.config.AuthorizationInfo;
-import org.jboss.security.config.ControlFlag;
/**
* <p>
@@ -47,7 +46,7 @@
for (FlaggedPolicyModule module : this.modules)
{
AuthorizationModuleEntry entry = new AuthorizationModuleEntry(module.getCode(), module.getOptions());
- entry.setControlFlag(new ControlFlag(module.getFlag()));
+ entry.setControlFlag(Util.getControlFlag(module.getFlag()));
info.add(entry);
}
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-08 23:17:37 UTC (rev 75512)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/IdentityTrustPolicyBean.java 2008-07-08 23:52:39 UTC (rev 75513)
@@ -21,7 +21,6 @@
*/
package org.jboss.security.microcontainer.beans;
-import org.jboss.security.config.ControlFlag;
import org.jboss.security.config.IdentityTrustInfo;
import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
@@ -47,7 +46,7 @@
for (FlaggedPolicyModule module : this.modules)
{
IdentityTrustModuleEntry entry = new IdentityTrustModuleEntry(module.getCode(), module.getOptions());
- entry.setControlFlag(new ControlFlag(module.getFlag()));
+ entry.setControlFlag(Util.getControlFlag(module.getFlag()));
info.add(entry);
}
return info;
Added: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/Util.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/Util.java (rev 0)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/Util.java 2008-07-08 23:52:39 UTC (rev 75513)
@@ -0,0 +1,59 @@
+/*
+ * 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.config.ControlFlag;
+
+/**
+ * <p>
+ * Utility class used by the policies beans.
+ * </p>
+ *
+ * @author <a href="mailto:sguilhen at redhat.com">Stefan Guilhen</a>
+ */
+public class Util
+{
+
+ /**
+ * <p>
+ * Converts the specified flag to one of the existing {@code ControlFlag} objects.
+ * </p>
+ *
+ * @param flag a {@code String} containing the name of the control flag.
+ * @return the constructed {@code ControlFlag} object.
+ * @throws IllegalArgumentException if the specified flag does not correspond to any {@code ControlFlag}.
+ */
+ public static ControlFlag getControlFlag(String flag)
+ {
+ flag = flag.toUpperCase();
+ if ("REQUIRED".equals(flag))
+ return ControlFlag.REQUIRED;
+ else if ("REQUISITE".equals(flag))
+ return ControlFlag.REQUISITE;
+ else if ("OPTIONAL".equals(flag))
+ return ControlFlag.OPTIONAL;
+ else if ("SUFFICIENT".equals(flag))
+ return ControlFlag.SUFFICIENT;
+ else
+ throw new IllegalArgumentException("Invalid control flag: " + flag);
+ }
+}
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-08 23:17:37 UTC (rev 75512)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java 2008-07-08 23:52:39 UTC (rev 75513)
@@ -250,7 +250,7 @@
// first entry should be the org.jboss.security.authz.AuthorizationModule1.
Assert.assertEquals("org.jboss.security.authz.AuthorizationModule1", entries[0].getPolicyModuleName());
- Assert.assertEquals("required", entries[0].getControlFlag().toString());
+ Assert.assertEquals("REQUIRED", entries[0].getControlFlag().toString());
Map<String, ?> options = entries[0].getOptions();
Assert.assertNotNull("Unexpected null options map", options);
Assert.assertTrue("Option authzOption1 was not found", options.containsKey("authzOption1"));
@@ -260,7 +260,7 @@
// second entry should be the org.jboss.security.authz.AuthorizationModule2.
Assert.assertEquals("org.jboss.security.authz.AuthorizationModule2", entries[1].getPolicyModuleName());
- Assert.assertEquals("required", entries[1].getControlFlag().toString());
+ Assert.assertEquals("REQUIRED", entries[1].getControlFlag().toString());
options = entries[1].getOptions();
Assert.assertNotNull("Unexpected null options map", options);
Assert.assertTrue("Option authzOption3 was not found", options.containsKey("authzOption3"));
@@ -304,7 +304,7 @@
// 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());
+ 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"));
@@ -314,7 +314,7 @@
// 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());
+ 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"));
@@ -452,6 +452,7 @@
// first entry should be the org.jboss.security.trust.IdentityTrustModule1.
Assert.assertEquals("org.jboss.security.trust.IdentityTrustModule1", entries[0].getName());
+ Assert.assertEquals("REQUIRED", entries[0].getControlFlag().toString());
Map<String, ?> options = entries[0].getOptions();
Assert.assertNotNull("Unexpected null options map", options);
Assert.assertTrue("Option trustOption1 was not found", options.containsKey("trustOption1"));
More information about the jboss-cvs-commits
mailing list