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/08/27 17:38:35 UTC
[4/6] git commit: Merge remote-tracking branch 'asf/master' into
sixpack
Merge remote-tracking branch 'asf/master' into sixpack
Conflicts:
indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/85dace84
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/85dace84
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/85dace84
Branch: refs/heads/master
Commit: 85dace84a9088c59b4de17ea2a957c24f45febb1
Parents: 11bd6b9 7d5ed7a
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Tue Jul 8 10:59:41 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Tue Jul 8 10:59:41 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 | 39 +-
.../maven/index/packer/DefaultIndexPacker.java | 32 +-
.../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 +-
indexer-examples/README.md | 19 +
indexer-examples/pom.xml | 117 ++++++
.../indexer/examples/BasicUsageExample.java | 352 +++++++++++++++++++
.../indexer/examples/BasicUsageExampleTest.java | 32 ++
pom.xml | 48 +--
src/site/site.xml | 5 +-
39 files changed, 912 insertions(+), 207 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/85dace84/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/85dace84/indexer-core/src/main/java/org/apache/maven/index/creator/MinimalArtifactInfoIndexCreator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/85dace84/indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
----------------------------------------------------------------------
diff --cc indexer-core/src/main/java/org/apache/maven/index/incremental/DefaultIncrementalHandler.java
index 75c50dc,be07580..a6b8b9a
--- 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,18 -19,8 +19,6 @@@ package org.apache.maven.index.incremen
* under the License.
*/
- import org.apache.lucene.document.Document;
- import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.index.MultiFields;
- import org.apache.lucene.util.Bits;
- 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;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@@ -47,11 -37,32 +35,34 @@@ import java.util.Set
import java.util.TimeZone;
import java.util.TreeMap;
- @Component(role = IncrementalHandler.class)
++import javax.inject.Named;
++import javax.inject.Singleton;
++
+ import org.apache.lucene.document.Document;
+ import org.apache.lucene.index.IndexReader;
+ import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.search.IndexSearcher;
+ import org.apache.lucene.util.Bits;
+ 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.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/85dace84/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
----------------------------------------------------------------------
diff --cc indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
index ba15396,5d30b7e..4c084f3
--- 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
@@@ -29,15 -33,37 +29,18 @@@ import java.util.Date
import java.util.List;
import java.util.Properties;
import java.util.TimeZone;
-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.StringField;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.store.LockObtainFailedException;
-import org.apache.lucene.util.Bits;
-import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.index.context.DefaultIndexingContext;
-import org.apache.maven.index.context.IndexCreator;
-import org.apache.maven.index.context.IndexUtils;
+
++import javax.inject.Inject;
++import javax.inject.Named;
++import javax.inject.Singleton;
++
import org.apache.maven.index.context.IndexingContext;
-import org.apache.maven.index.context.NexusIndexWriter;
-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;
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.
@@@ -84,7 -124,7 +101,6 @@@ public class DefaultIndexPacke
}
// These are all of the files we'll be dealing with (except for the incremental chunks of course)
-- File legacyFile = new File( request.getTargetDir(), IndexingContext.INDEX_FILE_PREFIX + ".zip" );
File v1File = new File( request.getTargetDir(), IndexingContext.INDEX_FILE_PREFIX + ".gz" );
Properties info = null;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/85dace84/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/85dace84/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/85dace84/pom.xml
----------------------------------------------------------------------