You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2014/07/08 10:56:16 UTC
[1/6] git commit: - Replaced @Component with @Named / @Singleton. -
Optimized the dependencies.
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 <ca...@gmail.com>
Authored: Tue Jul 1 17:30:34 2014 +0100
Committer: Martin Todorov <ca...@gmail.com>
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
[6/6] git commit: POM cleanup after merges
Posted by cs...@apache.org.
POM cleanup after merges
sisu-maven-plugin not needed as project
is Java7 now, and index is automagically
generated
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/7d5ed7af
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/7d5ed7af
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/7d5ed7af
Branch: refs/heads/master
Commit: 7d5ed7af1eff148ab509ae8c89d61f936e37bf2a
Parents: 0ad0a17
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Tue Jul 8 10:55:45 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Tue Jul 8 10:55:45 2014 +0200
----------------------------------------------------------------------
indexer-examples/pom.xml | 14 +++-----------
pom.xml | 24 ++----------------------
2 files changed, 5 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/7d5ed7af/indexer-examples/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-examples/pom.xml b/indexer-examples/pom.xml
index c401813..5a5fcc7 100644
--- a/indexer-examples/pom.xml
+++ b/indexer-examples/pom.xml
@@ -38,8 +38,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
-
<configuration>
<skipTests>true</skipTests>
</configuration>
@@ -55,15 +53,16 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<version>6.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
<!-- For ResourceFetcher implementation, if used -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -76,43 +75,36 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>0.2.1</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
- <version>3.2.2</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
- <id>tests</id>
+ <id>examples</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
-
<configuration>
<skipTests>false</skipTests>
</configuration>
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/7d5ed7af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8e07b0f..15c98fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,26 +348,6 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>sisu-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>process-classes</id>
- <goals>
- <goal>main-index</goal>
- </goals>
- </execution>
- <execution>
- <id>process-test-classes</id>
- <goals>
- <goal>test-index</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -463,12 +443,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[2/6] git commit: - Replaced logging with SLF4J. - Optimized the
dependencies.
Posted by cs...@apache.org.
- 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 <ca...@gmail.com>
Authored: Tue Jul 1 17:50:55 2014 +0100
Committer: Martin Todorov <ca...@gmail.com>
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;
[4/6] git commit: - Replaced the plexus-component-metadata plugin
with the sisu-maven-plugin.
Posted by cs...@apache.org.
- Replaced the plexus-component-metadata plugin with the sisu-maven-plugin.
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/377d9f97
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/377d9f97
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/377d9f97
Branch: refs/heads/master
Commit: 377d9f973d14d6ca002e8cb9f60d1c127cc6ed30
Parents: 22c618d
Author: Martin Todorov <ca...@gmail.com>
Authored: Tue Jul 1 19:48:02 2014 +0100
Committer: Martin Todorov <ca...@gmail.com>
Committed: Tue Jul 1 19:48:02 2014 +0100
----------------------------------------------------------------------
pom.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/377d9f97/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae6dca8..ae0437b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,19 +347,20 @@ under the License.
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+ <version>1.4</version>
<executions>
<execution>
<id>process-classes</id>
<goals>
- <goal>generate-metadata</goal>
+ <goal>main-index</goal>
</goals>
</execution>
<execution>
<id>process-test-classes</id>
<goals>
- <goal>generate-test-metadata</goal>
+ <goal>test-index</goal>
</goals>
</execution>
</executions>
[5/6] git commit: Merge remote-tracking branch 'martin/MINDEXER-80'
Posted by cs...@apache.org.
Merge remote-tracking branch 'martin/MINDEXER-80'
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/0ad0a177
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/0ad0a177
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/0ad0a177
Branch: refs/heads/master
Commit: 0ad0a17781f7791989ed457bc7b78eb7c2e211b3
Parents: a11321c 377d9f9
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Tue Jul 8 10:41:05 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Tue Jul 8 10:41:05 2014 +0200
----------------------------------------------------------------------
.../apache/maven/index/cli/NexusIndexerCli.java | 11 ++++
.../index/cli/AbstractNexusIndexerCliTest.java | 9 +++
.../index/DefaultArtifactContextProducer.java | 19 ++++--
.../org/apache/maven/index/DefaultIndexer.java | 31 ++++++----
.../maven/index/DefaultIndexerEngine.java | 8 +--
.../apache/maven/index/DefaultNexusIndexer.java | 35 +++++++----
.../apache/maven/index/DefaultQueryCreator.java | 14 +++--
.../org/apache/maven/index/DefaultScanner.java | 21 ++++---
.../maven/index/DefaultScannerListener.java | 2 -
.../apache/maven/index/DefaultSearchEngine.java | 18 ++++--
.../archetype/AbstractArchetypeDataSource.java | 24 ++++++--
.../archetype/NexusArchetypeDataSource.java | 23 +++++--
.../DefaultArtifactPackagingMapper.java | 17 +++--
.../maven/index/artifact/M1GavCalculator.java | 7 ++-
.../maven/index/artifact/M2GavCalculator.java | 7 ++-
.../index/creator/AbstractIndexCreator.java | 12 +++-
.../creator/JarFileContentsIndexCreator.java | 7 ++-
.../MavenArchetypeArtifactInfoIndexCreator.java | 7 ++-
.../MavenPluginArtifactInfoIndexCreator.java | 7 ++-
.../MinimalArtifactInfoIndexCreator.java | 5 +-
.../index/creator/OsgiArtifactIndexCreator.java | 8 ++-
.../incremental/DefaultIncrementalHandler.java | 18 ++++--
.../maven/index/packer/DefaultIndexPacker.java | 34 ++++++----
.../index/treeview/DefaultIndexTreeView.java | 21 ++++---
.../index/updater/DefaultIndexUpdater.java | 35 ++++++-----
.../maven/index/AbstractIndexCreatorHelper.java | 4 +-
.../apache/maven/index/AbstractTestSupport.java | 38 ++++++++++++
.../maven/index/SearchWithAnEmptyIndexTest.java | 3 +-
.../JarFileContentsIndexCreatorTest.java | 4 +-
...MavenPluginArtifactInfoIndexCreatorTest.java | 5 +-
.../creator/OsgiArtifactIndexCreatorTest.java | 4 +-
.../updater/DefaultIndexUpdaterEmbeddingIT.java | 65 ++++++++++++--------
.../index/util/IndexCreatorSorterTest.java | 4 +-
pom.xml | 9 +--
34 files changed, 368 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/0ad0a177/pom.xml
----------------------------------------------------------------------
[3/6] git commit: - Replaced all the @Requirements with finals and
constructors. - Optimized the dependencies.
Posted by cs...@apache.org.
- Replaced all the @Requirements with finals and constructors.
- 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/22c618d7
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/22c618d7
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/22c618d7
Branch: refs/heads/master
Commit: 22c618d7574ee6acec7fc042f386dab6ec2d1c86
Parents: 4620267
Author: Martin Todorov <ca...@gmail.com>
Authored: Tue Jul 1 19:20:44 2014 +0100
Committer: Martin Todorov <ca...@gmail.com>
Committed: Tue Jul 1 19:20:44 2014 +0100
----------------------------------------------------------------------
.../apache/maven/index/cli/NexusIndexerCli.java | 11 ++++
.../index/cli/AbstractNexusIndexerCliTest.java | 9 +++
.../index/DefaultArtifactContextProducer.java | 13 +++-
.../org/apache/maven/index/DefaultIndexer.java | 23 ++++---
.../apache/maven/index/DefaultNexusIndexer.java | 27 +++++---
.../org/apache/maven/index/DefaultScanner.java | 13 +++-
.../archetype/AbstractArchetypeDataSource.java | 12 +++-
.../archetype/NexusArchetypeDataSource.java | 16 ++++-
.../maven/index/packer/DefaultIndexPacker.java | 12 +++-
.../index/treeview/DefaultIndexTreeView.java | 13 +++-
.../index/updater/DefaultIndexUpdater.java | 19 +++---
.../maven/index/AbstractIndexCreatorHelper.java | 4 +-
.../apache/maven/index/AbstractTestSupport.java | 38 ++++++++++++
.../maven/index/SearchWithAnEmptyIndexTest.java | 3 +-
.../JarFileContentsIndexCreatorTest.java | 4 +-
...MavenPluginArtifactInfoIndexCreatorTest.java | 5 +-
.../creator/OsgiArtifactIndexCreatorTest.java | 4 +-
.../updater/DefaultIndexUpdaterEmbeddingIT.java | 65 ++++++++++++--------
.../index/util/IndexCreatorSorterTest.java | 4 +-
19 files changed, 211 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
----------------------------------------------------------------------
diff --git a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index 1f5e061..2dbbdc9 100644
--- a/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
+++ b/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
@@ -46,6 +46,9 @@ import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.packer.IndexPackingRequest.IndexFormat;
import org.apache.maven.index.updater.DefaultIndexUpdater;
+import org.codehaus.plexus.DefaultContainerConfiguration;
+import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -240,6 +243,14 @@ public class NexusIndexerCli
public void invokePlexusComponent( final CommandLine cli, PlexusContainer plexus )
throws Exception
{
+ final DefaultContainerConfiguration configuration = new DefaultContainerConfiguration();
+ configuration.setClassWorld( ( (DefaultPlexusContainer) plexus ).getClassWorld() );
+ configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+
+ // replace plexus, as PlexusCli is blunt, does not allow to modify configuration
+ // TODO: get rid of PlexusCli use!
+ plexus = new DefaultPlexusContainer( configuration );
+
if ( cli.hasOption( QUIET ) )
{
setLogLevel( plexus, Logger.LEVEL_DISABLED );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-cli/src/test/java/org/apache/maven/index/cli/AbstractNexusIndexerCliTest.java
----------------------------------------------------------------------
diff --git a/indexer-cli/src/test/java/org/apache/maven/index/cli/AbstractNexusIndexerCliTest.java b/indexer-cli/src/test/java/org/apache/maven/index/cli/AbstractNexusIndexerCliTest.java
index 112318e..63b0e26 100644
--- a/indexer-cli/src/test/java/org/apache/maven/index/cli/AbstractNexusIndexerCliTest.java
+++ b/indexer-cli/src/test/java/org/apache/maven/index/cli/AbstractNexusIndexerCliTest.java
@@ -32,6 +32,8 @@ import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.SearchType;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.junit.Ignore;
@@ -63,6 +65,13 @@ public abstract class AbstractNexusIndexerCliTest
protected OutputStream out;
@Override
+ protected void customizeContainerConfiguration( final ContainerConfiguration containerConfiguration )
+ {
+ super.customizeContainerConfiguration( containerConfiguration );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+ }
+
+ @Override
protected void setUp()
throws Exception
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 2806b60..35886cb 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,7 @@ package org.apache.maven.index;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
@@ -31,7 +32,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.Requirement;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -45,13 +45,20 @@ import org.codehaus.plexus.util.StringUtils;
public class DefaultArtifactContextProducer
implements ArtifactContextProducer
{
- @Requirement
- private ArtifactPackagingMapper mapper;
+
+ private final ArtifactPackagingMapper mapper;
private GavHelpedLocator pl = new PomLocator();
private Locator ml = new MetadataLocator();
+
+ @Inject
+ public DefaultArtifactContextProducer( ArtifactPackagingMapper mapper )
+ {
+ this.mapper = mapper;
+ }
+
/**
* Get ArtifactContext for given pom or artifact (jar, war, etc). A file can be
*/
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 46a3c9d..03999bc 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,7 @@ package org.apache.maven.index;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
@@ -41,7 +42,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.Requirement;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -54,14 +54,23 @@ import org.codehaus.plexus.util.IOUtil;
public class DefaultIndexer
implements Indexer
{
- @Requirement
- private SearchEngine searcher;
- @Requirement
- private IndexerEngine indexerEngine;
+ private final SearchEngine searcher;
- @Requirement
- private QueryCreator queryCreator;
+ private final IndexerEngine indexerEngine;
+
+ private final QueryCreator queryCreator;
+
+
+ @Inject
+ public DefaultIndexer( SearchEngine searcher,
+ IndexerEngine indexerEngine,
+ QueryCreator queryCreator )
+ {
+ this.searcher = searcher;
+ this.indexerEngine = indexerEngine;
+ this.queryCreator = queryCreator;
+ }
// ----------------------------------------------------------------------------
// Contexts
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 88f9362..0d976a1 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,7 @@ package org.apache.maven.index;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
@@ -43,7 +44,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.Requirement;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -63,20 +63,29 @@ public class DefaultNexusIndexer
implements NexusIndexer
{
- @Requirement
- private Indexer indexer;
+ private final Indexer indexer;
- @Requirement
- private Scanner scanner;
+ private final Scanner scanner;
- @Requirement
- private IndexerEngine indexerEngine;
+ private final IndexerEngine indexerEngine;
- @Requirement
- private QueryCreator queryCreator;
+ private final QueryCreator queryCreator;
private final Map<String, IndexingContext> indexingContexts = new ConcurrentHashMap<String, IndexingContext>();
+
+ @Inject
+ public DefaultNexusIndexer( Indexer indexer,
+ Scanner scanner,
+ IndexerEngine indexerEngine,
+ QueryCreator queryCreator )
+ {
+ this.indexer = indexer;
+ this.scanner = scanner;
+ this.indexerEngine = indexerEngine;
+ this.queryCreator = queryCreator;
+ }
+
// ----------------------------------------------------------------------------
// Contexts
// ----------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 345f312..58f0973 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,7 @@ package org.apache.maven.index;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
@@ -28,7 +29,6 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.maven.index.context.IndexingContext;
-import org.codehaus.plexus.component.annotations.Requirement;
/**
* A default repository scanner for Maven 2 repository.
@@ -41,8 +41,15 @@ import org.codehaus.plexus.component.annotations.Requirement;
public class DefaultScanner
implements Scanner
{
- @Requirement
- private ArtifactContextProducer artifactContextProducer;
+
+ private final ArtifactContextProducer artifactContextProducer;
+
+
+ @Inject
+ public DefaultScanner( ArtifactContextProducer artifactContextProducer )
+ {
+ this.artifactContextProducer = artifactContextProducer;
+ }
public ScanningResult scan( ScanningRequest request )
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 8450bc1..f3f7bd5 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
@@ -19,6 +19,7 @@ package org.apache.maven.index.archetype;
* under the License.
*/
+import javax.inject.Inject;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,7 +37,6 @@ import org.apache.maven.index.Indexer;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,8 +51,14 @@ public abstract class AbstractArchetypeDataSource
return logger;
}
- @Requirement
- private Indexer indexer;
+ private final Indexer indexer;
+
+
+ @Inject
+ protected AbstractArchetypeDataSource( Indexer indexer )
+ {
+ this.indexer = indexer;
+ }
public ArchetypeCatalog getArchetypeCatalog( final Properties properties )
throws ArchetypeDataSourceException
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 ebdc85d..60e605a 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,14 +19,15 @@ package org.apache.maven.index.archetype;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.index.Indexer;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
-import org.codehaus.plexus.component.annotations.Requirement;
/**
* Nexus Archetype Data Source.
@@ -40,8 +41,17 @@ import org.codehaus.plexus.component.annotations.Requirement;
public class NexusArchetypeDataSource
extends AbstractArchetypeDataSource
{
- @Requirement
- private NexusIndexer nexusIndexer;
+
+ private final NexusIndexer nexusIndexer;
+
+
+ @Inject
+ public NexusArchetypeDataSource( Indexer indexer,
+ NexusIndexer nexusIndexer )
+ {
+ super( indexer );
+ this.nexusIndexer = nexusIndexer;
+ }
@Override
protected List<IndexingContext> getIndexingContexts()
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 0b70324..5d30b7e 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,7 @@ package org.apache.maven.index.packer;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.BufferedOutputStream;
@@ -59,7 +60,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.Requirement;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.slf4j.Logger;
@@ -84,8 +84,14 @@ public class DefaultIndexPacker
return logger;
}
- @Requirement( role = IncrementalHandler.class )
- IncrementalHandler incrementalHandler;
+ private final IncrementalHandler incrementalHandler;
+
+
+ @Inject
+ public DefaultIndexPacker( IncrementalHandler incrementalHandler )
+ {
+ this.incrementalHandler = incrementalHandler;
+ }
public void packIndex( IndexPackingRequest request )
throws IOException, IllegalArgumentException
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 649c161..ee1fc77 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,7 @@ package org.apache.maven.index.treeview;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.IOException;
@@ -38,7 +39,6 @@ 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.Requirement;
import org.codehaus.plexus.util.StringUtils;
@Singleton
@@ -46,8 +46,15 @@ import org.codehaus.plexus.util.StringUtils;
public class DefaultIndexTreeView
implements IndexTreeView
{
- @Requirement
- private Indexer indexer;
+
+ private final Indexer indexer;
+
+
+ @Inject
+ public DefaultIndexTreeView( Indexer indexer )
+ {
+ this.indexer = indexer;
+ }
protected Indexer getIndexer()
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/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 6488847..e659e99 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,7 @@ package org.apache.maven.index.updater;
* under the License.
*/
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.BufferedInputStream;
@@ -69,7 +70,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.Requirement;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.io.RawInputStreamFacade;
@@ -95,21 +95,16 @@ public class DefaultIndexUpdater
return logger;
}
- @Requirement( role = IncrementalHandler.class )
- IncrementalHandler incrementalHandler;
+ private final IncrementalHandler incrementalHandler;
- @Requirement( role = IndexUpdateSideEffect.class )
- private List<IndexUpdateSideEffect> sideEffects;
+ private final List<IndexUpdateSideEffect> sideEffects;
- public DefaultIndexUpdater( final IncrementalHandler handler, final List<IndexUpdateSideEffect> mySideeffects )
- {
- incrementalHandler = handler;
- sideEffects = mySideeffects;
- }
- public DefaultIndexUpdater()
+ @Inject
+ public DefaultIndexUpdater( final IncrementalHandler incrementalHandler, final List<IndexUpdateSideEffect> sideEffects )
{
-
+ this.incrementalHandler = incrementalHandler;
+ this.sideEffects = sideEffects;
}
public IndexUpdateResult fetchAndUpdateIndex( final IndexUpdateRequest updateRequest )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/AbstractIndexCreatorHelper.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/AbstractIndexCreatorHelper.java b/indexer-core/src/test/java/org/apache/maven/index/AbstractIndexCreatorHelper.java
index 6d55134..6de6441 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/AbstractIndexCreatorHelper.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/AbstractIndexCreatorHelper.java
@@ -25,17 +25,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import org.apache.maven.index.context.DefaultIndexingContext;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
import org.apache.maven.index.creator.MavenArchetypeArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
public class AbstractIndexCreatorHelper
- extends PlexusTestCase
+ extends AbstractTestSupport
{
public List<IndexCreator> DEFAULT_CREATORS;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/AbstractTestSupport.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/AbstractTestSupport.java b/indexer-core/src/test/java/org/apache/maven/index/AbstractTestSupport.java
new file mode 100644
index 0000000..8ea204d
--- /dev/null
+++ b/indexer-core/src/test/java/org/apache/maven/index/AbstractTestSupport.java
@@ -0,0 +1,38 @@
+package org.apache.maven.index;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusTestCase;
+
+/**
+ * @author cstamas
+ */
+public class AbstractTestSupport
+ extends PlexusTestCase
+{
+ @Override
+ protected void customizeContainerConfiguration( final ContainerConfiguration containerConfiguration )
+ {
+ super.customizeContainerConfiguration( containerConfiguration );
+ containerConfiguration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java b/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java
index 12642eb..55c3ad2 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java
@@ -26,7 +26,6 @@ import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.expr.StringSearchExpression;
import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.packer.IndexPackingRequest;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -38,7 +37,7 @@ import java.util.List;
* @author Olivier Lamy
*/
public class SearchWithAnEmptyIndexTest
- extends PlexusTestCase
+ extends AbstractTestSupport
{
protected List<IndexCreator> indexCreators;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
index 304b21f..a0ef5b8 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
@@ -24,13 +24,13 @@ import java.io.File;
import org.apache.maven.index.ArtifactContext;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.context.IndexCreator;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.index.AbstractTestSupport;
/**
* @author Alin Dreghiciu
*/
public class JarFileContentsIndexCreatorTest
- extends PlexusTestCase
+ extends AbstractTestSupport
{
protected IndexCreator indexCreator;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
index 49656c2..a149d45 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
@@ -26,14 +26,13 @@ import java.util.List;
import org.apache.maven.index.ArtifactContext;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.context.IndexCreator;
-import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.index.AbstractTestSupport;
/**
* @author juven
*/
public class MavenPluginArtifactInfoIndexCreatorTest
- extends PlexusTestCase
+ extends AbstractTestSupport
{
protected IndexCreator indexCreator;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
index d5bec36..6965cd3 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
@@ -33,7 +33,7 @@ import org.apache.maven.index.OSGI;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.expr.StringSearchExpression;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.index.AbstractTestSupport;
import org.codehaus.plexus.util.FileUtils;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertThat;
* @author Olivier Lamy
*/
public class OsgiArtifactIndexCreatorTest
- extends PlexusTestCase
+ extends AbstractTestSupport
{
protected IndexCreator indexCreator;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
index bac31d3..602758c 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
@@ -34,7 +34,9 @@ import org.apache.maven.index.updater.fixtures.ServerTestFixture;
import org.apache.maven.index.updater.fixtures.TransferListenerFixture;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.events.TransferEvent;
+import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.FileUtils;
@@ -52,6 +54,45 @@ public class DefaultIndexUpdaterEmbeddingIT
private WagonHelper wagonHelper;
+ @Override
+ public void setUp()
+ throws Exception
+ {
+ // FIXME: Try to detect the port from the system environment.
+ int port = -1;
+ String portStr = System.getProperty( "index-server" );
+ if ( portStr != null )
+ {
+ port = Integer.parseInt( portStr );
+ }
+
+ if ( port < 1024 )
+ {
+ System.out.println( "Using default port: 8080" );
+ port = 8080;
+ }
+
+ baseUrl = "http://127.0.0.1:" + port + "/";
+
+ server = new ServerTestFixture( port );
+ final DefaultContainerConfiguration configuration = new DefaultContainerConfiguration();
+ configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+ container = new DefaultPlexusContainer(configuration);
+
+ updater = container.lookup( IndexUpdater.class, "default" );
+
+ wagonHelper = new WagonHelper( container );
+ }
+
+ @Override
+ public void tearDown()
+ throws Exception
+ {
+ container.release( updater );
+ container.dispose();
+ server.stop();
+ }
+
public void testBasicIndexRetrieval()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{
@@ -425,28 +466,4 @@ public class DefaultIndexUpdaterEmbeddingIT
return new DefaultIndexingContext( repositoryId, repositoryId, basedir, basedir, baseUrl, baseUrl, creators,
true );
}
-
- @Override
- public void setUp()
- throws Exception
- {
-
- server = new ServerTestFixture( 0 );
- container = new DefaultPlexusContainer();
-
- baseUrl = "http://127.0.0.1:" + server.getPort() + "/";
-
- updater = container.lookup( IndexUpdater.class, "default" );
-
- wagonHelper = new WagonHelper( container );
- }
-
- @Override
- public void tearDown()
- throws Exception
- {
- container.release( updater );
- container.dispose();
- server.stop();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22c618d7/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java b/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
index 8dd1e9a..4ac1eeb 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/util/IndexCreatorSorterTest.java
@@ -24,11 +24,11 @@ import java.util.Arrays;
import java.util.List;
import org.apache.maven.index.context.IndexCreator;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.index.AbstractTestSupport;
import org.junit.Assert;
public class IndexCreatorSorterTest
- extends PlexusTestCase
+ extends AbstractTestSupport
{
public void testLookupList()
throws Exception