- Replaced logging with SLF4J. - Optimized the dependencies.
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/4620267a Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/4620267a Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/4620267a Branch: refs/heads/master Commit: 4620267a509db0dbc442d3bd0af0f76969cfad04 Parents: 6449757 Author: Martin Todorov <[email protected]> Authored: Tue Jul 1 17:50:55 2014 +0100 Committer: Martin Todorov <[email protected]> Committed: Tue Jul 1 17:50:55 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/maven/index/DefaultIndexer.java | 2 -- .../org/apache/maven/index/DefaultIndexerEngine.java | 2 -- .../org/apache/maven/index/DefaultNexusIndexer.java | 2 -- .../org/apache/maven/index/DefaultQueryCreator.java | 8 ++++---- .../java/org/apache/maven/index/DefaultScanner.java | 2 -- .../org/apache/maven/index/DefaultScannerListener.java | 2 -- .../org/apache/maven/index/DefaultSearchEngine.java | 12 ++++++++++-- .../index/archetype/AbstractArchetypeDataSource.java | 12 ++++++++++-- .../index/artifact/DefaultArtifactPackagingMapper.java | 11 +++++++++-- .../maven/index/creator/AbstractIndexCreator.java | 12 ++++++++++-- .../index/incremental/DefaultIncrementalHandler.java | 12 ++++++++++-- .../apache/maven/index/packer/DefaultIndexPacker.java | 12 ++++++++++-- .../maven/index/treeview/DefaultIndexTreeView.java | 2 -- .../apache/maven/index/updater/DefaultIndexUpdater.java | 11 +++++++++-- 14 files changed, 72 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexer.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexer.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexer.java index 7f45ba1..46a3c9d 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexer.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexer.java @@ -42,7 +42,6 @@ import org.apache.maven.index.expr.SearchExpression; import org.apache.maven.index.expr.SourcedSearchExpression; import org.apache.maven.index.util.IndexCreatorSorter; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; /** @@ -53,7 +52,6 @@ import org.codehaus.plexus.util.IOUtil; @Singleton @Named public class DefaultIndexer - extends AbstractLogEnabled implements Indexer { @Requirement http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java index a42b798..9b3249f 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultIndexerEngine.java @@ -36,7 +36,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator; -import org.codehaus.plexus.logging.AbstractLogEnabled; /** * A default {@link IndexerEngine} implementation. @@ -46,7 +45,6 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; @Singleton @Named public class DefaultIndexerEngine - extends AbstractLogEnabled implements IndexerEngine { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java index 18639a7..88f9362 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultNexusIndexer.java @@ -44,7 +44,6 @@ import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException; import org.apache.maven.index.expr.SearchExpression; import org.apache.maven.index.util.IndexCreatorSorter; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; /** @@ -61,7 +60,6 @@ import org.codehaus.plexus.util.FileUtils; @Singleton @Named public class DefaultNexusIndexer - extends AbstractLogEnabled implements NexusIndexer { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultQueryCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultQueryCreator.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultQueryCreator.java index d7bfe6d..b00cd96 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultQueryCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultQueryCreator.java @@ -40,8 +40,8 @@ import org.apache.maven.index.creator.JarFileContentsIndexCreator; import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator; import org.apache.maven.index.expr.SearchExpression; import org.apache.maven.index.expr.SearchTyped; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A default {@link QueryCreator} constructs Lucene query for provided query text. @@ -68,8 +68,8 @@ import org.codehaus.plexus.logging.Logger; public class DefaultQueryCreator implements QueryCreator { - @Requirement - private Logger logger; + + private final Logger logger = LoggerFactory.getLogger( getClass() ); protected Logger getLogger() { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultScanner.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultScanner.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultScanner.java index ea1380a..345f312 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultScanner.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultScanner.java @@ -29,7 +29,6 @@ import java.util.TreeSet; import org.apache.maven.index.context.IndexingContext; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; /** * A default repository scanner for Maven 2 repository. @@ -40,7 +39,6 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; @Singleton @Named public class DefaultScanner - extends AbstractLogEnabled implements Scanner { @Requirement http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java index f9b3673..52b94ec 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultScannerListener.java @@ -35,7 +35,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.util.Bits; import org.apache.maven.index.context.IndexingContext; -import org.codehaus.plexus.logging.AbstractLogEnabled; /** * A default scanning listener @@ -43,7 +42,6 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; * @author Eugene Kuleshov */ public class DefaultScannerListener - extends AbstractLogEnabled implements ArtifactScanningListener { private final IndexingContext context; http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java index 0e485af..841bf1c 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultSearchEngine.java @@ -41,7 +41,8 @@ import org.apache.maven.index.context.IndexUtils; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.context.NexusIndexMultiReader; import org.apache.maven.index.context.NexusIndexMultiSearcher; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A default search engine implementation @@ -52,9 +53,16 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; @Singleton @Named public class DefaultSearchEngine - extends AbstractLogEnabled implements SearchEngine { + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + @Deprecated public Set<ArtifactInfo> searchFlat( Comparator<ArtifactInfo> artifactInfoComparator, IndexingContext indexingContext, Query query ) http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java b/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java index 8647ae9..8450bc1 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java +++ b/indexer-core/src/main/java/org/apache/maven/index/archetype/AbstractArchetypeDataSource.java @@ -37,12 +37,20 @@ import org.apache.maven.index.MAVEN; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.expr.SourcedSearchExpression; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractArchetypeDataSource - extends AbstractLogEnabled implements ArchetypeDataSource { + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + @Requirement private Indexer indexer; http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java b/indexer-core/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java index 86bcc7e..04b1b16 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java +++ b/indexer-core/src/main/java/org/apache/maven/index/artifact/DefaultArtifactPackagingMapper.java @@ -28,8 +28,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A very simple artifact packaging mapper, that has everything for quick-start wired in this class. Also, it takes into @@ -41,10 +42,16 @@ import org.codehaus.plexus.util.IOUtil; @Singleton @Named public class DefaultArtifactPackagingMapper - extends AbstractLogEnabled implements ArtifactPackagingMapper { + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + public static final String MAPPING_PROPERTIES_FILE = "packaging2extension-mapping.properties"; private File propertiesFile; http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/creator/AbstractIndexCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/AbstractIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/AbstractIndexCreator.java index 39dbe47..7252fff 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/creator/AbstractIndexCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/creator/AbstractIndexCreator.java @@ -24,7 +24,8 @@ import java.util.Collections; import java.util.List; import org.apache.maven.index.context.IndexCreator; -import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An abstract base class for {@link IndexCreator} implementations. @@ -32,9 +33,16 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; * @author Jason van Zyl */ public abstract class AbstractIndexCreator - extends AbstractLogEnabled implements IndexCreator { + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + private final String id; private final List<String> creatorDependencies; http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java b/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java index 88115bc..be07580 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java +++ b/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java @@ -46,15 +46,23 @@ import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.packer.IndexPackingRequest; import org.apache.maven.index.updater.IndexUpdateRequest; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Singleton @Named public class DefaultIncrementalHandler - extends AbstractLogEnabled implements IncrementalHandler { + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + public List<Integer> getIncrementalUpdates( IndexPackingRequest request, Properties properties ) throws IOException { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java b/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java index 56867c7..0b70324 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java +++ b/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java @@ -60,9 +60,10 @@ import org.apache.maven.index.creator.LegacyDocumentUpdater; import org.apache.maven.index.incremental.IncrementalHandler; import org.apache.maven.index.updater.IndexDataWriter; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A default {@link IndexPacker} implementation. Creates the properties, legacy index zip and new gz files. @@ -73,9 +74,16 @@ import org.codehaus.plexus.util.IOUtil; @Singleton @Named public class DefaultIndexPacker - extends AbstractLogEnabled implements IndexPacker { + + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + @Requirement( role = IncrementalHandler.class ) IncrementalHandler incrementalHandler; http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java b/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java index e2dc8cb..649c161 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java +++ b/indexer-core/src/main/java/org/apache/maven/index/treeview/DefaultIndexTreeView.java @@ -39,13 +39,11 @@ import org.apache.maven.index.MAVEN; import org.apache.maven.index.expr.SourcedSearchExpression; import org.apache.maven.index.treeview.TreeNode.Type; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; @Singleton @Named public class DefaultIndexTreeView - extends AbstractLogEnabled implements IndexTreeView { @Requirement http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/4620267a/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java b/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java index 224d118..6488847 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java +++ b/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java @@ -70,10 +70,11 @@ import org.apache.maven.index.fs.Locker; import org.apache.maven.index.incremental.IncrementalHandler; import org.apache.maven.index.updater.IndexDataReader.IndexDataReadResult; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.io.RawInputStreamFacade; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A default index updater implementation @@ -84,10 +85,16 @@ import org.codehaus.plexus.util.io.RawInputStreamFacade; @Singleton @Named public class DefaultIndexUpdater - extends AbstractLogEnabled implements IndexUpdater { + private final Logger logger = LoggerFactory.getLogger( getClass() ); + + protected Logger getLogger() + { + return logger; + } + @Requirement( role = IncrementalHandler.class ) IncrementalHandler incrementalHandler;
