Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 35062 invoked from network); 4 Nov 2009 23:41:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Nov 2009 23:41:28 -0000 Received: (qmail 72592 invoked by uid 500); 4 Nov 2009 23:41:28 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 72539 invoked by uid 500); 4 Nov 2009 23:41:28 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 72530 invoked by uid 99); 4 Nov 2009 23:41:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2009 23:41:28 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2009 23:41:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CF2E23888DC; Wed, 4 Nov 2009 23:41:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832911 - in /sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl: AccessManagerFactoryTracker.java security/PluggableDefaultAccessManager.java Date: Wed, 04 Nov 2009 23:41:04 -0000 To: commits@sling.apache.org From: ieb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091104234105.1CF2E23888DC@eris.apache.org> Author: ieb Date: Wed Nov 4 23:41:04 2009 New Revision: 832911 URL: http://svn.apache.org/viewvc?rev=832911&view=rev Log: SLING-1170 Fixed, the message wil come out once per bundle install, and I have downgraded some other related messages that were spamming to debug. Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/AccessManagerFactoryTracker.java sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/AccessManagerFactoryTracker.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/AccessManagerFactoryTracker.java?rev=832911&r1=832910&r2=832911&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/AccessManagerFactoryTracker.java (original) +++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/AccessManagerFactoryTracker.java Wed Nov 4 23:41:04 2009 @@ -76,19 +76,19 @@ @Override public void modifiedService(ServiceReference serviceReference, Object o) { - log.info("AccessManager service modified."); + log.debug("AccessManager service modified."); super.modifiedService(serviceReference, o); this.factory = (AccessManagerPluginFactory) o; } public AccessManagerPluginFactory getFactory(PluggableDefaultAccessManager consumer) { - log.info("Registering PluggableDefaultAccessManager instance"); + log.debug("Registering PluggableDefaultAccessManager instance"); this.consumers.add(consumer); return factory; } public void unregister(PluggableDefaultAccessManager consumer) { - log.info("Unregistering PluggableDefaultAccessManager instance"); + log.debug("Unregistering PluggableDefaultAccessManager instance"); this.consumers.remove(consumer); } } Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java?rev=832911&r1=832910&r2=832911&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java (original) +++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java Wed Nov 4 23:41:04 2009 @@ -65,6 +65,8 @@ protected AccessManagerFactoryTracker accessManagerFactoryTracker; private Session session; private Subject subject; + // only warn once, then only warn on debug level. + private static int pluginWarning = 0; public PluggableDefaultAccessManager() { } @@ -154,7 +156,12 @@ if (this.accessManagerPlugin == null) { AccessManagerPluginFactory factory = this.accessManagerFactoryTracker.getFactory(this); if (factory == null) { - log.warn("No pluggable AccessManager available, falling back to DefaultAccessManager"); + if ( pluginWarning == 0 ) { + pluginWarning++; + log.warn("No pluggable AccessManager available, falling back to DefaultAccessManager"); + } else { + log.debug("No pluggable AccessManager available, falling back to DefaultAccessManager"); + } return false; } else {