svn commit: r758646 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization: acl/ACLProvider.java principalbased/ACLProvider.java

[an...@apache.org]

Author: angela
Date: Thu Mar 26 13:50:20 2009
New Revision: 758646

URL: http://svn.apache.org/viewvc?rev=758646&view=rev
Log:
JCR-1588: Access Control

change log level

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java?rev=758646&r1=758645&r2=758646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLProvider.java Thu Mar 26 13:50:20 2009
@@ -273,7 +273,7 @@
      */
     private static void initRootACL(SessionImpl session, AccessControlEditor editor) throws RepositoryException {
         try {
-            log.info("Install initial ACL:...");
+            log.debug("Install initial ACL:...");
             String rootPath = session.getRootNode().getPath();
             AccessControlPolicy[] acls = editor.editAccessControlPolicies(rootPath);
             ACLTemplate acl = (ACLTemplate) acls[0];
@@ -281,7 +281,7 @@
             PrincipalManager pMgr = session.getPrincipalManager();
             AccessControlManager acMgr = session.getAccessControlManager();
 
-            log.info("... Privilege.ALL for administrators.");
+            log.debug("... Privilege.ALL for administrators.");
             Principal administrators;
             String pName = SecurityConstants.ADMINISTRATORS_NAME;
             if (pMgr.hasPrincipal(pName)) {
@@ -294,13 +294,12 @@
             acl.addAccessControlEntry(administrators, privs);
 
             Principal everyone = pMgr.getEveryone();
-            log.info("... Privilege.READ for everyone.");
+            log.debug("... Privilege.READ for everyone.");
             privs = new Privilege[]{acMgr.privilegeFromName(Privilege.JCR_READ)};
             acl.addAccessControlEntry(everyone, privs);
 
             editor.setPolicy(rootPath, acl);
             session.save();
-            log.info("... done.");
 
         } catch (RepositoryException e) {
             log.error("Failed to set-up minimal access control for root node of workspace " + session.getWorkspace().getName());

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java?rev=758646&r1=758645&r2=758646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java Thu Mar 26 13:50:20 2009
@@ -116,7 +116,7 @@
         editor = new ACLEditor(session, resolver.getQPath(acRoot.getPath()));
         if (!configuration.containsKey(PARAM_OMIT_DEFAULT_PERMISSIONS)) {
             try {
-                log.info("Install initial permissions: ...");
+                log.debug("Install initial permissions: ...");
 
                 ValueFactory vf = session.getValueFactory();
                 Map restrictions = new HashMap();
@@ -136,30 +136,29 @@
                 AccessControlPolicy[] acls = editor.editAccessControlPolicies(administrators);
                 ACLTemplate acl = (ACLTemplate) acls[0];
                 if (acl.isEmpty()) {
-                    log.info("... Privilege.ALL for administrators principal.");
+                    log.debug("... Privilege.ALL for administrators principal.");
                     acl.addEntry(administrators,
                             new Privilege[] {acMgr.privilegeFromName(Privilege.JCR_ALL)},
                             true, restrictions);
                     editor.setPolicy(acl.getPath(), acl);
                 } else {
-                    log.info("... policy for administrators principal already present.");
+                    log.debug("... policy for administrators principal already present.");
                 }
 
                 Principal everyone = pMgr.getEveryone();
                 acls = editor.editAccessControlPolicies(everyone);
                 acl = (ACLTemplate) acls[0];
                 if (acl.isEmpty()) {
-                    log.info("... Privilege.READ for everyone principal.");
+                    log.debug("... Privilege.READ for everyone principal.");
                     acl.addEntry(everyone,
                             new Privilege[] {acMgr.privilegeFromName(Privilege.JCR_READ)},
                             true, restrictions);
                     editor.setPolicy(acl.getPath(), acl);
                 } else {
-                    log.info("... policy for everyone principal already present.");
+                    log.debug("... policy for everyone principal already present.");
                 }
 
                 session.save();
-                log.info("... done.");
             } catch (RepositoryException e) {
                 log.error("Failed to set-up minimal access control for root node of workspace " + session.getWorkspace().getName());
                 session.getRootNode().refresh(false);