Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F1A85D361 for ; Wed, 22 May 2013 12:17:19 +0000 (UTC) Received: (qmail 25716 invoked by uid 500); 22 May 2013 12:17:20 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 25661 invoked by uid 500); 22 May 2013 12:17:19 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 25642 invoked by uid 99); 22 May 2013 12:17:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 May 2013 12:17:18 +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; Wed, 22 May 2013 12:17:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5996623888E3; Wed, 22 May 2013 12:16:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1485174 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/nodetype/ main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ main/java/org/apache/jackrabbit/oak/plugins/observation/ main/java/org/... Date: Wed, 22 May 2013 12:16:51 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130522121652.5996623888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed May 22 12:16:51 2013 New Revision: 1485174 URL: http://svn.apache.org/r1485174 Log: Drop unused imports and loggers Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RootNodeDefinition.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/DoubleConstraint.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/LongConstraint.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeFilter.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventFilter.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventQueueWriter.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RootNodeDefinition.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RootNodeDefinition.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RootNodeDefinition.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RootNodeDefinition.java Wed May 22 12:16:51 2013 @@ -22,19 +22,11 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeManager; import javax.jcr.version.OnParentVersionAction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Node definition for the root node. */ final class RootNodeDefinition implements NodeDefinition { - /** - * logger instance - */ - private static final Logger log = LoggerFactory.getLogger(RootNodeDefinition.class); - private static final String REP_ROOT = "rep:root"; private final NodeTypeManager ntManager; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/DoubleConstraint.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/DoubleConstraint.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/DoubleConstraint.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/DoubleConstraint.java Wed May 22 12:16:51 2013 @@ -19,11 +19,7 @@ package org.apache.jackrabbit.oak.plugin import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class DoubleConstraint extends NumericConstraint { - private static final Logger log = LoggerFactory.getLogger(DoubleConstraint.class); public DoubleConstraint(String definition) { super(definition); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/LongConstraint.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/LongConstraint.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/LongConstraint.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/LongConstraint.java Wed May 22 12:16:51 2013 @@ -19,11 +19,7 @@ package org.apache.jackrabbit.oak.plugin import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class LongConstraint extends NumericConstraint { - private static final Logger log = LoggerFactory.getLogger(LongConstraint.class); public LongConstraint(String definition) { super(definition); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java Wed May 22 12:16:51 2013 @@ -19,11 +19,8 @@ package org.apache.jackrabbit.oak.plugin import javax.jcr.Value; import com.google.common.base.Predicate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ReferenceConstraint implements Predicate { - private static final Logger log = LoggerFactory.getLogger(ReferenceConstraint.class); private final String requiredTargetType; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeFilter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeFilter.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeFilter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeFilter.java Wed May 22 12:16:51 2013 @@ -29,14 +29,11 @@ import org.apache.jackrabbit.oak.core.Re import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager; import org.apache.jackrabbit.oak.spi.state.NodeState; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * TODO document */ class ChangeFilter { - private static final Logger log = LoggerFactory.getLogger(ChangeFilter.class); private final ReadOnlyNodeTypeManager ntMgr; private final NamePathMapper namePathMapper; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventFilter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventFilter.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventFilter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventFilter.java Wed May 22 12:16:51 2013 @@ -35,14 +35,11 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * TODO document */ class EventFilter { - private static final Logger log = LoggerFactory.getLogger(EventFilter.class); private final int eventTypes; private final String path; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventQueueWriter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventQueueWriter.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventQueueWriter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation2/EventQueueWriter.java Wed May 22 12:16:51 2013 @@ -64,8 +64,6 @@ public class EventQueueWriter extends De private final EventRecorder eventRecorder; private final String path; - private int eventId; - public EventQueueWriter(EventRecorder eventRecorder, String path, NodeState parent) { this.parent = parent; this.eventRecorder = eventRecorder; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java Wed May 22 12:16:51 2013 @@ -18,8 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.version; -import java.util.Calendar; - import javax.annotation.Nonnull; import javax.jcr.RepositoryException; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/PropertyStatesTest.java Wed May 22 12:16:51 2013 @@ -30,8 +30,6 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; import org.apache.jackrabbit.oak.plugins.value.ValueFactoryImpl; -import org.apache.jackrabbit.util.ISO8601; -import org.junit.Ignore; import org.junit.Test; import static java.util.Collections.singletonMap; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginStandaloneTest.java Wed May 22 12:16:51 2013 @@ -16,20 +16,10 @@ */ package org.apache.jackrabbit.oak.security.authentication.ldap; -import javax.jcr.SimpleCredentials; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; -import org.apache.jackrabbit.api.security.user.Authorizable; -import org.apache.jackrabbit.oak.api.ContentSession; -import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalLoginModule; -import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncMode; import org.junit.Ignore; -import org.junit.Test; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; @Ignore //ignore for the moment because "mvn test" runs into PermGen memory issues public class LdapLoginStandaloneTest extends LdapLoginTestBase { Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java?rev=1485174&r1=1485173&r2=1485174&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginWithRepoLoginTest.java Wed May 22 12:16:51 2013 @@ -17,21 +17,11 @@ package org.apache.jackrabbit.oak.security.authentication.ldap; import java.util.Collections; -import javax.jcr.SimpleCredentials; import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.Configuration; -import org.apache.jackrabbit.api.security.user.Authorizable; -import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl; -import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalLoginModule; -import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncMode; import org.junit.Ignore; -import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; @Ignore //ignore for the moment because "mvn test" runs into PermGen memory issues public class LdapLoginWithRepoLoginTest extends LdapLoginTestBase {