[jboss-cvs] JBossAS SVN: r68564 - in projects/security/security-spi/trunk: acl/src/main/org/jboss/security/acl and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Dec 26 12:28:58 EST 2007


Author: sguilhen at redhat.com
Date: 2007-12-26 12:28:58 -0500 (Wed, 26 Dec 2007)
New Revision: 68564

Modified:
   projects/security/security-spi/trunk/.classpath
   projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACL.java
   projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLEntry.java
   projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLPermission.java
   projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLProvider.java
   projects/security/security-spi/trunk/assembly/bin.xml
   projects/security/security-spi/trunk/assembly/sources.xml
Log:
SECURITY-89: Updated some SPI interfaces, adding auxiliary methods and correcting comments. Also included the acl module to assembly/source.xml and assembly/bin.xml so that it is added to the SPI aggregator.



Modified: projects/security/security-spi/trunk/.classpath
===================================================================
--- projects/security/security-spi/trunk/.classpath	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/.classpath	2007-12-26 17:28:58 UTC (rev 68564)
@@ -9,5 +9,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0-BETA1/jboss-jaspi-api-1.0-BETA1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2-SNAPSHOT/authorization-spi-2.0.2-SNAPSHOT.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2-SNAPSHOT/identity-impl-2.0.2-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/eclipse-classes"/>
 </classpath>

Modified: projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACL.java
===================================================================
--- projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACL.java	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACL.java	2007-12-26 17:28:58 UTC (rev 68564)
@@ -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.acl;
 
 import java.util.Collection;
@@ -89,7 +89,7 @@
     * Verify if the given permission is assigned to the specified <code>Identity</code>.
     * </p>
     * 
-    * @param permission the <code>Permission</code> to be checked for.
+    * @param permission the <code>ACLPermission</code> to be checked for.
     * @param identity   the <code>Identity</code> being verified.
     * @return   <code>true</code> if the specified permission is assigned to the identity;
     * <code>false</code> otherwise.

Modified: projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLEntry.java
===================================================================
--- projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLEntry.java	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLEntry.java	2007-12-26 17:28:58 UTC (rev 68564)
@@ -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.acl;
 
 import org.jboss.security.identity.Identity;
@@ -51,4 +51,15 @@
     * @return a reference to the <code>Permission</code> contained in this entry.
     */
    public ACLPermission getPermission();
+
+   /**
+    * <p>
+    * Checks if the specified permission is part of the this entry's permission.
+    * </p>
+    * 
+    * @param permission the <code>ACLPermission</code> to be checked for.
+    * @return <code>true</code> if the permission is part of this entry's permission; 
+    * <code>false</code> otherwise.
+    */
+   public boolean checkPermission(ACLPermission permission);
 }

Modified: projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLPermission.java
===================================================================
--- projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLPermission.java	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLPermission.java	2007-12-26 17:28:58 UTC (rev 68564)
@@ -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.acl;
 
 /**

Modified: projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLProvider.java
===================================================================
--- projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLProvider.java	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/acl/src/main/org/jboss/security/acl/ACLProvider.java	2007-12-26 17:28:58 UTC (rev 68564)
@@ -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.acl;
 
 import org.jboss.security.authorization.Resource;
@@ -62,7 +62,7 @@
     * </p>
     * 
     * @param acl the <code>ACL</code> that needs to be updated.
-    * @return   <code>true</code> if the ACL was update; <code>false</code> otherwise.
+    * @return   <code>true</code> if the ACL was updated; <code>false</code> otherwise.
     */
    public boolean updateACL(ACL acl);
 
@@ -75,4 +75,15 @@
     * @return   <code>true</code> if the ACL was removed; <code>false</code> otherwise.
     */
    public boolean removeACL(ACL acl);
+
+   /**
+    * <p>
+    * Removes the ACL associated with the specified resource.
+    * </p>
+    * 
+    * @param resource    the <code>Resource</code> whose associated ACL is to be removed.
+    * @return   <code>true</code> if the ACL was removed; <code>false</code> otherwise.
+    */
+   public boolean removeACL(Resource resource);
+
 }

Modified: projects/security/security-spi/trunk/assembly/bin.xml
===================================================================
--- projects/security/security-spi/trunk/assembly/bin.xml	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/assembly/bin.xml	2007-12-26 17:28:58 UTC (rev 68564)
@@ -5,6 +5,10 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
+      <directory>${basedir}/acl/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>${basedir}/identity/target/classes</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>

Modified: projects/security/security-spi/trunk/assembly/sources.xml
===================================================================
--- projects/security/security-spi/trunk/assembly/sources.xml	2007-12-26 17:21:33 UTC (rev 68563)
+++ projects/security/security-spi/trunk/assembly/sources.xml	2007-12-26 17:28:58 UTC (rev 68564)
@@ -6,6 +6,10 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
+      <directory>${basedir}/acl/src/main</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>${basedir}/identity/src/main</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>




More information about the jboss-cvs-commits mailing list