Index: src/main/java/org/apache/jackrabbit/core/cluster/NodeOperation.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/cluster/NodeOperation.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/cluster/NodeOperation.java (working copy) @@ -16,11 +16,8 @@ */ package org.apache.jackrabbit.core.cluster; -import org.apache.jackrabbit.core.nodetype.PropDefId; import org.apache.jackrabbit.core.nodetype.NodeDefId; -import org.apache.jackrabbit.core.PropertyId; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.core.value.InternalValue; /** * Describes a journal record for a node change. Index: src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (working copy) @@ -44,8 +44,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; -import java.util.List; -import java.util.LinkedList; import java.util.Iterator; import java.util.HashMap; Index: src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java (working copy) @@ -47,11 +47,6 @@ private final LockManagerImpl lockMgr; /** - * Session owning this environment. - */ - private final SessionImpl session; - - /** * Map of locked nodes, indexed by their (internal) id. */ private final Map lockedNodesMap = new HashMap(); @@ -80,8 +75,7 @@ * Create a new instance of this class. * @param lockMgr global lock manager */ - public XAEnvironment(SessionImpl session, LockManagerImpl lockMgr) { - this.session = session; + public XAEnvironment(LockManagerImpl lockMgr) { this.lockMgr = lockMgr; } Index: src/main/java/org/apache/jackrabbit/core/lock/XALock.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/lock/XALock.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/lock/XALock.java (working copy) @@ -17,8 +17,6 @@ package org.apache.jackrabbit.core.lock; import org.apache.jackrabbit.core.NodeImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -29,11 +27,6 @@ class XALock extends LockImpl { /** - * Logger instance for this class. - */ - private static final Logger log = LoggerFactory.getLogger(XALock.class); - - /** * XA lock manager. */ private final XALockManager lockMgr; Index: src/main/java/org/apache/jackrabbit/core/lock/XALockManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/lock/XALockManager.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/lock/XALockManager.java (working copy) @@ -25,7 +25,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; -import javax.jcr.ItemNotFoundException; import javax.jcr.lock.Lock; import javax.jcr.lock.LockException; @@ -42,11 +41,6 @@ private static final String XA_ENV_ATTRIBUTE_NAME = "XALockManager.XAEnv"; /** - * Parent session. - */ - private final SessionImpl session; - - /** * Global lock manager. */ private final LockManagerImpl lockMgr; @@ -58,11 +52,9 @@ /** * Create a new instance of this class. - * @param session session * @param lockMgr lockMgr global lock manager */ - public XALockManager(SessionImpl session, LockManagerImpl lockMgr) { - this.session = session; + public XALockManager(LockManagerImpl lockMgr) { this.lockMgr = lockMgr; } @@ -210,7 +202,7 @@ if (tx != null) { xaEnv = (XAEnvironment) tx.getAttribute(XA_ENV_ATTRIBUTE_NAME); if (xaEnv == null) { - xaEnv = new XAEnvironment(session, lockMgr); + xaEnv = new XAEnvironment(lockMgr); tx.setAttribute(XA_ENV_ATTRIBUTE_NAME, xaEnv); } } Index: src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (working copy) @@ -31,8 +31,6 @@ import org.apache.jackrabbit.core.nodetype.compact.ParseException; import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader; import org.apache.jackrabbit.core.util.Dumpable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -66,11 +64,6 @@ Dumpable, NodeTypeRegistryListener { /** - * Logger instance for this class - */ - private static Logger log = LoggerFactory.getLogger(NodeTypeManagerImpl.class); - - /** * The wrapped node type registry. */ private final NodeTypeRegistry ntReg; Index: src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/persistence/db/OraclePersistenceManager.java (working copy) @@ -38,7 +38,6 @@ import java.lang.reflect.Method; import java.sql.Blob; import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.DatabaseMetaData; import java.sql.Statement; Index: src/main/java/org/apache/jackrabbit/core/query/lucene/MatchAllScorer.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/query/lucene/MatchAllScorer.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/query/lucene/MatchAllScorer.java (working copy) @@ -24,7 +24,6 @@ import org.apache.lucene.search.HitCollector; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Similarity; -import org.apache.lucene.search.Weight; import java.io.IOException; import java.util.BitSet; @@ -48,11 +47,6 @@ private IndexReader reader; /** - * Weight associated with this Scorer - */ - private Weight weight; - - /** * The field to match */ private String field; @@ -71,16 +65,14 @@ * Creates a new MatchAllScorer. * * @param reader the IndexReader - * @param weight associated Weight for this Scorer * @param field the field name to match. * @throws IOException if an error occurs while collecting hits. * e.g. while reading from the search index. */ - MatchAllScorer(IndexReader reader, Weight weight, String field) + MatchAllScorer(IndexReader reader, String field) throws IOException { super(Similarity.getDefault()); this.reader = reader; - this.weight = weight; this.field = field; matchExpl = new Explanation(Similarity.getDefault().idf(reader.maxDoc(), Index: src/main/java/org/apache/jackrabbit/core/query/lucene/MatchAllWeight.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/query/lucene/MatchAllWeight.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/query/lucene/MatchAllWeight.java (working copy) @@ -103,7 +103,7 @@ * {@inheritDoc} */ public Scorer scorer(IndexReader reader) throws IOException { - return new MatchAllScorer(reader, this, field); + return new MatchAllScorer(reader, field); } /** Index: src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/security/SimpleAccessManager.java (working copy) @@ -18,8 +18,6 @@ import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.ItemId; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.jcr.AccessDeniedException; import javax.jcr.ItemNotFoundException; @@ -32,8 +30,6 @@ */ public class SimpleAccessManager implements AccessManager { - private static Logger log = LoggerFactory.getLogger(SimpleAccessManager.class); - /** * Subject whose access rights this AccessManager should reflect */ Index: src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java (working copy) @@ -16,9 +16,6 @@ */ package org.apache.jackrabbit.core.security; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import javax.jcr.Credentials; import javax.jcr.SimpleCredentials; import javax.security.auth.Subject; @@ -37,8 +34,6 @@ */ public class SimpleLoginModule implements LoginModule { - private static Logger log = LoggerFactory.getLogger(SimpleLoginModule.class); - /** * Name of the anonymous user id option in the LoginModule configuration */ @@ -57,8 +52,6 @@ // initial state private Subject subject; private CallbackHandler callbackHandler; - private Map sharedState; - private Map options; // configurable options //private boolean someOpt = false; @@ -128,8 +121,6 @@ Map sharedState, Map options) { this.subject = subject; this.callbackHandler = callbackHandler; - this.sharedState = sharedState; - this.options = options; // initialize any configured options //someOpt = "true".equalsIgnoreCase((String)options.get("someOpt")); Index: src/main/java/org/apache/jackrabbit/core/SessionImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/SessionImpl.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/SessionImpl.java (working copy) @@ -28,7 +28,6 @@ import org.apache.jackrabbit.core.security.SecurityConstants; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.SessionItemStateManager; -import org.apache.jackrabbit.core.state.UpdatableItemStateManager; import org.apache.jackrabbit.core.state.SharedItemStateManager; import org.apache.jackrabbit.core.state.LocalItemStateManager; import org.apache.jackrabbit.value.ValueFactoryImpl; Index: src/main/java/org/apache/jackrabbit/core/state/NodeState.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/state/NodeState.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/state/NodeState.java (working copy) @@ -23,8 +23,6 @@ import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.nodetype.NodeDefId; import org.apache.jackrabbit.name.QName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.ObjectInputStream; @@ -50,8 +48,6 @@ */ static final long serialVersionUID = 4392375681805781770L; - private static Logger log = LoggerFactory.getLogger(NodeState.class); - /** * the name of this node's primary type */ Index: src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/state/XAItemStateManager.java (working copy) @@ -25,8 +25,6 @@ import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider; import org.apache.jackrabbit.uuid.UUID; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.jcr.ReferentialIntegrityException; import javax.jcr.PropertyType; @@ -43,11 +41,6 @@ public class XAItemStateManager extends LocalItemStateManager implements InternalXAResource { /** - * Logger instance. - */ - private static Logger log = LoggerFactory.getLogger(XAItemStateManager.class); - - /** * Default change log attribute name. */ private static final String DEFAULT_ATTRIBUTE_NAME = "ChangeLog"; Index: src/main/java/org/apache/jackrabbit/core/SystemSession.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/SystemSession.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/SystemSession.java (working copy) @@ -20,8 +20,6 @@ import org.apache.jackrabbit.core.security.AMContext; import org.apache.jackrabbit.core.security.AccessManager; import org.apache.jackrabbit.core.security.SystemPrincipal; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.jcr.AccessDeniedException; import javax.jcr.ItemNotFoundException; @@ -37,8 +35,6 @@ */ class SystemSession extends SessionImpl { - private static Logger log = LoggerFactory.getLogger(SystemSession.class); - /** * Package private factory method * Index: src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java (working copy) @@ -17,8 +17,6 @@ package org.apache.jackrabbit.core.version; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.core.state.ItemStateListener; -import org.apache.jackrabbit.core.state.ItemState; /** * Implements a InternalVersionItem. Index: src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (working copy) @@ -30,8 +30,6 @@ import org.apache.jackrabbit.core.virtual.VirtualNodeState; import org.apache.jackrabbit.core.virtual.VirtualPropertyState; import org.apache.jackrabbit.name.QName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.jcr.RepositoryException; @@ -41,11 +39,6 @@ class VersionItemStateProvider implements VirtualItemStateProvider, ItemStateListener { /** - * the default logger - */ - private static Logger log = LoggerFactory.getLogger(VersionItemStateProvider.class); - - /** * The version manager */ private final VersionManagerImpl vMgr; Index: src/main/java/org/apache/jackrabbit/core/XASessionImpl.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/XASessionImpl.java (revision 482142) +++ src/main/java/org/apache/jackrabbit/core/XASessionImpl.java (working copy) @@ -167,7 +167,7 @@ public LockManager getLockManager() throws RepositoryException { if (lockMgr == null) { LockManagerImpl lockMgr = (LockManagerImpl) wsp.getLockManager(); - this.lockMgr = new XALockManager(this, lockMgr); + this.lockMgr = new XALockManager(lockMgr); } return lockMgr; }