Repository: maven-indexer Updated Branches: refs/heads/master a11321c49 -> 7d5ed7af1
- Replaced @Component with @Named / @Singleton. - 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/6449757a Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/6449757a Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/6449757a Branch: refs/heads/master Commit: 6449757a18a4c636ea24ecbcc9de6e44636b814c Parents: fb50105 Author: Martin Todorov <[email protected]> Authored: Tue Jul 1 17:30:34 2014 +0100 Committer: Martin Todorov <[email protected]> Committed: Tue Jul 1 17:30:34 2014 +0100 ---------------------------------------------------------------------- .../maven/index/DefaultArtifactContextProducer.java | 6 ++++-- .../main/java/org/apache/maven/index/DefaultIndexer.java | 6 ++++-- .../java/org/apache/maven/index/DefaultIndexerEngine.java | 6 ++++-- .../java/org/apache/maven/index/DefaultNexusIndexer.java | 6 ++++-- .../java/org/apache/maven/index/DefaultQueryCreator.java | 6 ++++-- .../main/java/org/apache/maven/index/DefaultScanner.java | 6 ++++-- .../java/org/apache/maven/index/DefaultSearchEngine.java | 6 ++++-- .../maven/index/archetype/NexusArchetypeDataSource.java | 7 ++++--- .../index/artifact/DefaultArtifactPackagingMapper.java | 6 ++++-- .../org/apache/maven/index/artifact/M1GavCalculator.java | 7 ++++--- .../org/apache/maven/index/artifact/M2GavCalculator.java | 7 ++++--- .../maven/index/creator/JarFileContentsIndexCreator.java | 7 ++++--- .../creator/MavenArchetypeArtifactInfoIndexCreator.java | 7 ++++--- .../creator/MavenPluginArtifactInfoIndexCreator.java | 7 ++++--- .../index/creator/MinimalArtifactInfoIndexCreator.java | 5 ++++- .../maven/index/creator/OsgiArtifactIndexCreator.java | 8 +++++--- .../index/incremental/DefaultIncrementalHandler.java | 6 ++++-- .../org/apache/maven/index/packer/DefaultIndexPacker.java | 10 ++++------ .../apache/maven/index/treeview/DefaultIndexTreeView.java | 6 ++++-- .../apache/maven/index/updater/DefaultIndexUpdater.java | 7 ++++--- 20 files changed, 81 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java index b2f229a..2806b60 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java +++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import org.apache.maven.index.artifact.ArtifactPackagingMapper; @@ -29,7 +31,6 @@ import org.apache.maven.index.locator.GavHelpedLocator; import org.apache.maven.index.locator.Locator; import org.apache.maven.index.locator.MetadataLocator; import org.apache.maven.index.locator.PomLocator; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.util.StringUtils; @@ -39,7 +40,8 @@ import org.codehaus.plexus.util.StringUtils; * @author Tamas Cservenak * @author Eugene Kuleshov */ -@Component( role = ArtifactContextProducer.class ) +@Singleton +@Named public class DefaultArtifactContextProducer implements ArtifactContextProducer { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 4b96cea..7f45ba1 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 @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -39,7 +41,6 @@ import org.apache.maven.index.context.MergedIndexingContext; 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.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; @@ -49,7 +50,8 @@ import org.codehaus.plexus.util.IOUtil; * * @author Tamas Cservenak */ -@Component( role = Indexer.class ) +@Singleton +@Named public class DefaultIndexer extends AbstractLogEnabled implements Indexer http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 38a2c55..a42b798 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 @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -34,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.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; /** @@ -42,7 +43,8 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; * * @author Tamas Cservenak */ -@Component( role = IndexerEngine.class ) +@Singleton +@Named public class DefaultIndexerEngine extends AbstractLogEnabled implements IndexerEngine http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 18179bf..18639a7 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 @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.IOException; import java.util.Collection; @@ -41,7 +43,6 @@ import org.apache.maven.index.context.StaticContextMemberProvider; 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.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; @@ -57,7 +58,8 @@ import org.codehaus.plexus.util.FileUtils; * it's behavior less intuitive. */ @Deprecated -@Component( role = NexusIndexer.class ) +@Singleton +@Named public class DefaultNexusIndexer extends AbstractLogEnabled implements NexusIndexer http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 66ed9a7..d7bfe6d 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 @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.IOException; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; @@ -38,7 +40,6 @@ 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.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; @@ -62,7 +63,8 @@ import org.codehaus.plexus.logging.Logger; * * @author Eugene Kuleshov */ -@Component( role = QueryCreator.class ) +@Singleton +@Named public class DefaultQueryCreator implements QueryCreator { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 5d7a9f1..ea1380a 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 @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.util.Arrays; import java.util.Comparator; @@ -26,7 +28,6 @@ import java.util.Set; import java.util.TreeSet; import org.apache.maven.index.context.IndexingContext; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; @@ -36,7 +37,8 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; * @author Jason Van Zyl * @author Tamas Cservenak */ -@Component( role = Scanner.class ) +@Singleton +@Named public class DefaultScanner extends AbstractLogEnabled implements Scanner http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 759eeb9..0e485af 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 @@ -19,6 +19,8 @@ package org.apache.maven.index; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -39,7 +41,6 @@ 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.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; /** @@ -48,7 +49,8 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; * @author Eugene Kuleshov * @author Tamas Cservenak */ -@Component( role = SearchEngine.class ) +@Singleton +@Named public class DefaultSearchEngine extends AbstractLogEnabled implements SearchEngine http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java b/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java index 005ef9c..ebdc85d 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java +++ b/indexer-core/src/main/java/org/apache/maven/index/archetype/NexusArchetypeDataSource.java @@ -19,13 +19,13 @@ package org.apache.maven.index.archetype; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.util.ArrayList; import java.util.List; -import org.apache.maven.archetype.source.ArchetypeDataSource; import org.apache.maven.index.NexusIndexer; import org.apache.maven.index.context.IndexingContext; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; /** @@ -35,7 +35,8 @@ import org.codehaus.plexus.component.annotations.Requirement; * @deprecated Extend {@link AbstractArchetypeDataSource} instead, and make it suit your case. */ @Deprecated -@Component( role = ArchetypeDataSource.class, hint = "nexus" ) +@Named("nexus") +@Singleton public class NexusArchetypeDataSource extends AbstractArchetypeDataSource { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 9f3caa5..86bcc7e 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 @@ -19,6 +19,8 @@ package org.apache.maven.index.artifact; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -26,7 +28,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.IOUtil; @@ -37,7 +38,8 @@ import org.codehaus.plexus.util.IOUtil; * * @author cstamas */ -@Component( role = ArtifactPackagingMapper.class ) +@Singleton +@Named public class DefaultArtifactPackagingMapper extends AbstractLogEnabled implements ArtifactPackagingMapper http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/artifact/M1GavCalculator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/artifact/M1GavCalculator.java b/indexer-core/src/main/java/org/apache/maven/index/artifact/M1GavCalculator.java index be0615d..c871b90 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/artifact/M1GavCalculator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/artifact/M1GavCalculator.java @@ -19,18 +19,19 @@ package org.apache.maven.index.artifact; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.codehaus.plexus.component.annotations.Component; - /** * An M1 <code>GavCalculator</code>. Heavily under-maintained. * * @author Jason van Zyl * @author Tamas Cservenak */ -@Component( role = GavCalculator.class, hint = "maven1" ) +@Singleton +@Named ("maven1") public class M1GavCalculator implements GavCalculator { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/artifact/M2GavCalculator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/artifact/M2GavCalculator.java b/indexer-core/src/main/java/org/apache/maven/index/artifact/M2GavCalculator.java index 8ec1570..dd8defe 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/artifact/M2GavCalculator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/artifact/M2GavCalculator.java @@ -19,18 +19,19 @@ package org.apache.maven.index.artifact; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.text.ParseException; import java.text.SimpleDateFormat; -import org.codehaus.plexus.component.annotations.Component; - /** * An M2 <code>GavCalculator</code>. * * @author Jason van Zyl * @author Tamas Cservenak */ -@Component( role = GavCalculator.class, hint = "maven2" ) +@Singleton +@Named ("maven2") public class M2GavCalculator implements GavCalculator { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java index 0471405..c30b93a 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/creator/JarFileContentsIndexCreator.java @@ -19,6 +19,8 @@ package org.apache.maven.index.creator; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -33,17 +35,16 @@ import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.IndexerField; import org.apache.maven.index.IndexerFieldVersion; import org.apache.maven.index.MAVEN; -import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.util.zip.ZipFacade; import org.apache.maven.index.util.zip.ZipHandle; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; /** * An index creator used to index Java class names from a Maven artifact (JAR or WAR for now). Will open up the file and * collect all the class names from it. */ -@Component( role = IndexCreator.class, hint = JarFileContentsIndexCreator.ID ) +@Singleton +@Named (JarFileContentsIndexCreator.ID) public class JarFileContentsIndexCreator extends AbstractIndexCreator implements LegacyDocumentUpdater http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java index 639d5f9..c9d3b7a 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenArchetypeArtifactInfoIndexCreator.java @@ -19,6 +19,8 @@ package org.apache.maven.index.creator; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -29,10 +31,8 @@ import org.apache.lucene.document.Document; import org.apache.maven.index.ArtifactContext; import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.IndexerField; -import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.util.zip.ZipFacade; import org.apache.maven.index.util.zip.ZipHandle; -import org.codehaus.plexus.component.annotations.Component; /** * A Maven Archetype index creator used to detect and correct the artifact packaging to "maven-archetype" if the @@ -42,7 +42,8 @@ import org.codehaus.plexus.component.annotations.Component; * * @author cstamas */ -@Component( role = IndexCreator.class, hint = MavenArchetypeArtifactInfoIndexCreator.ID ) +@Singleton +@Named (MavenArchetypeArtifactInfoIndexCreator.ID) public class MavenArchetypeArtifactInfoIndexCreator extends AbstractIndexCreator { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java index 017a1a9..ceb48a6 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreator.java @@ -19,6 +19,8 @@ package org.apache.maven.index.creator; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; @@ -36,10 +38,8 @@ import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.IndexerField; import org.apache.maven.index.IndexerFieldVersion; import org.apache.maven.index.MAVEN; -import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.util.zip.ZipFacade; import org.apache.maven.index.util.zip.ZipHandle; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.configuration.PlexusConfiguration; import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; @@ -51,7 +51,8 @@ import org.codehaus.plexus.util.xml.Xpp3DomBuilder; * * @author cstamas */ -@Component( role = IndexCreator.class, hint = MavenPluginArtifactInfoIndexCreator.ID ) +@Singleton +@Named (MavenPluginArtifactInfoIndexCreator.ID) public class MavenPluginArtifactInfoIndexCreator extends AbstractIndexCreator { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java index f8543d3..f334847 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java @@ -19,6 +19,8 @@ package org.apache.maven.index.creator; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -50,7 +52,8 @@ import org.codehaus.plexus.util.StringUtils; * * @author cstamas */ -@Component( role = IndexCreator.class, hint = MinimalArtifactInfoIndexCreator.ID ) +@Singleton +@Named (MinimalArtifactInfoIndexCreator.ID) public class MinimalArtifactInfoIndexCreator extends AbstractIndexCreator implements LegacyDocumentUpdater http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java b/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java index 730797e..845659f 100644 --- a/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java +++ b/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java @@ -19,6 +19,9 @@ package org.apache.maven.index.creator; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.maven.index.ArtifactContext; @@ -26,10 +29,8 @@ import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.IndexerField; import org.apache.maven.index.IndexerFieldVersion; import org.apache.maven.index.OSGI; -import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.util.zip.ZipFacade; import org.apache.maven.index.util.zip.ZipHandle; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -58,7 +59,8 @@ import java.util.jar.Manifest; * @author Olivier Lamy * @since 4.1.2 */ -@Component( role = IndexCreator.class, hint = OsgiArtifactIndexCreator.ID ) +@Singleton +@Named (OsgiArtifactIndexCreator.ID) public class OsgiArtifactIndexCreator extends AbstractIndexCreator { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 4ddb1aa..88115bc 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 @@ -19,6 +19,8 @@ package org.apache.maven.index.incremental; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; @@ -44,11 +46,11 @@ 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.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; -@Component( role = IncrementalHandler.class ) +@Singleton +@Named public class DefaultIncrementalHandler extends AbstractLogEnabled implements IncrementalHandler http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 e028cb1..56867c7 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 @@ -19,6 +19,8 @@ package org.apache.maven.index.packer; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -26,9 +28,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.TimeZone; @@ -36,9 +36,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; -import org.apache.lucene.document.TextField; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; @@ -61,7 +59,6 @@ import org.apache.maven.index.context.NexusLegacyAnalyzer; 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.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; @@ -73,7 +70,8 @@ import org.codehaus.plexus.util.IOUtil; * @author Tamas Cservenak * @author Eugene Kuleshov */ -@Component( role = IndexPacker.class ) +@Singleton +@Named public class DefaultIndexPacker extends AbstractLogEnabled implements IndexPacker http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 805d762..e2dc8cb 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 @@ -19,6 +19,8 @@ package org.apache.maven.index.treeview; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.IOException; import java.util.HashMap; import java.util.HashSet; @@ -36,12 +38,12 @@ import org.apache.maven.index.IteratorSearchResponse; 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.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.StringUtils; -@Component( role = IndexTreeView.class ) +@Singleton +@Named public class DefaultIndexTreeView extends AbstractLogEnabled implements IndexTreeView http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/6449757a/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 d8fd255..224d118 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 @@ -19,6 +19,8 @@ package org.apache.maven.index.updater; * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -46,7 +48,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexableField; @@ -68,7 +69,6 @@ import org.apache.maven.index.fs.Lock; 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.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.util.FileUtils; @@ -81,7 +81,8 @@ import org.codehaus.plexus.util.io.RawInputStreamFacade; * @author Jason van Zyl * @author Eugene Kuleshov */ -@Component( role = IndexUpdater.class ) +@Singleton +@Named public class DefaultIndexUpdater extends AbstractLogEnabled implements IndexUpdater
