Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 466FE107F9 for ; Sun, 11 Aug 2013 19:26:41 +0000 (UTC) Received: (qmail 33426 invoked by uid 500); 11 Aug 2013 19:26:41 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 33372 invoked by uid 500); 11 Aug 2013 19:26:40 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 33360 invoked by uid 99); 11 Aug 2013 19:26:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Aug 2013 19:26:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Sun, 11 Aug 2013 19:26:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7416F23889ED; Sun, 11 Aug 2013 19:26:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1512993 - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ jackr... Date: Sun, 11 Aug 2013 19:26:16 -0000 To: commits@jackrabbit.apache.org From: dbrosius@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130811192617.7416F23889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dbrosius Date: Sun Aug 11 19:26:15 2013 New Revision: 1512993 URL: http://svn.apache.org/r1512993 Log: fix logging use of {} parameterization Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Util.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/DefaultLoginModule.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java 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/acl/ACLTemplate.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/Entry.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntriesCache.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/action/PasswordValidationAction.java jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/EventImpl.java jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Sun Aug 11 19:26:15 2013 @@ -1001,7 +1001,7 @@ public class RepositoryImpl extends Abst AccessControlContext acc = AccessController.getContext(); subject = Subject.getSubject(acc); } catch (SecurityException e) { - log.warn("Can't check for preauthentication. Reason:", e.getMessage()); + log.warn("Can't check for preauthentication. Reason: {}", e.getMessage()); } if (subject == null) { log.debug("No preauthenticated subject found -> return null."); Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java Sun Aug 11 19:26:15 2013 @@ -898,7 +898,7 @@ public abstract class DatabasePersistenc // no more trials, re-throw throw se; } - log.warn("execute failed, about to reconnect...", se.getMessage()); + log.warn("execute failed, about to reconnect... {}", se.getMessage()); // try to reconnect if (reestablishConnection()) { Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Util.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Util.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Util.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/Util.java Sun Aug 11 19:26:15 2013 @@ -437,7 +437,7 @@ public class Util { try { return value.getLength(); } catch (RepositoryException e) { - log.warn("Unable to determine length of value.", e.getMessage()); + log.warn("Unable to determine length of value. {}", e.getMessage()); return -1; } } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java Sun Aug 11 19:26:15 2013 @@ -344,9 +344,9 @@ public class RetentionRegistryImpl imple // else: not interested in any other property -> ignore. } catch (RepositoryException e) { - log.warn("Internal error while processing event.", e.getMessage()); + log.warn("Internal error while processing event. {}", e.getMessage()); // ignore. } } } -} \ No newline at end of file +} Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/DefaultLoginModule.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/DefaultLoginModule.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/DefaultLoginModule.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authentication/DefaultLoginModule.java Sun Aug 11 19:26:15 2013 @@ -160,7 +160,7 @@ public class DefaultLoginModule extends tokenExpiration = Long.parseLong(options.get(PARAM_TOKEN_EXPIRATION).toString()); log.debug("- Token expiration -> '" + tokenExpiration + "'"); } catch (NumberFormatException e) { - log.warn("Unabled to parse token expiration: ", e.getMessage()); + log.warn("Unabled to parse token expiration: {}", e.getMessage()); } } } @@ -192,7 +192,7 @@ public class DefaultLoginModule extends } } catch (RepositoryException e) { // should not get here - log.warn("Error while retrieving principal.", e.getMessage()); + log.warn("Error while retrieving principal. {}", e.getMessage()); } return principal; } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java Sun Aug 11 19:26:15 2013 @@ -121,7 +121,7 @@ public final class GlobPattern { // TODO: missing proper impl return matches(itemToMatch.getPath()); } catch (RepositoryException e) { - log.error("Unable to determine match.", e.getMessage()); + log.error("Unable to determine match. {}", e.getMessage()); return false; } } @@ -287,4 +287,4 @@ public final class GlobPattern { } } } -} \ No newline at end of file +} 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=1512993&r1=1512992&r2=1512993&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 Sun Aug 11 19:26:15 2013 @@ -188,7 +188,7 @@ public class ACLProvider extends Abstrac Query q = qm.createQuery(stmt.toString(), Query.XPATH); result = q.execute(); } catch (RepositoryException e) { - log.error("Unexpected error while searching effective policies.", e.getMessage()); + log.error("Unexpected error while searching effective policies. {}", e.getMessage()); throw new UnsupportedOperationException("Retrieve effective policies for set of principals not supported.", e); } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java Sun Aug 11 19:26:15 2013 @@ -158,7 +158,7 @@ class ACLTemplate extends AbstractACLTem // add the entry omitting any validation. entries.add(ace); } catch (RepositoryException e) { - log.debug("Failed to build ACE from content.", e.getMessage()); + log.debug("Failed to build ACE from content. {}", e.getMessage()); } } } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/Entry.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/Entry.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/Entry.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/Entry.java Sun Aug 11 19:26:15 2013 @@ -105,7 +105,7 @@ class Entry implements AccessControlCons Entry ace = new Entry(nodeId, principalName, isGroupEntry, privilegeMgr.getBits(privNames), isAllow, path, globValue); entries.add(ace); } catch (RepositoryException e) { - log.debug("Failed to build ACE from content.", e.getMessage()); + log.debug("Failed to build ACE from content. {}", e.getMessage()); } } @@ -196,4 +196,4 @@ class Entry implements AccessControlCons } return false; } -} \ No newline at end of file +} 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=1512993&r1=1512992&r2=1512993&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 Sun Aug 11 19:26:15 2013 @@ -205,7 +205,7 @@ public class ACLProvider extends Abstrac Query q = qm.createQuery(stmt.toString(), Query.XPATH); result = q.execute(); } catch (RepositoryException e) { - log.error("Unexpected error while searching effective policies.", e.getMessage()); + log.error("Unexpected error while searching effective policies. {}", e.getMessage()); throw new UnsupportedOperationException("Retrieve effective policies at absPath '" +jcrPath+ "' not supported.", e); } @@ -267,7 +267,7 @@ public class ACLProvider extends Abstrac return new ACLEditor((SessionImpl) editingSession, session.getQPath(acRoot.getPath())); } catch (RepositoryException e) { // should never get here - log.error("Internal error: ", e.getMessage()); + log.error("Internal error: {}", e.getMessage()); } } @@ -522,7 +522,7 @@ public class ACLProvider extends Abstrac } } catch (RepositoryException e) { // should never get here - log.warn("Internal error: ", e.getMessage()); + log.warn("Internal error: {}", e.getMessage()); } } } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntriesCache.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntriesCache.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntriesCache.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntriesCache.java Sun Aug 11 19:26:15 2013 @@ -210,7 +210,7 @@ class EntriesCache extends AccessControl } catch (RepositoryException e) { // should never get here - log.warn("Internal error: ", e.getMessage()); + log.warn("Internal error: {}", e.getMessage()); } } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java Sun Aug 11 19:26:15 2013 @@ -278,7 +278,7 @@ public class UserAccessControlProvider e } } catch (RepositoryException e) { // should never get here - log.error("Internal error while retrieving user principal", e.getMessage()); + log.error("Internal error while retrieving user principal: {}", e.getMessage()); } // none of the principals in the set is assigned to a User. return null; @@ -291,7 +291,7 @@ public class UserAccessControlProvider e String path = principal.getPath(); userNode = (NodeImpl) session.getNode(path); } catch (RepositoryException e) { - log.warn("Error while retrieving user node.", e.getMessage()); + log.warn("Error while retrieving user node. {}", e.getMessage()); } } return userNode; @@ -343,7 +343,7 @@ public class UserAccessControlProvider e } } catch (RepositoryException e) { // should never get here - log.error("Error while initializing user/group administrators", e.getMessage()); + log.error("Error while initializing user/group administrators: ()", e.getMessage()); } return null; } @@ -527,7 +527,7 @@ public class UserAccessControlProvider e try { observationMgr.removeEventListener(this); } catch (RepositoryException e) { - log.error("Internal error: ", e.getMessage()); + log.error("Internal error: {}", e.getMessage()); } super.close(); } @@ -592,7 +592,7 @@ public class UserAccessControlProvider e } // else: not interested. } catch (RepositoryException e) { // should never get here - log.warn("Internal error ", e.getMessage()); + log.warn("Internal error: {}", e.getMessage()); clearCache(); } } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/action/PasswordValidationAction.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/action/PasswordValidationAction.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/action/PasswordValidationAction.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/action/PasswordValidationAction.java Sun Aug 11 19:26:15 2013 @@ -88,7 +88,7 @@ public class PasswordValidationAction ex try { pattern = Pattern.compile(constraint); } catch (PatternSyntaxException e) { - log.warn("Invalid password constraint: ", e.getMessage()); + log.warn("Invalid password constraint: {}", e.getMessage()); } } @@ -109,4 +109,4 @@ public class PasswordValidationAction ex } } } -} \ No newline at end of file +} Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java Sun Aug 11 19:26:15 2013 @@ -97,7 +97,7 @@ public class JcrActiveLock extends Abstr return LockTokenMapper.getDavLocktoken(lock); } catch (RepositoryException e) { // should never get here - log.warn("Unexpected error while retrieving node identifier for building a DAV specific lock token.", + log.warn("Unexpected error while retrieving node identifier for building a DAV specific lock token. {}", e.getMessage()); return null; } Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java Sun Aug 11 19:26:15 2013 @@ -520,19 +520,19 @@ public class SubscriptionImpl implements try { DomUtil.addChildElement(eventElem, XML_EVENTUSERDATA, NAMESPACE, event.getUserData()); } catch (RepositoryException e) { - log.error("Internal error while retrieving event user data.", e.getMessage()); + log.error("Internal error while retrieving event user data. {}", e.getMessage()); } // time stamp try { DomUtil.addChildElement(eventElem, XML_EVENTDATE, NAMESPACE, String.valueOf(event.getDate())); } catch (RepositoryException e) { - log.error("Internal error while retrieving event date.", e.getMessage()); + log.error("Internal error while retrieving event date. {}", e.getMessage()); } // identifier try { DomUtil.addChildElement(eventElem, XML_EVENTIDENTIFIER, NAMESPACE, event.getIdentifier()); } catch (RepositoryException e) { - log.error("Internal error while retrieving event identifier.", e.getMessage()); + log.error("Internal error while retrieving event identifier. {}", e.getMessage()); } // info Element info = DomUtil.addChildElement(eventElem, XML_EVENTINFO, NAMESPACE); @@ -548,7 +548,7 @@ public class SubscriptionImpl implements } } } catch (RepositoryException e) { - log.error("Internal error while retrieving event info.", e.getMessage()); + log.error("Internal error while retrieving event info. {}", e.getMessage()); } } return bundle; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java Sun Aug 11 19:26:15 2013 @@ -284,7 +284,7 @@ public class Jcr2spiRepositoryFactory im return CacheBehaviour.OBSERVATION; } else { - log.error("Invalid valid for CacheBehaviour: {}", PARAM_CACHE_BEHAVIOR, cacheBehaviour); + log.error("Invalid valid for CacheBehaviour: {} {}", PARAM_CACHE_BEHAVIOR, cacheBehaviour); throw new RepositoryException("Invalid value for CacheBehaviour: " + cacheBehaviour); } } Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Sun Aug 11 19:26:15 2013 @@ -1656,7 +1656,7 @@ public class NodeEntryImpl extends Hiera log.warn("Reverting didn't restore the correct index."); } } catch (RepositoryException e) { - log.warn("Unable to calculate index.", e.getMessage()); + log.warn("Unable to calculate index. {}", e.getMessage()); } } revertInfo = null; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java Sun Aug 11 19:26:15 2013 @@ -309,7 +309,7 @@ public class LockManagerImpl implements // error occurred. // for this case, assume that no lock exists and delegate final // validation to the spi-implementation. - log.warn("Error while accessing lock holding NodeState", e.getMessage()); + log.warn("Error while accessing lock holding NodeState: {}", e.getMessage()); return null; } } @@ -597,7 +597,7 @@ public class LockManagerImpl implements PropertyState ps = lockHoldingState.getPropertyState(NameConstants.JCR_LOCKISDEEP); ps.addListener(this); } catch (RepositoryException e) { - log.warn("Unable to retrieve jcr:isDeep property after lock creation.", e.getMessage()); + log.warn("Unable to retrieve jcr:isDeep property after lock creation. {}", e.getMessage()); } } } @@ -833,7 +833,7 @@ public class LockManagerImpl implements lockState.reloadLockInfo(); } catch (RepositoryException e) { // may occur if session has been logged out. rather throw? - log.warn("Unable to determine lock status.", e.getMessage()); + log.warn("Unable to determine lock status. {}", e.getMessage()); } } // else: nothing to do. } Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java Sun Aug 11 19:26:15 2013 @@ -91,7 +91,7 @@ public class Merge extends AbstractOpera vhe.invalidate(true); } } catch (RepositoryException e) { - log.warn("Error while retrieving VersionHistory entry:", e.getMessage()); + log.warn("Error while retrieving VersionHistory entry: {}", e.getMessage()); } nodeState.getHierarchyEntry().invalidate(true); } @@ -144,4 +144,4 @@ public class Merge extends AbstractOpera public static Merge create(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean isShallow, VersionManager mgr) { return new Merge(nodeState, srcWorkspaceName, bestEffort, isShallow, mgr); } -} \ No newline at end of file +} Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/EventImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/EventImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/EventImpl.java (original) +++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/EventImpl.java Sun Aug 11 19:26:15 2013 @@ -114,7 +114,7 @@ public class EventImpl } info.put(n, qv); } catch (RepositoryException e) { - log.error("Internal Error: ", e.getMessage()); + log.error("Internal Error: {}", e.getMessage()); } } return info; @@ -156,4 +156,4 @@ public class EventImpl return results.toArray(new Name[results.size()]); } -} \ No newline at end of file +} Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1512993&r1=1512992&r2=1512993&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original) +++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Sun Aug 11 19:26:15 2013 @@ -1352,13 +1352,13 @@ public class RepositoryServiceImpl imple return qvs; } } catch (SAXException e) { - log.warn("Internal error: ", e.getMessage()); + log.warn("Internal error: {}", e.getMessage()); throw new RepositoryException(e); } catch (IOException e) { - log.warn("Internal error: ", e.getMessage()); + log.warn("Internal error: {}", e.getMessage()); throw new RepositoryException(e); } catch (ParserConfigurationException e) { - log.warn("Internal error: ", e.getMessage()); + log.warn("Internal error: {}", e.getMessage()); throw new RepositoryException(e); } } @@ -2332,7 +2332,7 @@ public class RepositoryServiceImpl imple eventPath = uriResolver.getQPath(href, sessionInfo); } catch (RepositoryException e) { // should not occur - log.error("Internal error while building Event", e.getMessage()); + log.error("Internal error while building Event: ()", e.getMessage()); continue; } @@ -2356,7 +2356,7 @@ public class RepositoryServiceImpl imple eventPath.getAncestor(1)), eventPath.getName()); } catch (RepositoryException e1) { - log.warn("Unable to build event itemId: ", + log.warn("Unable to build event itemId: {}", e.getMessage()); } } @@ -2366,7 +2366,7 @@ public class RepositoryServiceImpl imple try { parentId = uriResolver.getNodeId(parentHref, sessionInfo); } catch (RepositoryException e) { - log.warn("Unable to build event parentId: ", e.getMessage()); + log.warn("Unable to build event parentId: {}", e.getMessage()); } }