jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1042591 - in /jackrabbit/branches/2.2: ./ jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/
Date Mon, 06 Dec 2010 11:40:10 GMT
Author: jukka
Date: Mon Dec  6 11:40:10 2010
New Revision: 1042591

URL: http://svn.apache.org/viewvc?rev=1042591&view=rev
Log:
2.2: Merged revision 1040606 (JCR-2824)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
    jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  6 11:40:10 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040661,1040958,1041761
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041761

Modified: jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java?rev=1042591&r1=1042590&r2=1042591&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlList.java
Mon Dec  6 11:40:10 2010
@@ -41,8 +41,9 @@ public interface JackrabbitAccessControl
      *
      * @return the names of the supported restrictions or an empty array.
      * @see #addEntry(Principal, Privilege[], boolean, Map)
+     * @throws RepositoryException If an error occurs.
      */
-    String[] getRestrictionNames();
+    String[] getRestrictionNames() throws RepositoryException;
 
     /**
      * Return the expected {@link javax.jcr.PropertyType property type} of the
@@ -51,8 +52,9 @@ public interface JackrabbitAccessControl
      * @param restrictionName Any of the restriction names retrieved from
      * {@link #getRestrictionNames()}.
      * @return expected {@link javax.jcr.PropertyType property type}.
+     * @throws RepositoryException If an error occurs.
      */
-    int getRestrictionType(String restrictionName);
+    int getRestrictionType(String restrictionName) throws RepositoryException;
 
     /**
      * Returns <code>true</code> if this policy does not yet define any

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java?rev=1042591&r1=1042590&r2=1042591&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java
Mon Dec  6 11:40:10 2010
@@ -44,6 +44,7 @@ public class JackrabbitAccessControlList
 
     private JackrabbitAccessControlList templ;
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
 
@@ -63,6 +64,7 @@ public class JackrabbitAccessControlList
         }
     }
 
+    @Override
     protected void tearDown() throws Exception {
         // make sure transient ac-changes are reverted.
         superuser.refresh(false);
@@ -83,11 +85,11 @@ public class JackrabbitAccessControlList
         }
     }
 
-    public void testGetRestrictionNames() {
+    public void testGetRestrictionNames() throws RepositoryException {
         assertNotNull(templ.getRestrictionNames());
     }
 
-    public void testGetRestrictionType() {
+    public void testGetRestrictionType() throws RepositoryException {
         String[] names = templ.getRestrictionNames();
         for (String name : names) {
             int type = templ.getRestrictionType(name);



Mime
View raw message