[jboss-cvs] JBossAS SVN: r66942 - in projects/security/security-jboss-sx/trunk/jbosssx: src/main/org/jboss/security/config and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 9 15:27:12 EST 2007
Author: anil.saldhana at jboss.com
Date: 2007-11-09 15:27:12 -0500 (Fri, 09 Nov 2007)
New Revision: 66942
Removed:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/config/ControlFlag.java
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/.classpath
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
Log:
move ControlFlag to SPI
Modified: projects/security/security-jboss-sx/trunk/jbosssx/.classpath
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/.classpath 2007-11-09 20:23:39 UTC (rev 66941)
+++ projects/security/security-jboss-sx/trunk/jbosssx/.classpath 2007-11-09 20:27:12 UTC (rev 66942)
@@ -3,13 +3,12 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/tests/resources"/>
<classpathentry kind="src" path="src/resources"/>
- <classpathentry excluding="resources/" kind="src" output="output/test-classes" path="src/tests"/>
+ <classpathentry excluding="resources/" 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/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/sun-xacml/sun-xacml/2.0/sun-xacml-2.0.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/org/jboss/security/authorization-spi/2.0.2-SNAPSHOT/authorization-spi-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/authorization-spi/2.0.2-SNAPSHOT/authorization-spi-2.0.2-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2-SNAPSHOT/jboss-security-spi-2.0.2-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2-SNAPSHOT/spi-2.0.2-SNAPSHOT-sources.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-jaspi-api/1.0-BETA1/jboss-jaspi-api-1.0-BETA1.jar"/>
Deleted: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/config/ControlFlag.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/config/ControlFlag.java 2007-11-09 20:23:39 UTC (rev 66941)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/config/ControlFlag.java 2007-11-09 20:27:12 UTC (rev 66942)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.config;
-
-//$Id$
-
-/**
- * Control Flag for module entries
- * @author Anil.Saldhana at redhat.com
- * @since Aug 2, 2007
- * @version $Revision$
- */
-public class ControlFlag
-{
- private String flag;
- public static final ControlFlag REQUIRED = new ControlFlag("REQUIRED");
- public static final ControlFlag REQUISITE = new ControlFlag("REQUISITE");
- public static final ControlFlag SUFFICIENT = new ControlFlag("SUFFICIENT");
- public static final ControlFlag OPTIONAL = new ControlFlag("OPTIONAL");
-
- public ControlFlag(String flag)
- {
- this.flag = flag;
- }
-
- /**
- * Returns the string represented
- * "required", "requisite" etc
- */
- public String toString()
- {
- return flag;
- }
-}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2007-11-09 20:23:39 UTC (rev 66941)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2007-11-09 20:27:12 UTC (rev 66942)
@@ -102,6 +102,7 @@
* @return AuthorizationContext.PERMIT or AuthorizationContext.DENY
* @throws AuthorizationException
*/
+ @SuppressWarnings("unchecked")
public int authorize(final Resource resource) throws AuthorizationException
{
try
@@ -263,7 +264,8 @@
}
}
- private AuthorizationModule instantiateModule(String name, Map map) throws PrivilegedActionException
+ private AuthorizationModule instantiateModule(String name, Map<String,Object> map)
+ throws PrivilegedActionException
{
AuthorizationModule am = null;
ClassLoader tcl = SecurityActions.getContextClassLoader();
@@ -333,4 +335,4 @@
}
return ai;
}
-}
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list