Index: modeshape-graph/src/main/java/org/modeshape/graph/observe/ObservationBus.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/observe/ObservationBus.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/observe/ObservationBus.java Sat Jan 23 14:48:54 CET 2010 @@ -34,7 +34,7 @@ @ThreadSafe public class ObservationBus implements Observable, Observer { private final ChangeObservers observers = new ChangeObservers(); - private final Logger logger = Logger.getLogger(getClass()); + private static final Logger logger = Logger.getLogger(ObservationBus.class); public ObservationBus() { } Index: modeshape-repository/src/main/java/org/modeshape/repository/ModeShapeEngine.java =================================================================== --- modeshape-repository/src/main/java/org/modeshape/repository/ModeShapeEngine.java (revision 1596) +++ modeshape-repository/src/main/java/org/modeshape/repository/ModeShapeEngine.java Sat Jan 23 14:56:22 CET 2010 @@ -21,16 +21,6 @@ */ package org.modeshape.repository; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; import net.jcip.annotations.Immutable; import org.modeshape.common.collection.Problem; import org.modeshape.common.collection.Problems; @@ -38,14 +28,7 @@ import org.modeshape.common.util.CheckArg; import org.modeshape.common.util.Logger; import org.modeshape.common.util.NamedThreadFactory; -import org.modeshape.graph.ExecutionContext; -import org.modeshape.graph.Graph; -import org.modeshape.graph.JcrLexicon; -import org.modeshape.graph.JcrMixLexicon; -import org.modeshape.graph.JcrNtLexicon; -import org.modeshape.graph.Location; -import org.modeshape.graph.Node; -import org.modeshape.graph.Subgraph; +import org.modeshape.graph.*; import org.modeshape.graph.connector.RepositoryConnectionFactory; import org.modeshape.graph.connector.RepositoryContext; import org.modeshape.graph.connector.RepositorySource; @@ -55,14 +38,16 @@ import org.modeshape.graph.mimetype.MimeTypeDetectorConfig; import org.modeshape.graph.mimetype.MimeTypeDetectors; import org.modeshape.graph.observe.ObservationBus; -import org.modeshape.graph.property.Name; -import org.modeshape.graph.property.Path; -import org.modeshape.graph.property.PathExpression; -import org.modeshape.graph.property.PathNotFoundException; -import org.modeshape.graph.property.Property; +import org.modeshape.graph.property.*; import org.modeshape.repository.sequencer.SequencerConfig; import org.modeshape.repository.sequencer.SequencingService; +import java.util.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; + /** * A single instance of the ModeShape services, which is obtained after setting up the {@link ModeShapeConfiguration#build() configuration}. * @@ -82,6 +67,7 @@ private final SequencingService sequencingService; private final ExecutorService executorService; private final MimeTypeDetectors detectors; + private final Logger logger = Logger.getLogger(ModeShapeEngine.class); protected ModeShapeEngine( ExecutionContext context, ModeShapeConfiguration.ConfigurationDefinition configuration ) { @@ -261,10 +247,9 @@ public void start() { if (getProblems().hasErrors()) { // First log the messages ... - Logger log = Logger.getLogger(getClass()); - log.error(RepositoryI18n.errorsPreventStarting); + logger.error(RepositoryI18n.errorsPreventStarting); for (Problem problem : getProblems()) { - log.error(problem.getMessage(), problem.getParameters()); + logger.error(problem.getMessage(), problem.getParameters()); } // Then throw an exception ... throw new IllegalStateException(RepositoryI18n.errorsPreventStarting.text()); Index: extensions/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/MSOfficeMetadata.java =================================================================== --- extensions/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/MSOfficeMetadata.java (revision 1596) +++ extensions/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/MSOfficeMetadata.java Sat Jan 23 14:58:40 CET 2010 @@ -52,6 +52,7 @@ private int characters; private String creatingApplication; private byte[] thumbnail; + private static final Logger logger = Logger.getLogger(MSOfficeMetadata.class); public void processPOIFSReaderEvent( POIFSReaderEvent event ) { try { @@ -74,7 +75,7 @@ creatingApplication = si.getApplicationName(); thumbnail = si.getThumbnail(); } catch (Exception ex) { - Logger.getLogger(this.getClass()).debug(ex, "Error processing the metadata for the MS Office document"); + logger.debug(ex, "Error processing the metadata for the MS Office document"); } } Index: modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/FederatedRepositoryConnection.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/FederatedRepositoryConnection.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/FederatedRepositoryConnection.java Sat Jan 23 14:46:53 CET 2010 @@ -23,14 +23,6 @@ */ package org.modeshape.graph.connector.federation; -import java.util.LinkedList; -import java.util.Queue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; -import javax.transaction.xa.XAResource; import org.modeshape.common.statistic.Stopwatch; import org.modeshape.common.util.Logger; import org.modeshape.graph.ExecutionContext; @@ -43,6 +35,11 @@ import org.modeshape.graph.request.Request; import org.modeshape.graph.request.processor.RequestProcessor; +import javax.transaction.xa.XAResource; +import java.util.LinkedList; +import java.util.Queue; +import java.util.concurrent.*; + /** * This {@link RepositoryConnection} implementation executes {@link Request requests} against the federated repository by * projecting them into requests against the underlying sources that are being federated. @@ -76,13 +73,12 @@ private final FederatedRepository repository; private final Stopwatch stopwatch; - private final Logger logger; private final Observer observer; + private static final Logger logger = Logger.getLogger(FederatedRepositoryConnection.class); FederatedRepositoryConnection( FederatedRepository repository, Observer observer ) { this.repository = repository; - this.logger = Logger.getLogger(getClass()); this.stopwatch = logger.isTraceEnabled() ? new Stopwatch() : null; this.observer = observer; } Index: modeshape-repository/src/main/java/org/modeshape/repository/RepositoryService.java =================================================================== --- modeshape-repository/src/main/java/org/modeshape/repository/RepositoryService.java (revision 1625) +++ modeshape-repository/src/main/java/org/modeshape/repository/RepositoryService.java Sat Jan 23 14:57:03 CET 2010 @@ -23,45 +23,35 @@ */ package org.modeshape.repository; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; import net.jcip.annotations.ThreadSafe; import org.modeshape.common.collection.Problems; import org.modeshape.common.collection.SimpleProblems; import org.modeshape.common.util.CheckArg; import org.modeshape.common.util.Logger; import org.modeshape.common.util.Reflection; -import org.modeshape.graph.ExecutionContext; -import org.modeshape.graph.Graph; -import org.modeshape.graph.JcrLexicon; -import org.modeshape.graph.Location; -import org.modeshape.graph.Node; -import org.modeshape.graph.Subgraph; +import org.modeshape.graph.*; import org.modeshape.graph.connector.RepositorySource; import org.modeshape.graph.observe.Changes; import org.modeshape.graph.observe.NetChangeObserver; import org.modeshape.graph.observe.Observer; -import org.modeshape.graph.property.Name; -import org.modeshape.graph.property.Path; -import org.modeshape.graph.property.PathFactory; -import org.modeshape.graph.property.PathNotFoundException; -import org.modeshape.graph.property.Property; -import org.modeshape.graph.property.PropertyType; -import org.modeshape.graph.property.ValueFactories; -import org.modeshape.graph.property.ValueFactory; +import org.modeshape.graph.property.*; import org.modeshape.graph.request.ReadBranchRequest; import org.modeshape.repository.service.AbstractServiceAdministrator; import org.modeshape.repository.service.AdministeredService; import org.modeshape.repository.service.ServiceAdministrator; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + /** * A service that manages the {@link RepositorySource}es defined within a configuration repository. */ @ThreadSafe public class RepositoryService implements AdministeredService, Observer { + private static final Logger logger = Logger.getLogger(RepositoryService.class); /** * The administrative component for this service. @@ -397,7 +387,7 @@ } // Invoke the method ... String msg = "Setting property {0} to {1} on source at {2} in configuration repository {3} in workspace {4}"; - Logger.getLogger(getClass()).trace(msg, + logger.trace(msg, javaPropertyName, value, path, @@ -405,11 +395,11 @@ configurationWorkspaceName); setter.invoke(instance, value); } catch (SecurityException err) { - Logger.getLogger(getClass()).debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); + logger.debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); } catch (IllegalArgumentException err) { // Do nothing ... assume not a JavaBean property (but log) String msg = "Invalid argument invoking {0} with parameter {1} on source at {2} in configuration repository {3} in workspace {4}"; - Logger.getLogger(getClass()).debug(err, + logger.debug(err, msg, setter, value, @@ -417,11 +407,11 @@ configurationSourceName, configurationWorkspaceName); } catch (IllegalAccessException err) { - Logger.getLogger(getClass()).debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); + logger.debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); } catch (InvocationTargetException err) { // Do nothing ... assume not a JavaBean property (but log) String msg = "Error invoking {0} with parameter {1} on source at {2} in configuration repository {3} in workspace {4}"; - Logger.getLogger(getClass()).debug(err.getTargetException(), + logger.debug(err.getTargetException(), msg, setter, value, @@ -450,7 +440,7 @@ setter.invoke(instance, value); // Invoke the method ... String msg = "Setting property {0} to {1} on object at {2} in configuration repository {3} in workspace {4}"; - Logger.getLogger(getClass()).trace(msg, + logger.trace(msg, javaPropertyName, value, childPath, @@ -458,11 +448,11 @@ configurationWorkspaceName); setter.invoke(instance, value); } catch (SecurityException err) { - Logger.getLogger(getClass()).debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); + logger.debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); } catch (IllegalArgumentException err) { // Do nothing ... assume not a JavaBean property (but log) String msg = "Invalid argument invoking {0} with parameter {1} on object at {2} in configuration repository {3} in workspace {4}"; - Logger.getLogger(getClass()).debug(err, + logger.debug(err, msg, setter, value, @@ -470,11 +460,11 @@ configurationSourceName, configurationWorkspaceName); } catch (IllegalAccessException err) { - Logger.getLogger(getClass()).debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); + logger.debug(err, "Error invoking {0}.{1}", instance.getClass(), setter); } catch (InvocationTargetException err) { // Do nothing ... assume not a JavaBean property (but log) String msg = "Error invoking {0} with parameter {1} on source at {2} in configuration repository {3} in workspace {4}"; - Logger.getLogger(getClass()).debug(err.getTargetException(), + logger.debug(err.getTargetException(), msg, setter, value, @@ -501,7 +491,7 @@ return false; } catch (Exception e) { // Log that the property was not found ... - Logger.getLogger(getClass()).debug("Unknown property '{0}' on '{1}' class", propertyName, target.getClass().getName()); + logger.debug("Unknown property '{0}' on '{1}' class", propertyName, target.getClass().getName()); return false; } } Index: modeshape-graph/src/main/java/org/modeshape/graph/connector/RepositoryConnectionPool.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/connector/RepositoryConnectionPool.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/connector/RepositoryConnectionPool.java Sat Jan 23 14:44:32 CET 2010 @@ -158,7 +158,7 @@ private final AtomicLong totalConnectionsUsed = new AtomicLong(0); - private final Logger logger = Logger.getLogger(this.getClass()); + private static final Logger logger = Logger.getLogger(RepositoryConnectionPool.class); /** * Create the pool to use the supplied connection factory, which is typically a {@link RepositorySource}. This constructor Index: modeshape-graph/src/main/java/org/modeshape/graph/JaasSecurityContext.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/JaasSecurityContext.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/JaasSecurityContext.java Sat Jan 23 14:44:06 CET 2010 @@ -28,7 +28,7 @@ @NotThreadSafe public final class JaasSecurityContext implements SecurityContext { - private final Logger log = Logger.getLogger(getClass()); + private static final Logger log = Logger.getLogger(JaasSecurityContext.class); private final LoginContext loginContext; private final String userName; Index: modeshape-graph/src/test/java/org/modeshape/graph/connector/RepositorySourceLoadHarness.java =================================================================== --- modeshape-graph/src/test/java/org/modeshape/graph/connector/RepositorySourceLoadHarness.java (revision 1596) +++ modeshape-graph/src/test/java/org/modeshape/graph/connector/RepositorySourceLoadHarness.java Sat Jan 23 14:46:10 CET 2010 @@ -23,16 +23,6 @@ */ package org.modeshape.graph.connector; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; import org.modeshape.common.i18n.MockI18n; import org.modeshape.common.util.Logger; import org.modeshape.common.util.NamedThreadFactory; @@ -41,12 +31,18 @@ import org.modeshape.graph.property.basic.RootPath; import org.modeshape.graph.request.ReadNodeRequest; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.*; + /** * A test harness for using repository connections under load. * * @author Randall Hauch */ public class RepositorySourceLoadHarness { + private static final Logger logger = Logger.getLogger(RepositorySourceLoadHarness.class); public static Future execute( RepositoryConnectionPool pool, ExecutionContext context, @@ -120,7 +116,7 @@ clientPool.shutdown(); if (!clientPool.awaitTermination(5, TimeUnit.SECONDS)) { String msg = "Unable to shutdown clients after 5 seconds"; - Logger.getLogger(RepositorySourceLoadHarness.class).error(MockI18n.passthrough, msg); + logger.error(MockI18n.passthrough, msg); } } @@ -190,9 +186,10 @@ public static class CallLoadMultipleTimes implements RepositoryOperation { private final int count; + private static final Logger logger = Logger.getLogger(CallLoadMultipleTimes.class); public CallLoadMultipleTimes( int count ) { - Logger.getLogger(RepositorySourceLoadHarness.class).debug("Creating repository operation to call {0} times", count); + RepositorySourceLoadHarness.logger.debug("Creating repository operation to call {0} times", count); this.count = count; } @@ -211,7 +208,7 @@ */ public Integer run( ExecutionContext context, RepositoryConnection connection ) throws RepositorySourceException { - Logger.getLogger(RepositorySourceLoadHarness.class).debug("Running {0} operation", this.getClass().getSimpleName()); + RepositorySourceLoadHarness.logger.debug("Running {0} operation", this.getClass().getSimpleName()); int total = count; for (int i = 0; i != count; ++i) { // Add two random numbers ... @@ -223,7 +220,7 @@ int int2 = random(this.hashCode() ^ (int)System.nanoTime() + i); total += Math.min(Math.abs(Math.max(int1, int2) + int1 * int2 / 3), count); } - Logger.getLogger(RepositorySourceLoadHarness.class).debug("Finishing {0} operation", this.getClass().getSimpleName()); + logger.debug("Finishing {0} operation", this.getClass().getSimpleName()); return total < count ? total : count; // should really always return count } } Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrEngine.java =================================================================== --- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrEngine.java (revision 1617) +++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrEngine.java Sat Jan 23 15:01:58 CET 2010 @@ -67,7 +67,7 @@ final static int LOCK_SWEEP_INTERVAL_IN_MILLIS = 30000; final static int LOCK_EXTENSION_INTERVAL_IN_MILLIS = LOCK_SWEEP_INTERVAL_IN_MILLIS * 2; - private final Logger log = Logger.getLogger(ModeShapeEngine.class); + private static final Logger log = Logger.getLogger(ModeShapeEngine.class); private final Map repositories; private final Lock repositoriesLock; Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrObservationManager.java =================================================================== --- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrObservationManager.java (revision 1596) +++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrObservationManager.java Sat Jan 23 14:51:56 CET 2010 @@ -23,22 +23,6 @@ */ package org.modeshape.jcr; -import static org.modeshape.graph.JcrLexicon.MIXIN_TYPES; -import static org.modeshape.graph.JcrLexicon.PRIMARY_TYPE; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import javax.jcr.RangeIterator; -import javax.jcr.RepositoryException; -import javax.jcr.observation.Event; -import javax.jcr.observation.EventIterator; -import javax.jcr.observation.EventListener; -import javax.jcr.observation.EventListenerIterator; -import javax.jcr.observation.ObservationManager; import net.jcip.annotations.NotThreadSafe; import org.modeshape.common.util.CheckArg; import org.modeshape.common.util.Logger; @@ -47,18 +31,20 @@ import org.modeshape.graph.observe.Changes; import org.modeshape.graph.observe.NetChangeObserver; import org.modeshape.graph.observe.Observable; -import org.modeshape.graph.property.Name; -import org.modeshape.graph.property.NamespaceRegistry; -import org.modeshape.graph.property.Path; -import org.modeshape.graph.property.PathFactory; -import org.modeshape.graph.property.Property; -import org.modeshape.graph.property.UuidFactory; -import org.modeshape.graph.property.ValueFactories; -import org.modeshape.graph.property.ValueFactory; -import org.modeshape.graph.property.ValueFormatException; +import org.modeshape.graph.property.*; import org.modeshape.graph.request.ChangeRequest; import org.modeshape.graph.session.InvalidStateException; +import javax.jcr.RangeIterator; +import javax.jcr.RepositoryException; +import javax.jcr.observation.*; +import javax.jcr.observation.EventListener; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +import static org.modeshape.graph.JcrLexicon.MIXIN_TYPES; +import static org.modeshape.graph.JcrLexicon.PRIMARY_TYPE; + /** * The implementation of JCR {@link ObservationManager}. */ Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchProcessor.java =================================================================== --- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchProcessor.java (revision 1596) +++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchProcessor.java Sat Jan 23 14:57:50 CET 2010 @@ -23,12 +23,6 @@ */ package org.modeshape.search.lucene; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import net.jcip.annotations.NotThreadSafe; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; @@ -41,26 +35,18 @@ import org.modeshape.graph.query.QueryResults.Columns; import org.modeshape.graph.query.QueryResults.Statistics; import org.modeshape.graph.query.process.FullTextSearchResultColumns; -import org.modeshape.graph.request.CloneBranchRequest; -import org.modeshape.graph.request.CloneWorkspaceRequest; -import org.modeshape.graph.request.CopyBranchRequest; -import org.modeshape.graph.request.CreateNodeRequest; -import org.modeshape.graph.request.CreateWorkspaceRequest; -import org.modeshape.graph.request.DeleteBranchRequest; -import org.modeshape.graph.request.DestroyWorkspaceRequest; -import org.modeshape.graph.request.FullTextSearchRequest; -import org.modeshape.graph.request.GetWorkspacesRequest; -import org.modeshape.graph.request.LockBranchRequest; -import org.modeshape.graph.request.MoveBranchRequest; -import org.modeshape.graph.request.ReadAllChildrenRequest; -import org.modeshape.graph.request.ReadAllPropertiesRequest; -import org.modeshape.graph.request.UnlockBranchRequest; -import org.modeshape.graph.request.UpdatePropertiesRequest; -import org.modeshape.graph.request.VerifyWorkspaceRequest; -import org.modeshape.graph.search.SearchEngineProcessor; +import org.modeshape.graph.request.*; import org.modeshape.graph.search.AbstractSearchEngine.Workspaces; +import org.modeshape.graph.search.SearchEngineProcessor; import org.modeshape.search.lucene.AbstractLuceneSearchEngine.AbstractLuceneProcessor; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * Abstract {@link SearchEngineProcessor} implementation for the {@link LuceneSearchEngine}. */ @@ -68,7 +54,7 @@ public class LuceneSearchProcessor extends AbstractLuceneProcessor { protected static final Columns FULL_TEXT_RESULT_COLUMNS = new FullTextSearchResultColumns(); - private final Logger logger = Logger.getLogger(getClass()); + private static final Logger logger = Logger.getLogger(LuceneSearchProcessor.class); protected LuceneSearchProcessor( String sourceName, ExecutionContext context, Index: modeshape-jcr/src/main/java/org/modeshape/jcr/SessionCache.java =================================================================== --- modeshape-jcr/src/main/java/org/modeshape/jcr/SessionCache.java (revision 1604) +++ modeshape-jcr/src/main/java/org/modeshape/jcr/SessionCache.java Sat Jan 23 14:54:14 CET 2010 @@ -2069,6 +2069,8 @@ @Immutable final class JcrNodeOperations extends GraphSession.NodeOperations { + private final Logger logger = Logger.getLogger(JcrNodeOperations.class); + /** * {@inheritDoc} * @@ -2514,7 +2516,7 @@ multiValuedPropertyNames.add(nameFactory.create(value)); } catch (ValueFormatException e) { String msg = "{0} value \"{1}\" on {2} in \"{3}\" workspace is not a valid name and is being ignored"; - Logger.getLogger(getClass()).trace(e, + logger.trace(e, msg, readable(ModeShapeIntLexicon.MULTI_VALUED_PROPERTIES), value, Index: modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/Projection.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/Projection.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/Projection.java Sat Jan 23 14:47:08 CET 2010 @@ -62,12 +62,14 @@ */ private static final long serialVersionUID = 1L; protected static final List parserMethods; + private static final Logger logger = Logger.getLogger(Projection.class); + static { parserMethods = new CopyOnWriteArrayList(); try { parserMethods.add(Projection.class.getDeclaredMethod("parsePathRule", String.class, ExecutionContext.class)); } catch (Throwable err) { - Logger.getLogger(Projection.class).error(err, GraphI18n.errorAddingProjectionRuleParseMethod); + logger.error(err, GraphI18n.errorAddingProjectionRuleParseMethod); } } Index: modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/ProjectionParser.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/ProjectionParser.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/connector/federation/ProjectionParser.java Sat Jan 23 14:47:17 CET 2010 @@ -45,13 +45,15 @@ public class ProjectionParser { private static final ProjectionParser INSTANCE; + private static final Logger logger = Logger.getLogger(Projection.class); + static { INSTANCE = new ProjectionParser(); try { INSTANCE.addRuleParser(Projection.class, "parsePathRule"); assert INSTANCE.parserMethods.size() == 1; } catch (Throwable err) { - Logger.getLogger(Projection.class).error(err, GraphI18n.errorAddingProjectionRuleParseMethod); + logger.error(err, GraphI18n.errorAddingProjectionRuleParseMethod); } } Index: extensions/modeshape-classloader-maven/src/main/java/org/modeshape/maven/MavenRepository.java =================================================================== --- extensions/modeshape-classloader-maven/src/main/java/org/modeshape/maven/MavenRepository.java (revision 1596) +++ extensions/modeshape-classloader-maven/src/main/java/org/modeshape/maven/MavenRepository.java Sat Jan 23 14:54:49 CET 2010 @@ -71,13 +71,12 @@ private final MavenUrlProvider urlProvider; private final MavenClassLoaders classLoaders; - private final Logger logger; + private static final Logger logger = Logger.getLogger(MavenRepository.class); public MavenRepository( final MavenUrlProvider urlProvider ) { CheckArg.isNotNull(urlProvider, "urlProvider"); this.urlProvider = urlProvider; this.classLoaders = new MavenClassLoaders(this); - this.logger = Logger.getLogger(this.getClass()); assert this.logger != null; assert this.urlProvider != null; } Index: modeshape-common/src/test/java/org/modeshape/common/util/LogContextTest.java =================================================================== --- modeshape-common/src/test/java/org/modeshape/common/util/LogContextTest.java (revision 1596) +++ modeshape-common/src/test/java/org/modeshape/common/util/LogContextTest.java Sat Jan 23 14:42:37 CET 2010 @@ -31,7 +31,7 @@ public class LogContextTest { - private Logger logger; + private static Logger logger; @Before public void beforeEach() { Index: extensions/modeshape-classloader-maven/src/main/java/org/modeshape/maven/spi/JcrMavenUrlProvider.java =================================================================== --- extensions/modeshape-classloader-maven/src/main/java/org/modeshape/maven/spi/JcrMavenUrlProvider.java (revision 1596) +++ extensions/modeshape-classloader-maven/src/main/java/org/modeshape/maven/spi/JcrMavenUrlProvider.java Sat Jan 23 14:55:29 CET 2010 @@ -103,7 +103,7 @@ private String workspaceName; private Credentials credentials; private String pathToTopOfRepository = DEFAULT_PATH_TO_TOP_OF_MAVEN_REPOSITORY; - private final Logger logger = Logger.getLogger(JcrMavenUrlProvider.class); + private static final Logger logger = Logger.getLogger(JcrMavenUrlProvider.class); /** * @@ -482,6 +482,7 @@ private OutputStream stream; private final File file; private final MavenUrl mavenUrl; + private final Logger logger = Logger.getLogger(MavenOutputStream.class); protected MavenOutputStream( final MavenUrl mavenUrl, final File file ) throws FileNotFoundException { @@ -540,7 +541,7 @@ try { inputStream.close(); } catch (IOException ioe) { - Logger.getLogger(this.getClass()).error(ioe, + logger.error(ioe, MavenI18n.errorClosingTempFileStreamAfterWritingContent, mavenUrl, ioe.getMessage()); Index: modeshape-common/src/test/java/org/modeshape/common/statistic/DetailedStatisticsTest.java =================================================================== --- modeshape-common/src/test/java/org/modeshape/common/statistic/DetailedStatisticsTest.java (revision 1596) +++ modeshape-common/src/test/java/org/modeshape/common/statistic/DetailedStatisticsTest.java Sat Jan 23 14:59:04 CET 2010 @@ -37,7 +37,7 @@ private DetailedStatistics intStats = new DetailedStatistics(new IntegerOperations()); private DetailedStatistics floatStats = new DetailedStatistics(new FloatOperations()); - private Logger logger = Logger.getLogger(DetailedStatisticsTest.class); + private static Logger logger = Logger.getLogger(DetailedStatisticsTest.class); @Test public void shouldHaveValidValuesWhenUnused() { Index: modeshape-graph/src/main/java/org/modeshape/graph/request/processor/LoggingRequestProcessor.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/request/processor/LoggingRequestProcessor.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/request/processor/LoggingRequestProcessor.java Sat Jan 23 14:50:01 CET 2010 @@ -65,7 +65,7 @@ public class LoggingRequestProcessor extends RequestProcessor { private final RequestProcessor delegate; - private final Logger logger; + private static final Logger logger = Logger.getLogger(LoggingRequestProcessor.class); private final Logger.Level level; /** @@ -79,7 +79,6 @@ super(delegate.getSourceName(), delegate.getExecutionContext(), null); CheckArg.isNotNull(logger, "logger"); this.delegate = delegate; - this.logger = logger; this.level = level != null ? level : Logger.Level.TRACE; } Index: web/modeshape-web-jcr-rest-client/src/main/java/org/modeshape/web/jcr/rest/client/json/JsonRestClient.java =================================================================== --- web/modeshape-web-jcr-rest-client/src/main/java/org/modeshape/web/jcr/rest/client/json/JsonRestClient.java (revision 1596) +++ web/modeshape-web-jcr-rest-client/src/main/java/org/modeshape/web/jcr/rest/client/json/JsonRestClient.java Sat Jan 23 14:58:54 CET 2010 @@ -52,7 +52,7 @@ /** * The logger. */ - private final Logger logger = Logger.getLogger(JsonRestClient.class); + private static final Logger logger = Logger.getLogger(JsonRestClient.class); // =========================================================================================================================== // Methods Index: extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchSession.java =================================================================== --- extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchSession.java (revision 1596) +++ extensions/modeshape-search-lucene/src/main/java/org/modeshape/search/lucene/LuceneSearchSession.java Sat Jan 23 14:58:11 CET 2010 @@ -121,7 +121,7 @@ private IndexWriter contentWriter; private IndexSearcher contentSearcher; private int numChanges; - private final Logger logger = Logger.getLogger(getClass()); + private static final Logger logger = Logger.getLogger(LuceneSearchSession.class); protected LuceneSearchSession( LuceneSearchWorkspace workspace, LuceneSearchProcessor processor ) { Index: modeshape-common/src/test/java/org/modeshape/common/statistic/HistogramTest.java =================================================================== --- modeshape-common/src/test/java/org/modeshape/common/statistic/HistogramTest.java (revision 1596) +++ modeshape-common/src/test/java/org/modeshape/common/statistic/HistogramTest.java Sat Jan 23 14:42:30 CET 2010 @@ -41,7 +41,7 @@ public class HistogramTest { - private Logger logger = Logger.getLogger(HistogramTest.class); + private static Logger logger = Logger.getLogger(HistogramTest.class); private Inflector inflector = Inflector.getInstance(); public static Histogram createRandomHistogram( T minimum, Index: modeshape-graph/src/main/java/org/modeshape/graph/query/optimize/RuleBasedOptimizer.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/query/optimize/RuleBasedOptimizer.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/query/optimize/RuleBasedOptimizer.java Sat Jan 23 14:49:24 CET 2010 @@ -39,7 +39,7 @@ @Immutable public class RuleBasedOptimizer implements Optimizer { - private final Logger logger = Logger.getLogger(getClass()); + private static final Logger logger = Logger.getLogger(RuleBasedOptimizer.class); /** * {@inheritDoc} Index: extensions/modeshape-connector-jdbc-metadata/src/main/java/org/modeshape/connector/meta/jdbc/JdbcMetadataSource.java =================================================================== --- extensions/modeshape-connector-jdbc-metadata/src/main/java/org/modeshape/connector/meta/jdbc/JdbcMetadataSource.java (revision 1596) +++ extensions/modeshape-connector-jdbc-metadata/src/main/java/org/modeshape/connector/meta/jdbc/JdbcMetadataSource.java Sat Jan 23 14:43:47 CET 2010 @@ -48,7 +48,7 @@ private static final long serialVersionUID = 1L; - private final Logger log = Logger.getLogger(JdbcMetadataSource.class); + private static final Logger log = Logger.getLogger(JdbcMetadataSource.class); protected static final String SOURCE_NAME = "sourceName"; protected static final String ROOT_NODE_UUID = "rootNodeUuid"; Index: web/modeshape-web-jcr-rest-client/src/main/java/org/modeshape/web/jcr/rest/client/json/ServerNode.java =================================================================== --- web/modeshape-web-jcr-rest-client/src/main/java/org/modeshape/web/jcr/rest/client/json/ServerNode.java (revision 1596) +++ web/modeshape-web-jcr-rest-client/src/main/java/org/modeshape/web/jcr/rest/client/json/ServerNode.java Sat Jan 23 14:59:00 CET 2010 @@ -46,7 +46,7 @@ /** * The logger. */ - private final Logger logger = Logger.getLogger(ServerNode.class); + private static final Logger logger = Logger.getLogger(ServerNode.class); /** * The server containing ModeShape repositories. Index: extensions/modeshape-connector-jdbc-metadata/src/main/java/org/modeshape/connector/meta/jdbc/JdbcMetadataRepository.java =================================================================== --- extensions/modeshape-connector-jdbc-metadata/src/main/java/org/modeshape/connector/meta/jdbc/JdbcMetadataRepository.java (revision 1596) +++ extensions/modeshape-connector-jdbc-metadata/src/main/java/org/modeshape/connector/meta/jdbc/JdbcMetadataRepository.java Sat Jan 23 14:43:38 CET 2010 @@ -67,7 +67,7 @@ public final static String TABLES_SEGMENT_NAME = "tables"; public final static String PROCEDURES_SEGMENT_NAME = "procedures"; - private final Logger log = Logger.getLogger(JdbcMetadataRepository.class); + private static final Logger log = Logger.getLogger(JdbcMetadataRepository.class); private final JdbcMetadataSource source; private Map rootNodeProperties; private String databaseProductName; Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrRepository.java =================================================================== --- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrRepository.java (revision 1604) +++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrRepository.java Sat Jan 23 14:52:43 CET 2010 @@ -141,6 +141,7 @@ * @see Option#ANONYMOUS_USER_ROLES */ static final String ANONYMOUS_USER_NAME = ""; + private static final Logger logger = Logger.getLogger(JcrRepository.class); /** * The available options for the {@code JcrRepository}. @@ -479,18 +480,18 @@ } } else { I18n msg = JcrI18n.systemSourceNameOptionValueDoesNotReferenceExistingSource; - Logger.getLogger(getClass()).warn(msg, systemSourceNameValue, systemSourceName); + logger.warn(msg, systemSourceNameValue, systemSourceName); } } catch (InvalidWorkspaceException e) { // Bad workspace name ... systemSourceName = null; I18n msg = JcrI18n.systemSourceNameOptionValueDoesNotReferenceValidWorkspace; - Logger.getLogger(getClass()).warn(msg, systemSourceNameValue, systemSourceName); + logger.warn(msg, systemSourceNameValue, systemSourceName); } catch (IllegalArgumentException e) { // Invalid format ... systemSourceName = null; I18n msg = JcrI18n.systemSourceNameOptionValueIsNotFormattedCorrectly; - Logger.getLogger(getClass()).warn(msg, systemSourceNameValue); + logger.warn(msg, systemSourceNameValue); } } if (systemSourceName == null) { Index: modeshape-graph/src/main/java/org/modeshape/graph/observe/ChangeObserver.java =================================================================== --- modeshape-graph/src/main/java/org/modeshape/graph/observe/ChangeObserver.java (revision 1596) +++ modeshape-graph/src/main/java/org/modeshape/graph/observe/ChangeObserver.java Sat Jan 23 14:48:27 CET 2010 @@ -23,11 +23,12 @@ */ package org.modeshape.graph.observe; -import java.lang.ref.WeakReference; -import java.util.concurrent.CopyOnWriteArraySet; import net.jcip.annotations.ThreadSafe; import org.modeshape.common.util.Logger; +import java.lang.ref.WeakReference; +import java.util.concurrent.CopyOnWriteArraySet; + /** * Abstract class that is used to signal that a change set has occurred. This class is typically subclassed by those that wish to * observe changes in content, and {@link Observable#register(Observer) registered} with a {@link Observable}. Index: modeshape-jcr/src/main/java/org/modeshape/jcr/RepositoryQueryManager.java =================================================================== --- modeshape-jcr/src/main/java/org/modeshape/jcr/RepositoryQueryManager.java (revision 1596) +++ modeshape-jcr/src/main/java/org/modeshape/jcr/RepositoryQueryManager.java Sat Jan 23 14:53:21 CET 2010 @@ -23,14 +23,6 @@ */ package org.modeshape.jcr; -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import javax.jcr.RepositoryException; -import javax.jcr.query.InvalidQueryException; import org.modeshape.common.collection.Problems; import org.modeshape.common.collection.SimpleProblems; import org.modeshape.common.i18n.I18n; @@ -74,6 +66,15 @@ import org.modeshape.search.lucene.LuceneConfigurations; import org.modeshape.search.lucene.LuceneSearchEngine; +import javax.jcr.RepositoryException; +import javax.jcr.query.InvalidQueryException; +import java.io.File; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + /** * */ Index: modeshape-common/src/test/java/org/modeshape/common/util/LoggerTest.java =================================================================== --- modeshape-common/src/test/java/org/modeshape/common/util/LoggerTest.java (revision 1596) +++ modeshape-common/src/test/java/org/modeshape/common/util/LoggerTest.java Sat Jan 23 15:00:09 CET 2010 @@ -24,28 +24,23 @@ package org.modeshape.common.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import org.apache.log4j.Appender; import org.apache.log4j.Level; import org.apache.log4j.SimpleLayout; import org.apache.log4j.WriterAppender; import org.apache.log4j.spi.LoggingEvent; import org.apache.log4j.spi.ThrowableInformation; -import org.modeshape.common.i18n.I18n; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.modeshape.common.i18n.I18n; +import java.io.StringWriter; +import java.util.*; + +import static org.junit.Assert.*; + /** * Test the {@link Logger} class, ensuring that it uses Log4J appropriately. The {@link Logger} class uses the SLF4J generalized * logging framework, which can sit on top of multiple logging frameworks, including Log4J. Therefore, this test assumes that