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:32 UTC
[1/6] Multiple fixes:
Repository: maven-indexer
Updated Branches:
refs/heads/master 7e7202d77 -> b03b841c0
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java
index c0a4ed9..95300bd 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java
@@ -26,6 +26,7 @@ import java.util.Properties;
import java.util.Set;
import junit.framework.Assert;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.packer.IndexPackingRequest;
@@ -88,14 +89,22 @@ public class Nexus1911IncrementalTest
public void testNoIncremental()
throws Exception
{
- IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir );
- request.setCreateIncrementalChunks( true );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir );
+ request.setCreateIncrementalChunks( true );
+ packer.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() );
Properties props = getPropertiesFromFiles( indexPackDir.listFiles() );
- Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) );
Assert.assertFalse( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".1.gz" ) );
@@ -115,16 +124,24 @@ public class Nexus1911IncrementalTest
public void test1Incremental()
throws Exception
{
- IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir );
- request.setCreateIncrementalChunks( true );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir );
+ request.setCreateIncrementalChunks( true );
+ packer.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), IndexPackingRequest.MAX_CHUNKS );
Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() );
Properties props = getPropertiesFromFiles( indexPackDir.listFiles() );
- Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".1.gz" ) );
@@ -144,17 +161,25 @@ public class Nexus1911IncrementalTest
public void test2Incremental()
throws Exception
{
- IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir );
- request.setCreateIncrementalChunks( true );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir );
+ request.setCreateIncrementalChunks( true );
+ packer.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request );
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), request );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), IndexPackingRequest.MAX_CHUNKS );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), IndexPackingRequest.MAX_CHUNKS );
Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() );
Properties props = getPropertiesFromFiles( indexPackDir.listFiles() );
- Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) );
//1 is missing with updated Lucene 4 implementation
@@ -176,18 +201,26 @@ public class Nexus1911IncrementalTest
public void test3Incremental()
throws Exception
{
- IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir );
- request.setCreateIncrementalChunks( true );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir );
+ request.setCreateIncrementalChunks( true );
+ packer.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request );
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), request );
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), request );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), IndexPackingRequest.MAX_CHUNKS );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), IndexPackingRequest.MAX_CHUNKS );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), IndexPackingRequest.MAX_CHUNKS );
Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() );
Properties props = getPropertiesFromFiles( indexPackDir.listFiles() );
- Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) );
//1,2 are missing with updated Lucene 4 implementation
@@ -209,20 +242,30 @@ public class Nexus1911IncrementalTest
public void testMaxChunks()
throws Exception
{
- IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir );
- request.setCreateIncrementalChunks( true );
- request.setMaxIndexChunks( 3 );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir );
+ request.setCreateIncrementalChunks( true );
+ request.setMaxIndexChunks( 3 );
+ packer.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request );
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), request );
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), request );
- copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-4" ), request );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), 3 );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), 3 );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), 3 );
+ copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-4" ), 3 );
Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() );
Properties props = getPropertiesFromFiles( indexPackDir.listFiles() );
- Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) );
+ System.out.println( filenames );
+
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) );
Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) );
Assert.assertFalse( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".1.gz" ) );
@@ -243,7 +286,7 @@ public class Nexus1911IncrementalTest
Assert.assertNotNull( props.getProperty( IndexingContext.INDEX_CHAIN_ID ) );
}
- private void copyRepoContentsAndReindex( File src, IndexPackingRequest request )
+ private void copyRepoContentsAndReindex( File src, int maxIndexChunks )
throws Exception
{
File reposTargetDir = new File( getBasedir(), "target/repos/nexus-1911/repo" );
@@ -254,7 +297,19 @@ public class Nexus1911IncrementalTest
// TODO: fix this!
indexer.scan( reindexedContext, false );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir );
+ request.setCreateIncrementalChunks( true );
+ request.setMaxIndexChunks( maxIndexChunks );
+ packer.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
}
private Set<String> getFilenamesFromFiles( File[] files )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java
index a64f460..f1f0d91 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java
@@ -66,6 +66,6 @@ public class Nexus687NexusIndexerTest
assertEquals( "1.2.2", ai.getVersion() );
- assertNull( ai.getPackaging() );
+ assertEquals( "jar", ai.getPackaging() );
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
index 78591c1..adb8393 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
@@ -57,7 +57,7 @@ public class Nexus737NexusIndexerTest
String uinfo = document.get( ArtifactInfo.UINFO );
- if ( "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|NA".equals( uinfo )
+ if ( "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|NA|jar".equals( uinfo )
|| "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|bundle|zip".equals( uinfo )
|| "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|bundle|tar.gz".equals( uinfo ) )
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
index a7acb68..4af552c 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
@@ -33,9 +33,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.WildcardQuery;
@@ -47,9 +49,14 @@ import org.apache.maven.index.context.StaticContextMemberProvider;
import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
import org.apache.maven.index.packer.DefaultIndexPacker;
+import org.apache.maven.index.packer.IndexPacker;
+import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.search.grouping.GAGrouping;
import org.apache.maven.index.updater.DefaultIndexUpdater;
+import org.apache.maven.index.updater.IndexUpdateRequest;
+import org.apache.maven.index.updater.IndexUpdater;
import org.codehaus.plexus.util.StringUtils;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -245,7 +252,7 @@ public class NexusIndexerTest
assertTrue( ai != null );
// we assure we found what we wanted
- assertEquals( "commons-logging:commons-logging:1.0.4:null:jar", ai.toString() );
+ assertEquals( "commons-logging:commons-logging:1.0.4:null:jar", ai.getGroupId() + ":" + ai.getArtifactId() + ":" + ai.getVersion() + ":" + ai.getClassifier() + ":" + ai.getPackaging() );
}
public void testQueryCreatorNGSearch()
@@ -301,7 +308,7 @@ public class NexusIndexerTest
for ( ArtifactInfo ai : res )
{
- line = ai.getContext() + " :: " + ai.toString();
+ line = ai.getContext() + " :: " + ai.getGroupId() + ":" + ai.getArtifactId() + ":" + ai.getVersion() + ":" + ai.getClassifier() + ":" + ai.getPackaging();
if ( print )
{
@@ -508,7 +515,7 @@ public class NexusIndexerTest
NexusIndexer indexer = prepare();
Query q =
- new TermQuery( new Term( ArtifactInfo.UINFO, "org.apache.maven.plugins|maven-core-it-plugin|1.0|NA" ) );
+ new TermQuery( new Term( ArtifactInfo.UINFO, "org.apache.maven.plugins|maven-core-it-plugin|1.0|NA|jar" ) );
FlatSearchRequest request = new FlatSearchRequest( q );
@@ -560,20 +567,33 @@ public class NexusIndexerTest
List<IndexCreator> indexCreators = context.getIndexCreators();
// Directory directory = context.getIndexDirectory();
- RAMDirectory newDirectory = new RAMDirectory();
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
- DefaultIndexPacker.packIndexArchive( context, bos );
+ final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
+ targetDir.delete();
+ targetDir.mkdirs();
- DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( bos.toByteArray() ), newDirectory, //
- context );
+ final IndexPacker indexPacker = lookup( IndexPacker.class );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ final IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir );
+ indexPacker.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
indexer.removeIndexingContext( context, false );
- indexer.addIndexingContext( indexId, //
+ RAMDirectory newDirectory = new RAMDirectory();
+
+ IndexingContext newContext = indexer.addIndexingContext( indexId, //
repositoryId, repository, newDirectory, repositoryUrl, null, indexCreators );
+ final IndexUpdater indexUpdater = lookup( IndexUpdater.class );
+ indexUpdater.fetchAndUpdateIndex( new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) ) );
+
WildcardQuery q = new WildcardQuery( new Term( ArtifactInfo.PACKAGING, "maven-plugin" ) );
FlatSearchResponse response = indexer.searchFlat( new FlatSearchRequest( q ) );
Collection<ArtifactInfo> infos = response.getResults();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/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..ae028b0 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
@@ -21,6 +21,7 @@ package org.apache.maven.index;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.expr.StringSearchExpression;
@@ -240,9 +241,15 @@ public class SearchWithAnEmptyIndexTest
indexingContext.optimize();
File managedRepository = new File( repoIndex );
- final File indexLocation = new File( managedRepository, ".index" );
- IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexLocation );
- indexPacker.packIndex( request );
+ final IndexSearcher indexSearcher = indexingContext.acquireIndexSearcher();
+ try
+ {
+ final File indexLocation = new File( managedRepository, ".index" );
+ IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexSearcher.getIndexReader(), indexLocation );
+ indexPacker.packIndex( request );
+ } finally {
+ indexingContext.releaseIndexSearcher( indexSearcher );
+ }
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java b/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java
index 8cfc15d..1e8518b 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java
@@ -19,13 +19,7 @@ package org.apache.maven.index.incremental;
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-
+import org.apache.lucene.search.IndexSearcher;
import org.apache.maven.index.AbstractIndexCreatorHelper;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
@@ -34,6 +28,13 @@ import org.apache.maven.index.updater.IndexUpdateRequest;
import org.apache.maven.index.updater.ResourceFetcher;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+
public class DefaultIncrementalHandlerTest
extends AbstractIndexCreatorHelper
{
@@ -76,23 +77,31 @@ public class DefaultIncrementalHandlerTest
public void testUpdateInvalidProperties()
throws Exception
{
- Properties properties = new Properties();
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ Properties properties = new Properties();
- IndexPackingRequest request = new IndexPackingRequest( context, indexDir );
+ IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexDir );
- // No properties definite fail
- assertNull( handler.getIncrementalUpdates( request, properties ) );
+ // No properties definite fail
+ assertNull( handler.getIncrementalUpdates( request, properties ) );
- properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "junk" );
+ properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "junk" );
- // property set, but invalid
- assertNull( handler.getIncrementalUpdates( request, properties ) );
+ // property set, but invalid
+ assertNull( handler.getIncrementalUpdates( request, properties ) );
- properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "19991112182432.432 -0600" );
+ properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "19991112182432.432 -0600" );
- List<Integer> updates = handler.getIncrementalUpdates( request, properties );
+ List<Integer> updates = handler.getIncrementalUpdates( request, properties );
- assertEquals( updates.size(), 0 );
+ assertEquals( updates.size(), 0 );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
}
public void testUpdateValid()
@@ -100,17 +109,24 @@ public class DefaultIncrementalHandlerTest
{
Properties properties = new Properties();
- IndexPackingRequest request = new IndexPackingRequest( context, indexDir );
-
properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "19991112182432.432 -0600" );
FileUtils.copyDirectoryStructure( new File( getBasedir(), "src/test/repo/ch" ), new File( repoDir, "ch" ) );
indexer.scan( context );
- List<Integer> updates = handler.getIncrementalUpdates( request, properties );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexDir );
+ List<Integer> updates = handler.getIncrementalUpdates( request, properties );
- assertEquals( updates.size(), 1 );
+ assertEquals( updates.size(), 1 );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
}
public void testRemoteUpdatesInvalidProperties()
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java b/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java
index 7d4c090..8d6b378 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import junit.framework.Assert;
import org.apache.lucene.document.Document;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.maven.index.AbstractNexusIndexerTest;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.NexusIndexer;
@@ -126,11 +127,17 @@ public class NEXUS4149TransferFormatTest
IndexPacker packer = lookup( IndexPacker.class );
- IndexPackingRequest request = new IndexPackingRequest( context, packTargetDir );
- request.setCreateIncrementalChunks( false );
- request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), packTargetDir );
+ request.setCreateIncrementalChunks( false );
+ request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) );
- packer.packIndex( request );
+ packer.packIndex( request );
+ } finally {
+ context.releaseIndexSearcher( indexSearcher );
+ }
// read it up and verify, but stay "low level", directly consume the GZ file and count
FileInputStream fis = new FileInputStream( new File( packTargetDir, "nexus-maven-repository-index.gz" ) );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
index a196dda..fe5cc9f 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.maven.index.AbstractIndexCreatorHelper;
import org.apache.maven.index.ArtifactContext;
@@ -124,9 +125,16 @@ public abstract class AbstractIndexUpdaterTest
protected void packIndex( File targetDir, IndexingContext context )
throws IllegalArgumentException, IOException
{
- IndexPackingRequest request = new IndexPackingRequest( context, targetDir );
- request.setUseTargetProperties( true );
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir );
+ request.setUseTargetProperties( true );
+ packer.packIndex( request );
+ } finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
}
protected void searchFor( String groupId, int expected, IndexingContext context )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java
index b098b27..91db7f2 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java
@@ -30,6 +30,7 @@ import java.util.Map.Entry;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.maven.index.AbstractRepoNexusIndexerTest;
@@ -69,7 +70,14 @@ public class IndexDataTest
ByteArrayOutputStream bos = new ByteArrayOutputStream();
IndexDataWriter dw = new IndexDataWriter( bos );
- dw.write( context, null );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ dw.write( context, indexSearcher.getIndexReader(), null );
+ } finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
ByteArrayInputStream is = new ByteArrayInputStream( bos.toByteArray() );
@@ -99,7 +107,14 @@ public class IndexDataTest
ByteArrayOutputStream bos = new ByteArrayOutputStream();
IndexDataWriter dw = new IndexDataWriter( bos );
- dw.write( context, null );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ dw.write( context, indexSearcher.getIndexReader(), null );
+ }finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
ByteArrayInputStream is = new ByteArrayInputStream( bos.toByteArray() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/nexus-maven-repository-index.20081108.zip
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/nexus-maven-repository-index.20081108.zip b/indexer-core/src/test/nexus-maven-repository-index.20081108.zip
deleted file mode 100644
index b1d04fb..0000000
Binary files a/indexer-core/src/test/nexus-maven-repository-index.20081108.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt
index ce29a33..bd52ac6 100644
--- a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt
+++ b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt
@@ -3,7 +3,7 @@ test :: proptest:proptest-archetype:1.0:null:maven-archetype
test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:null:maven-plugin
test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:sources:jar
test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:javadoc:jar
-test :: missingpom:missingpom:1.0:null:jar
+test :: missingpom:missingpom:1.0:null:null
test :: commons-logging:commons-logging:1.0:null:jar
test :: commons-logging:commons-logging:1.0:javadoc:jar
test :: commons-cli:commons-cli:1.0:null:jar
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt
index 1060556..b62f44a 100644
--- a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt
+++ b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt
@@ -3,7 +3,7 @@ test :: proptest:proptest-archetype:1.0:null:maven-archetype
test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:null:maven-plugin
test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:sources:jar
test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:javadoc:jar
-test :: missingpom:missingpom:1.0:null:jar
+test :: missingpom:missingpom:1.0:null:null
test :: commons-logging:commons-logging:1.0:null:jar
test :: commons-logging:commons-logging:1.0:javadoc:jar
test :: commons-cli:commons-cli:1.0:null:jar
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d6a64d1..2ed5f89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@ under the License.
</distributionManagement>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
@@ -90,10 +91,10 @@ under the License.
<sisu-guice.version>3.2.2</sisu-guice.version>
<lucene.version>4.8.1</lucene.version>
- <truezip.version>7.6.6</truezip.version>
-
<maven.version>3.0.5</maven.version>
<aether.version>1.0.0.v20140518</aether.version>
+
+ <truezip.version>7.6.6</truezip.version>
<archetype.version>2.2</archetype.version>
<wagon.version>2.3</wagon.version>
@@ -109,18 +110,18 @@ under the License.
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.5</version>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0.1</version>
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.3</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.3</version>
@@ -318,18 +319,28 @@ under the License.
<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>
+
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
<version>2.5.1</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.19</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
[2/6] git commit: Multiple fixes:
Posted by cs...@apache.org.
Multiple fixes:
MINDEXER-84 updater bug
MINDEXER-85 POM reading
MINDEXER-86 legacy transport format removed
MINDEXER-41 unique by GAVCE from now on
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/22fbfe07
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/22fbfe07
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/22fbfe07
Branch: refs/heads/master
Commit: 22fbfe07ae012e1c2c115dc9ebed1dc3dae14b8a
Parents: b071123
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Sun Jun 29 19:28:03 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Sun Jun 29 19:28:03 2014 +0200
----------------------------------------------------------------------
.../apache/maven/index/cli/NexusIndexerCli.java | 26 +-
indexer-core/pom.xml | 2 +-
.../org/apache/maven/index/ArtifactContext.java | 92 +-----
.../org/apache/maven/index/ArtifactInfo.java | 38 +--
.../MinimalArtifactInfoIndexCreator.java | 21 +-
.../incremental/DefaultIncrementalHandler.java | 74 ++---
.../index/incremental/IncrementalHandler.java | 6 +-
.../maven/index/locator/ArtifactLocator.java | 11 +-
.../maven/index/packer/DefaultIndexPacker.java | 301 ++-----------------
.../maven/index/packer/IndexPackingRequest.java | 32 +-
.../index/updater/DefaultIndexUpdater.java | 122 --------
.../maven/index/updater/IndexDataReader.java | 18 ++
.../maven/index/updater/IndexDataWriter.java | 13 +-
.../index/AbstractRepoNexusIndexerTest.java | 2 +-
...rrentUseWithMergedContextPublishingTest.java | 15 +-
.../index/DefaultIndexNexusIndexerTest.java | 33 +-
.../maven/index/FullIndexNexusIndexerTest.java | 34 ++-
.../index/Index20081108RegressionTest.java | 288 ------------------
.../maven/index/Nexus1179NexusIndexerTest.java | 6 +-
.../maven/index/Nexus13NexusIndexerTest.java | 29 +-
.../Nexus1911IncrementalMergedCtxTest.java | 1 +
.../maven/index/Nexus1911IncrementalTest.java | 121 ++++++--
.../maven/index/Nexus687NexusIndexerTest.java | 2 +-
.../maven/index/Nexus737NexusIndexerTest.java | 2 +-
.../apache/maven/index/NexusIndexerTest.java | 42 ++-
.../maven/index/SearchWithAnEmptyIndexTest.java | 13 +-
.../DefaultIncrementalHandlerTest.java | 58 ++--
.../packer/NEXUS4149TransferFormatTest.java | 15 +-
.../index/updater/AbstractIndexUpdaterTest.java | 14 +-
.../maven/index/updater/IndexDataTest.java | 19 +-
.../nexus-maven-repository-index.20081108.zip | Bin 22383 -> 0 bytes
.../testQueryCreatorNGSearch/case05.txt | 2 +-
.../testQueryCreatorNGSearch/case06.txt | 2 +-
pom.xml | 27 +-
34 files changed, 462 insertions(+), 1019 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/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..5f09659 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
@@ -33,6 +33,7 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.FSDirectory;
import org.apache.maven.index.ArtifactContext;
import org.apache.maven.index.ArtifactInfo;
@@ -95,8 +96,6 @@ public class NexusIndexerCli
public static final char INCREMENTAL_CHUNK_KEEP_COUNT = 'k';
- public static final char LEGACY = 'l';
-
public static final char UNPACK = 'u';
private static final long MB = 1024 * 1024;
@@ -206,9 +205,6 @@ public class NexusIndexerCli
options.addOption( OptionBuilder.withLongOpt( "type" ).hasArg() //
.withDescription( "Indexer type (default, min, full or coma separated list of custom types)." ).create( TYPE ) );
- options.addOption( OptionBuilder.withLongOpt( "legacy" ) //
- .withDescription( "Build legacy .zip index file" ).create( LEGACY ) );
-
options.addOption( OptionBuilder.withLongOpt( "unpack" ) //
.withDescription( "Unpack an index file" ).create( UNPACK ) );
@@ -297,8 +293,6 @@ public class NexusIndexerCli
boolean createIncrementalChunks = cli.hasOption( CREATE_INCREMENTAL_CHUNKS );
- boolean createLegacyIndex = cli.hasOption( LEGACY );
-
boolean debug = cli.hasOption( DEBUG );
boolean quiet = cli.hasOption( QUIET );
@@ -332,11 +326,6 @@ public class NexusIndexerCli
{
System.err.printf( "Will create baseline file.\n" );
}
-
- if ( createLegacyIndex )
- {
- System.err.printf( "Will also create legacy .zip index file.\n" );
- }
}
NexusIndexer indexer = plexus.lookup( NexusIndexer.class );
@@ -352,6 +341,7 @@ public class NexusIndexerCli
null, // index update url
indexers );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
try
{
IndexPacker packer = plexus.lookup( IndexPacker.class );
@@ -360,20 +350,13 @@ public class NexusIndexerCli
indexer.scan( context, listener, true );
- IndexPackingRequest request = new IndexPackingRequest( context, outputFolder );
+ IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), outputFolder );
request.setCreateChecksumFiles( createChecksums );
request.setCreateIncrementalChunks( createIncrementalChunks );
- if ( createLegacyIndex )
- {
- request.setFormats( Arrays.asList( IndexFormat.FORMAT_LEGACY, IndexFormat.FORMAT_V1 ) );
- }
- else
- {
- request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) );
- }
+ request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) );
if ( chunkCount != null )
{
@@ -389,6 +372,7 @@ public class NexusIndexerCli
}
finally
{
+ context.releaseIndexSearcher( indexSearcher );
indexer.removeIndexingContext( context, false );
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/pom.xml
----------------------------------------------------------------------
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 6343faa..ca90740 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -45,7 +45,7 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
+
<!-- DI -->
<dependency>
<groupId>javax.inject</groupId>
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
index 33323ac..c911406 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
@@ -21,11 +21,7 @@ package org.apache.maven.index;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
@@ -39,8 +35,7 @@ import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.util.zip.ZipFacade;
import org.apache.maven.index.util.zip.ZipHandle;
import org.apache.maven.model.Model;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
@@ -93,10 +88,15 @@ public class ArtifactContext
{
try
{
- return new ModelReader().readModel( new FileInputStream( getPom() ) );
+ return new MavenXpp3Reader().read( new FileInputStream( getPom() ), false );
}
- catch ( FileNotFoundException e )
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ }
+ catch ( XmlPullParserException e )
{
+ e.printStackTrace();
}
}
// Otherwise, check for pom contained in maven generated artifact
@@ -113,11 +113,16 @@ public class ArtifactContext
if ( handle.hasEntry( embeddedPomPath ) )
{
- return new ModelReader().readModel( handle.getEntryContent( embeddedPomPath ) );
+ return new MavenXpp3Reader().read( handle.getEntryContent( embeddedPomPath ), false );
}
}
catch ( IOException e )
{
+ e.printStackTrace();
+ }
+ catch ( XmlPullParserException e )
+ {
+ e.printStackTrace();
}
finally
{
@@ -197,73 +202,4 @@ public class ArtifactContext
return doc;
}
-
- public static class ModelReader
- {
- public Model readModel( InputStream pom )
- {
- if ( pom == null )
- {
- return null;
- }
-
- Model model = new Model();
-
- Xpp3Dom dom = readPomInputStream( pom );
-
- if ( dom == null )
- {
- return null;
- }
-
- if ( dom.getChild( "packaging" ) != null )
- {
- model.setPackaging( dom.getChild( "packaging" ).getValue() );
- }
- // Special case, packaging should be null instead of default .jar if not set in pom
- else
- {
- model.setPackaging( null );
- }
-
- if ( dom.getChild( "name" ) != null )
- {
- model.setName( dom.getChild( "name" ).getValue() );
- }
-
- if ( dom.getChild( "description" ) != null )
- {
- model.setDescription( dom.getChild( "description" ).getValue() );
- }
-
- return model;
- }
-
- private Xpp3Dom readPomInputStream( InputStream is )
- {
- Reader r = new InputStreamReader( is );
- try
- {
- return Xpp3DomBuilder.build( r );
- }
- catch ( XmlPullParserException e )
- {
- }
- catch ( IOException e )
- {
- }
- finally
- {
- try
- {
- r.close();
- }
- catch ( IOException e )
- {
- }
- }
-
- return null;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
index ba321af..d9011ec 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.google.common.base.Strings;
import org.apache.maven.index.artifact.Gav;
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
@@ -282,8 +283,6 @@ public class ArtifactInfo
*/
private String bundleRequireBundle;
- private String uinfo = null;
-
private final Map<String, String> attributes = new HashMap<String, String>();
private final List<MatchHighlight> matchHighlights = new ArrayList<MatchHighlight>();
@@ -336,18 +335,14 @@ public class ArtifactInfo
public String getUinfo()
{
- if ( uinfo == null )
- {
- uinfo = new StringBuilder() //
- .append( groupId ).append( FS ) //
- .append( artifactId ).append( FS ) //
- .append( version ).append( FS ) //
- .append( nvl( classifier ) ) //
- .append( StringUtils.isEmpty( classifier ) || StringUtils.isEmpty( packaging ) ? "" : FS + packaging ) //
- .toString(); // extension is stored in the packaging field when classifier is not used
- }
-
- return uinfo;
+ return new StringBuilder() //
+ .append( groupId ).append( FS ) //
+ .append( artifactId ).append( FS ) //
+ .append( version ).append( FS ) //
+ .append( nvl( classifier ) ).append( FS ) //
+ .append( fileExtension )
+ // .append( StringUtils.isEmpty( classifier ) || StringUtils.isEmpty( packaging ) ? "" : FS + packaging ) //
+ .toString(); // extension is stored in the packaging field when classifier is not used
}
public String getRootGroup()
@@ -384,10 +379,12 @@ public class ArtifactInfo
@Override
public String toString()
{
- return new StringBuilder( groupId ).append( ':' ).append( artifactId ) //
- .append( ':' ).append( version ) //
- .append( ':' ).append( classifier ) //
- .append( ':' ).append( packaging ).toString();
+ final StringBuilder result = new StringBuilder( getUinfo() );
+ if ( !Strings.isNullOrEmpty( getPackaging() ) )
+ {
+ result.append( "[" ).append( getPackaging() ).append( "]" );
+ }
+ return result.toString();
}
private static final List<Field> DEFAULT_FIELDS = new ArrayList<Field>();
@@ -1005,11 +1002,6 @@ public class ArtifactInfo
this.bundleRequireBundle = bundleRequireBundle;
}
- public void setUinfo( String uinfo )
- {
- this.uinfo = uinfo;
- }
-
public VersionScheme getVersionScheme( )
{
return versionScheme;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/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..316e4c8 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
@@ -120,7 +120,7 @@ public class MinimalArtifactInfoIndexCreator
ArtifactInfo ai = ac.getArtifactInfo();
- if ( pom != null )
+ if ( pom != null && pom.isFile() )
{
ai.setLastModified( pom.lastModified() );
@@ -128,7 +128,7 @@ public class MinimalArtifactInfoIndexCreator
}
// TODO handle artifacts without poms
- if ( pom != null )
+ if ( pom != null && pom.isFile() )
{
if ( ai.getClassifier() != null )
{
@@ -181,7 +181,7 @@ public class MinimalArtifactInfoIndexCreator
{
// default it, since POM is present, is read, but does not contain explicit packaging
// TODO: this change breaks junit tests, but not sure why is "null" expected value?
- // ai.packaging = "jar";
+ ai.setPackaging( "jar" );
}
}
}
@@ -217,11 +217,6 @@ public class MinimalArtifactInfoIndexCreator
ai.setSize( artifact.length() );
ai.setFileExtension( getExtension( artifact, ac.getGav() ) );
-
- if ( ai.getPackaging() == null )
- {
- ai.setPackaging( ai.getFileExtension() );
- }
}
}
@@ -252,7 +247,7 @@ public class MinimalArtifactInfoIndexCreator
public void updateDocument( ArtifactInfo ai, Document doc )
{
String info =
- new StringBuilder().append( ai.getPackaging() ).append( ArtifactInfo.FS ).append(
+ new StringBuilder().append( ArtifactInfo.nvl( ai.getPackaging() )).append( ArtifactInfo.FS ).append(
Long.toString( ai.getLastModified() ) ).append( ArtifactInfo.FS ).append( Long.toString( ai.getSize() ) ).append(
ArtifactInfo.FS ).append( ai.getSourcesExists().toString() ).append( ArtifactInfo.FS ).append(
ai.getJavadocExists().toString() ).append( ArtifactInfo.FS ).append( ai.getSignatureExists().toString() ).append(
@@ -331,9 +326,11 @@ public class MinimalArtifactInfoIndexCreator
ai.setVersion( r[2] );
- if ( r.length > 3 )
+ ai.setClassifier( ArtifactInfo.renvl( r[3] ) );
+
+ if ( r.length > 4 )
{
- ai.setClassifier( ArtifactInfo.renvl( r[3] ) );
+ ai.setFileExtension( r[4] );
}
res = true;
@@ -345,7 +342,7 @@ public class MinimalArtifactInfoIndexCreator
{
String[] r = ArtifactInfo.FS_PATTERN.split( info );
- ai.setPackaging( r[0] );
+ ai.setPackaging( ArtifactInfo.renvl( r[0] ));
ai.setLastModified( Long.parseLong( r[1] ) );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/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..75c50dc 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,18 @@ package org.apache.maven.index.incremental;
* 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 java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -35,20 +47,7 @@ import java.util.Set;
import java.util.TimeZone;
import java.util.TreeMap;
-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.component.annotations.Component;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.StringUtils;
-
-@Component( role = IncrementalHandler.class )
+@Component(role = IncrementalHandler.class)
public class DefaultIncrementalHandler
extends AbstractLogEnabled
implements IncrementalHandler
@@ -143,43 +142,34 @@ public class DefaultIncrementalHandler
}
}
- // Note Toni:
private List<Integer> getIndexChunk( IndexPackingRequest request, Date timestamp )
throws IOException
{
final List<Integer> chunk = new ArrayList<Integer>();
- final IndexSearcher indexSearcher = request.getContext().acquireIndexSearcher();
- try
+ final IndexReader r = request.getIndexReader();
+ Bits liveDocs = MultiFields.getLiveDocs( r );
+ for ( int i = 0; i < r.maxDoc(); i++ )
{
- final IndexReader r = indexSearcher.getIndexReader();
- Bits liveDocs = MultiFields.getLiveDocs(r);
- for ( int i = 0; i < r.maxDoc(); i++ )
+ if ( liveDocs == null || liveDocs.get( i ) )
{
- if (liveDocs == null || liveDocs.get(i) )
- {
- Document d = r.document( i );
+ Document d = r.document( i );
- String lastModified = d.get( ArtifactInfo.LAST_MODIFIED );
+ String lastModified = d.get( ArtifactInfo.LAST_MODIFIED );
- if ( lastModified != null )
- {
- Date t = new Date( Long.parseLong( lastModified ) );
+ if ( lastModified != null )
+ {
+ Date t = new Date( Long.parseLong( lastModified ) );
- // Only add documents that were added after the last time we indexed
- if ( t.after( timestamp ) )
- {
- chunk.add( i );
- }
+ // Only add documents that were added after the last time we indexed
+ if ( t.after( timestamp ) )
+ {
+ chunk.add( i );
}
}
}
-
- return chunk;
- }
- finally
- {
- request.getContext().releaseIndexSearcher( indexSearcher );
}
+
+ return chunk;
}
private void updateProperties( Properties properties, IndexPackingRequest request )
@@ -236,8 +226,8 @@ public class DefaultIncrementalHandler
{
String[] parts = name.split( "\\." );
- if ( parts.length == 3 && parts[0].equals( IndexingContext.INDEX_FILE_PREFIX )
- && parts[2].equals( "gz" ) )
+ if ( parts.length == 3 && parts[0].equals( IndexingContext.INDEX_FILE_PREFIX ) && parts[2].equals(
+ "gz" ) )
{
return true;
}
@@ -321,8 +311,8 @@ public class DefaultIncrementalHandler
String value = remoteProps.getProperty( sKey );
// If we have the current counter, or the next counter, we are good to go
- if ( Integer.toString( currentLocalCounter ).equals( value )
- || Integer.toString( currentLocalCounter + 1 ).equals( value ) )
+ if ( Integer.toString( currentLocalCounter ).equals( value ) || Integer.toString(
+ currentLocalCounter + 1 ).equals( value ) )
{
return true;
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/incremental/IncrementalHandler.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/incremental/IncrementalHandler.java b/indexer-core/src/main/java/org/apache/maven/index/incremental/IncrementalHandler.java
index ef1efdf..45f63c7 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/incremental/IncrementalHandler.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/incremental/IncrementalHandler.java
@@ -19,13 +19,13 @@ package org.apache.maven.index.incremental;
* under the License.
*/
+import org.apache.maven.index.packer.IndexPackingRequest;
+import org.apache.maven.index.updater.IndexUpdateRequest;
+
import java.io.IOException;
import java.util.List;
import java.util.Properties;
-import org.apache.maven.index.packer.IndexPackingRequest;
-import org.apache.maven.index.updater.IndexUpdateRequest;
-
public interface IncrementalHandler
{
List<Integer> getIncrementalUpdates( IndexPackingRequest request, Properties properties )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java b/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
index b0f6cef..d27d2a6 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/locator/ArtifactLocator.java
@@ -23,11 +23,12 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import org.apache.maven.index.ArtifactContext.ModelReader;
import org.apache.maven.index.artifact.ArtifactPackagingMapper;
import org.apache.maven.index.artifact.Gav;
import org.apache.maven.index.artifact.GavCalculator;
import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* Artifact locator.
@@ -56,7 +57,7 @@ public class ArtifactLocator
try
{
// need to read the pom model to get packaging
- Model model = new ModelReader().readModel( new FileInputStream( source ) );
+ final Model model = new MavenXpp3Reader().read( new FileInputStream( source ), false );
if ( model == null )
{
@@ -79,6 +80,12 @@ public class ArtifactLocator
}
catch ( IOException e )
{
+ e.printStackTrace();
+ return null;
+ }
+ catch ( XmlPullParserException e )
+ {
+ e.printStackTrace();
return null;
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/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..ba15396 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,46 +19,18 @@ package org.apache.maven.index.packer;
* under the License.
*/
-import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
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;
-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;
-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 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;
@@ -69,7 +41,7 @@ import org.codehaus.plexus.util.IOUtil;
/**
* A default {@link IndexPacker} implementation. Creates the properties, legacy index zip and new gz files.
- *
+ *
* @author Tamas Cservenak
* @author Eugene Kuleshov
*/
@@ -94,13 +66,13 @@ public class DefaultIndexPacker
if ( !request.getTargetDir().isDirectory() )
{
throw new IllegalArgumentException( //
- String.format( "Specified target path %s is not a directory",
- request.getTargetDir().getAbsolutePath() ) );
+ String.format( "Specified target path %s is not a directory",
+ request.getTargetDir().getAbsolutePath() ) );
}
if ( !request.getTargetDir().canWrite() )
{
throw new IllegalArgumentException( String.format( "Specified target path %s is not writtable",
- request.getTargetDir().getAbsolutePath() ) );
+ request.getTargetDir().getAbsolutePath() ) );
}
}
else
@@ -138,13 +110,11 @@ public class DefaultIndexPacker
}
else
{
- File file =
- new File( request.getTargetDir(), //
- IndexingContext.INDEX_FILE_PREFIX + "."
- + info.getProperty( IndexingContext.INDEX_CHUNK_COUNTER ) + ".gz" );
+ File file = new File( request.getTargetDir(), //
+ IndexingContext.INDEX_FILE_PREFIX + "." + info.getProperty(
+ IndexingContext.INDEX_CHUNK_COUNTER ) + ".gz" );
- writeIndexData( request.getContext(), //
- chunk, file );
+ writeIndexData( request, chunk, file );
if ( request.isCreateChecksumFiles() )
{
@@ -173,37 +143,19 @@ public class DefaultIndexPacker
timestamp = new Date( 0 ); // never updated
}
- if ( request.getFormats().contains( IndexPackingRequest.IndexFormat.FORMAT_LEGACY ) )
- {
- info.setProperty( IndexingContext.INDEX_LEGACY_TIMESTAMP, format( timestamp ) );
-
- writeIndexArchive( request.getContext(), legacyFile, request.getMaxIndexChunks() );
-
- if ( request.isCreateChecksumFiles() )
- {
- FileUtils.fileWrite(
- new File( legacyFile.getParentFile(), legacyFile.getName() + ".sha1" ).getAbsolutePath(),
- DigesterUtils.getSha1Digest( legacyFile ) );
-
- FileUtils.fileWrite(
- new File( legacyFile.getParentFile(), legacyFile.getName() + ".md5" ).getAbsolutePath(),
- DigesterUtils.getMd5Digest( legacyFile ) );
- }
- }
-
if ( request.getFormats().contains( IndexPackingRequest.IndexFormat.FORMAT_V1 ) )
{
info.setProperty( IndexingContext.INDEX_TIMESTAMP, format( timestamp ) );
- writeIndexData( request.getContext(), null, v1File );
+ writeIndexData( request, null, v1File );
if ( request.isCreateChecksumFiles() )
{
FileUtils.fileWrite( new File( v1File.getParentFile(), v1File.getName() + ".sha1" ).getAbsolutePath(),
- DigesterUtils.getSha1Digest( v1File ) );
+ DigesterUtils.getSha1Digest( v1File ) );
FileUtils.fileWrite( new File( v1File.getParentFile(), v1File.getName() + ".md5" ).getAbsolutePath(),
- DigesterUtils.getMd5Digest( v1File ) );
+ DigesterUtils.getMd5Digest( v1File ) );
}
}
@@ -245,226 +197,7 @@ public class DefaultIndexPacker
return properties;
}
- void writeIndexArchive( IndexingContext context, File targetArchive )
- throws IOException
- {
- writeIndexArchive(context, targetArchive, IndexPackingRequest.MAX_CHUNKS);
- }
-
- void writeIndexArchive( IndexingContext context, File targetArchive, int maxSegments )
- throws IOException
- {
- if ( targetArchive.exists() )
- {
- targetArchive.delete();
- }
-
- OutputStream os = null;
-
- try
- {
- os = new BufferedOutputStream( new FileOutputStream( targetArchive ), 4096 );
-
- packIndexArchive( context, os );
- }
- finally
- {
- IOUtil.close( os );
- }
- }
-
- /**
- * Pack legacy index archive into a specified output stream
- */
- public static void packIndexArchive( IndexingContext context, OutputStream os )
- throws IOException
- {
- packIndexArchive(context, os, IndexPackingRequest.MAX_CHUNKS);
- }
-
- /**
- * Pack legacy index archive into a specified output stream
- */
- public static void packIndexArchive( IndexingContext context, OutputStream os, int maxSegments )
- throws IOException
- {
- File indexArchive = File.createTempFile( "nexus-index", "" );
-
- File indexDir = new File( indexArchive.getAbsoluteFile().getParentFile(), indexArchive.getName() + ".dir" );
-
- indexDir.mkdirs();
-
- FSDirectory fdir = FSDirectory.open( indexDir );
-
- try
- {
- // force the timestamp update
- IndexUtils.updateTimestamp( context.getIndexDirectory(), context.getTimestamp() );
- IndexUtils.updateTimestamp( fdir, context.getTimestamp() );
-
- final IndexSearcher indexSearcher = context.acquireIndexSearcher();
- try
- {
- copyLegacyDocuments( indexSearcher.getIndexReader(), fdir, context, maxSegments);
- }
- finally
- {
- context.releaseIndexSearcher( indexSearcher );
- }
- packDirectory( fdir, os );
- }
- finally
- {
- IndexUtils.close( fdir );
- indexArchive.delete();
- IndexUtils.delete( indexDir );
- }
- }
-
- static void copyLegacyDocuments( IndexReader r, Directory targetdir, IndexingContext context )
- throws CorruptIndexException, LockObtainFailedException, IOException
- {
- copyLegacyDocuments(r, targetdir, context, IndexPackingRequest.MAX_CHUNKS);
- }
-
- static void copyLegacyDocuments( IndexReader r, Directory targetdir, IndexingContext context, int maxSegments)
- throws CorruptIndexException, LockObtainFailedException, IOException
- {
- IndexWriter w = null;
- Bits liveDocs = MultiFields.getLiveDocs(r);
- try
- {
- w = new NexusIndexWriter( targetdir, new NexusLegacyAnalyzer(), true );
-
- for ( int i = 0; i < r.maxDoc(); i++ )
- {
- if ( liveDocs == null || liveDocs.get(i) )
- {
- Document legacyDocument = r.document( i );
- Document updatedLegacyDocument = updateLegacyDocument( legacyDocument, context );
-
- //Lucene does not return metadata for stored documents, so we need to fix that
- for (IndexableField indexableField : updatedLegacyDocument.getFields())
- {
- if(indexableField.name().equals(DefaultIndexingContext.FLD_DESCRIPTOR))
- {
- updatedLegacyDocument = new Document();
- updatedLegacyDocument.add(new StringField(DefaultIndexingContext.FLD_DESCRIPTOR, DefaultIndexingContext.FLD_DESCRIPTOR_CONTENTS, Field.Store.YES));
- updatedLegacyDocument.add( new StringField( DefaultIndexingContext.FLD_IDXINFO, DefaultIndexingContext.VERSION + ArtifactInfo.FS + context.getRepositoryId(), Field.Store.YES) );
- break;
- }
- }
-
- w.addDocument( updatedLegacyDocument );
- }
- }
-
- w.forceMerge(maxSegments);
- w.commit();
- }
- finally
- {
- IndexUtils.close( w );
- }
- }
-
- static Document updateLegacyDocument( Document doc, IndexingContext context )
- {
- ArtifactInfo ai = IndexUtils.constructArtifactInfo( doc, context );
- if ( ai == null )
- {
- return doc;
- }
-
- Document document = new Document();
- document.add( new Field( ArtifactInfo.UINFO, ai.getUinfo(), Field.Store.YES, Field.Index.NOT_ANALYZED ) );
-
- for ( IndexCreator ic : context.getIndexCreators() )
- {
- if ( ic instanceof LegacyDocumentUpdater )
- {
- ( (LegacyDocumentUpdater) ic ).updateLegacyDocument( ai, document );
- }
- }
-
- return document;
- }
-
- static void packDirectory( Directory directory, OutputStream os )
- throws IOException
- {
- ZipOutputStream zos = null;
- try
- {
- zos = new ZipOutputStream( os );
- zos.setLevel( 9 );
-
- String[] names = directory.listAll();
-
- boolean savedTimestamp = false;
-
- byte[] buf = new byte[8192];
-
- for ( int i = 0; i < names.length; i++ )
- {
- String name = names[i];
-
- writeFile( name, zos, directory, buf );
-
- if ( name.equals( IndexUtils.TIMESTAMP_FILE ) )
- {
- savedTimestamp = true;
- }
- }
-
- // FSDirectory filter out the foreign files
- if ( !savedTimestamp && directory.fileExists( IndexUtils.TIMESTAMP_FILE ) )
- {
- writeFile( IndexUtils.TIMESTAMP_FILE, zos, directory, buf );
- }
- }
- finally
- {
- IndexUtils.close( zos );
- }
- }
-
- static void writeFile( String name, ZipOutputStream zos, Directory directory, byte[] buf )
- throws IOException
- {
- ZipEntry e = new ZipEntry( name );
-
- zos.putNextEntry( e );
-
- IndexInput in = directory.openInput( name, IOContext.DEFAULT );
-
- try
- {
- int toRead = 0;
-
- int bytesLeft = (int) in.length();
-
- while ( bytesLeft > 0 )
- {
- toRead = ( bytesLeft >= buf.length ) ? buf.length : bytesLeft;
- bytesLeft -= toRead;
-
- in.readBytes( buf, 0, toRead, false );
-
- zos.write( buf, 0, toRead );
- }
- }
- finally
- {
- IndexUtils.close( in );
- }
-
- zos.flush();
-
- zos.closeEntry();
- }
-
- void writeIndexData( IndexingContext context, List<Integer> docIndexes, File targetArchive )
+ void writeIndexData( IndexPackingRequest request, List<Integer> docIndexes, File targetArchive )
throws IOException
{
if ( targetArchive.exists() )
@@ -479,7 +212,7 @@ public class DefaultIndexPacker
os = new FileOutputStream( targetArchive );
IndexDataWriter dw = new IndexDataWriter( os );
- dw.write( context, docIndexes );
+ dw.write( request.getContext(), request.getIndexReader(), docIndexes );
os.flush();
}
@@ -524,9 +257,9 @@ public class DefaultIndexPacker
if ( request.isCreateChecksumFiles() )
{
- FileUtils.fileWrite(
- new File( targetPropertyFile.getParentFile(), targetPropertyFile.getName() + ".sha1" ).getAbsolutePath(),
- DigesterUtils.getSha1Digest( targetPropertyFile ) );
+ FileUtils.fileWrite( new File( targetPropertyFile.getParentFile(),
+ targetPropertyFile.getName() + ".sha1" ).getAbsolutePath(),
+ DigesterUtils.getSha1Digest( targetPropertyFile ) );
FileUtils.fileWrite(
new File( targetPropertyFile.getParentFile(), targetPropertyFile.getName() + ".md5" ).getAbsolutePath(),
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java b/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
index 7debc23..0b74ea3 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/packer/IndexPackingRequest.java
@@ -23,8 +23,12 @@ import java.io.File;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.maven.index.context.IndexingContext;
+import static com.google.common.base.Preconditions.checkNotNull;
+
/**
* An index packing request.
*/
@@ -32,9 +36,11 @@ public class IndexPackingRequest
{
public static final int MAX_CHUNKS = 30;
- private IndexingContext context;
+ private final IndexingContext context;
+
+ private final IndexReader indexReader;
- private File targetDir;
+ private final File targetDir;
private boolean createIncrementalChunks;
@@ -46,11 +52,13 @@ public class IndexPackingRequest
private Collection<IndexFormat> formats;
- public IndexPackingRequest( IndexingContext context, File targetDir )
+ public IndexPackingRequest( final IndexingContext context, final IndexReader indexReader, final File targetDir )
{
- this.context = context;
+ this.context = checkNotNull(context);
- this.targetDir = targetDir;
+ this.indexReader = checkNotNull( indexReader );
+
+ this.targetDir = checkNotNull( targetDir );
this.createIncrementalChunks = true;
@@ -60,7 +68,7 @@ public class IndexPackingRequest
this.useTargetProperties = false;
- this.formats = Arrays.asList( IndexFormat.FORMAT_LEGACY, IndexFormat.FORMAT_V1 );
+ this.formats = Arrays.asList( IndexFormat.FORMAT_V1 );
}
public IndexingContext getContext()
@@ -68,10 +76,7 @@ public class IndexPackingRequest
return context;
}
- public void setContext( IndexingContext context )
- {
- this.context = context;
- }
+ public IndexReader getIndexReader() { return indexReader; }
/**
* Sets index formats to be created
@@ -94,11 +99,6 @@ public class IndexPackingRequest
return targetDir;
}
- public void setTargetDir( File targetDir )
- {
- this.targetDir = targetDir;
- }
-
public boolean isCreateIncrementalChunks()
{
return createIncrementalChunks;
@@ -144,6 +144,6 @@ public class IndexPackingRequest
*/
public static enum IndexFormat
{
- FORMAT_LEGACY, FORMAT_V1;
+ FORMAT_V1;
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/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..c5226f7 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
@@ -262,128 +262,6 @@ public class DefaultIndexUpdater
}
}
- /**
- * Unpack legacy index archive into a specified Lucene <code>Directory</code>
- *
- * @param is a <code>ZipInputStream</code> with index data
- * @param directory Lucene <code>Directory</code> to unpack index data to
- * @return {@link Date} of the index update or null if it can't be read
- */
- public static Date unpackIndexArchive( final InputStream is, final Directory directory,
- final IndexingContext context )
- throws IOException
- {
- File indexArchive = File.createTempFile( "nexus-index", "" );
-
- File indexDir = new File( indexArchive.getAbsoluteFile().getParentFile(), indexArchive.getName() + ".dir" );
-
- indexDir.mkdirs();
-
- FSDirectory fdir = FSDirectory.open( indexDir );
-
- try
- {
- unpackDirectory( fdir, is );
- copyUpdatedDocuments( fdir, directory, context );
-
- Date timestamp = IndexUtils.getTimestamp( fdir );
- IndexUtils.updateTimestamp( directory, timestamp );
- return timestamp;
- }
- finally
- {
- IndexUtils.close( fdir );
- indexArchive.delete();
- IndexUtils.delete( indexDir );
- }
- }
-
- private static void unpackDirectory( final Directory directory, final InputStream is )
- throws IOException
- {
- byte[] buf = new byte[4096];
-
- ZipEntry entry;
-
- ZipInputStream zis = null;
-
- try
- {
- zis = new ZipInputStream( is );
-
- while ( ( entry = zis.getNextEntry() ) != null )
- {
- if ( entry.isDirectory() || entry.getName().indexOf( '/' ) > -1 )
- {
- continue;
- }
-
- IndexOutput io = directory.createOutput( entry.getName(), IOContext.DEFAULT );
- try
- {
- int n = 0;
-
- while ( ( n = zis.read( buf ) ) != -1 )
- {
- io.writeBytes( buf, n );
- }
- }
- finally
- {
- IndexUtils.close( io );
- }
- }
- }
- finally
- {
- IndexUtils.close( zis );
- }
- }
-
- private static void copyUpdatedDocuments( final Directory sourcedir, final Directory targetdir,
- final IndexingContext context )
- throws CorruptIndexException, LockObtainFailedException, IOException
- {
- IndexWriter w = null;
- IndexReader r = null;
- try
- {
- r = IndexReader.open( sourcedir );
- w = new NexusIndexWriter( targetdir, new NexusAnalyzer(), true );
- Bits liveDocs = MultiFields.getLiveDocs(r);
-
- for ( int i = 0; i < r.maxDoc(); i++ )
- {
- if (liveDocs == null || liveDocs.get(i) )
- {
- Document sourceDocument = r.document( i );
- Document targetDocument = IndexUtils.updateDocument( sourceDocument, context );
-
- //Lucene does not return metadata for stored documents, so we need to fix that
- for (IndexableField indexableField : targetDocument.getFields())
- {
- if(indexableField.name().equals(DefaultIndexingContext.FLD_DESCRIPTOR))
- {
- targetDocument = new Document();
- targetDocument.add(new StringField(DefaultIndexingContext.FLD_DESCRIPTOR, DefaultIndexingContext.FLD_DESCRIPTOR_CONTENTS, Field.Store.YES));
- targetDocument.add( new StringField( DefaultIndexingContext.FLD_IDXINFO, DefaultIndexingContext.VERSION + ArtifactInfo.FS + context.getRepositoryId(), Field.Store.YES) );
- break;
- }
- }
- w.addDocument( targetDocument );
- }
- }
-
- w.forceMerge(1);
- w.commit();
- }
- finally
- {
- IndexUtils.close( w );
- IndexUtils.close( r );
- }
- }
-
private static void filterDirectory( final Directory directory, final DocumentFilter filter )
throws IOException
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
index d701347..f76200c 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataReader.java
@@ -28,11 +28,14 @@ import java.io.InputStream;
import java.io.UTFDataFormatException;
import java.util.Date;
import java.util.zip.GZIPInputStream;
+
+import com.google.common.base.Strings;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.IndexWriter;
+import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.context.IndexUtils;
import org.apache.maven.index.context.IndexingContext;
@@ -138,6 +141,21 @@ public class IndexDataReader
doc.add( readField() );
}
+ // Fix up UINFO field wrt MINDEXER-41
+ final Field uinfoField = (Field) doc.getField( ArtifactInfo.UINFO );
+ final String info = doc.get( ArtifactInfo.INFO );
+ if (uinfoField!= null && !Strings.isNullOrEmpty(info)) {
+ final String[] splitInfo = ArtifactInfo.FS_PATTERN.split( info );
+ if ( splitInfo.length > 6 )
+ {
+ final String extension = splitInfo[6];
+ final String uinfoString = uinfoField.stringValue();
+ if (uinfoString.endsWith( ArtifactInfo.FS + ArtifactInfo.NA )) {
+ uinfoField.setStringValue( uinfoString + ArtifactInfo.FS + ArtifactInfo.nvl( extension ) );
+ }
+ }
+ }
+
return doc;
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
index 4c9e2bb..13ad7ce 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexDataWriter.java
@@ -84,21 +84,12 @@ public class IndexDataWriter
this.descriptorWritten = false;
}
- public int write( IndexingContext context, List<Integer> docIndexes )
+ public int write( IndexingContext context, IndexReader indexReader, List<Integer> docIndexes )
throws IOException
{
writeHeader( context );
- int n = 0;
- final IndexSearcher indexSearcher = context.acquireIndexSearcher();
- try
- {
- n = writeDocuments( indexSearcher.getIndexReader(), docIndexes );
- }
- finally
- {
- context.releaseIndexSearcher( indexSearcher );
- }
+ int n = writeDocuments( indexReader, docIndexes );
writeGroupFields();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
index 6b1327d..7e2751e 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
@@ -535,7 +535,7 @@ public abstract class AbstractRepoNexusIndexerTest
if ( uinfo != null )
{
String info = document.get( ArtifactInfo.INFO );
- assertFalse( info.startsWith( "null" ) );
+ assertFalse( "Bad:" + info, info.startsWith( "null" ) );
}
}
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextPublishingTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextPublishingTest.java b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextPublishingTest.java
index 4483f0f..e4c9908 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextPublishingTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseWithMergedContextPublishingTest.java
@@ -19,6 +19,7 @@ package org.apache.maven.index;
* under the License.
*/
+import org.apache.lucene.search.IndexSearcher;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.packer.IndexPackingRequest;
@@ -73,11 +74,15 @@ public class ConcurrentUseWithMergedContextPublishingTest
// it was probably publish rubbish anyway.
final File publish = new File( repoPublish, "publish-" + counter.getAndIncrement() );
- final IndexPackingRequest request = new IndexPackingRequest( context, publish );
-
- request.setCreateIncrementalChunks( false );
-
- packer.packIndex( request );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ final IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), publish );
+ request.setCreateIncrementalChunks( false );
+ packer.packIndex( request );
+ } finally {
+ context.releaseIndexSearcher( indexSearcher );
+ }
return 1;
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
index 83bf1e4..7d589a6 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.FilteredQuery;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
@@ -43,7 +44,11 @@ import org.apache.maven.index.FlatSearchResponse;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.packer.DefaultIndexPacker;
+import org.apache.maven.index.packer.IndexPacker;
+import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.updater.DefaultIndexUpdater;
+import org.apache.maven.index.updater.IndexUpdateRequest;
+import org.apache.maven.index.updater.IndexUpdater;
public class DefaultIndexNexusIndexerTest
extends MinimalIndexNexusIndexerTest
@@ -162,9 +167,22 @@ public class DefaultIndexNexusIndexerTest
public void testIndexTimestamp()
throws Exception
{
- ByteArrayOutputStream os = new ByteArrayOutputStream();
+ final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
+ targetDir.delete();
+ targetDir.mkdirs();
- DefaultIndexPacker.packIndexArchive( context, os );
+ final IndexPacker indexPacker = lookup( IndexPacker.class );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ final IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir );
+ indexPacker.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
Thread.sleep( 1000L );
@@ -172,11 +190,12 @@ public class DefaultIndexNexusIndexerTest
Directory newIndexDir = FSDirectory.open( newIndex );
- DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( os.toByteArray() ), newIndexDir, context );
-
IndexingContext newContext =
nexusIndexer.addIndexingContext( "test-new", "test", null, newIndexDir, null, null, DEFAULT_CREATORS );
+ final IndexUpdater indexUpdater = lookup( IndexUpdater.class );
+ indexUpdater.fetchAndUpdateIndex( new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) ) );
+
assertEquals( context.getTimestamp().getTime(), newContext.getTimestamp().getTime() );
assertEquals( context.getTimestamp(), newContext.getTimestamp() );
@@ -189,6 +208,8 @@ public class DefaultIndexNexusIndexerTest
FlatSearchResponse response = nexusIndexer.searchFlat( request );
Collection<ArtifactInfo> r = response.getResults();
+ System.out.println(r);
+
assertEquals( 2, r.size() );
List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( r );
@@ -211,11 +232,11 @@ public class DefaultIndexNexusIndexerTest
newIndexDir = FSDirectory.open( newIndex );
- DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( os.toByteArray() ), newIndexDir, context );
-
newContext =
nexusIndexer.addIndexingContext( "test-new", "test", null, newIndexDir, null, null, DEFAULT_CREATORS );
+ indexUpdater.fetchAndUpdateIndex( new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) ) );
+
assertEquals( timestamp, newContext.getTimestamp() );
newContext.close( true );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
index bce9143..dc07273 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
@@ -29,9 +29,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.FilteredQuery;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
@@ -40,9 +42,14 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.packer.DefaultIndexPacker;
+import org.apache.maven.index.packer.IndexPacker;
+import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.search.grouping.GAGrouping;
import org.apache.maven.index.search.grouping.GGrouping;
import org.apache.maven.index.updater.DefaultIndexUpdater;
+import org.apache.maven.index.updater.IndexUpdateRequest;
+import org.apache.maven.index.updater.IndexUpdater;
+
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -328,9 +335,22 @@ public class FullIndexNexusIndexerTest
public void testIndexTimestamp()
throws Exception
{
- ByteArrayOutputStream os = new ByteArrayOutputStream();
+ final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
+ targetDir.delete();
+ targetDir.mkdirs();
- DefaultIndexPacker.packIndexArchive( context, os );
+ final IndexPacker indexPacker = lookup( IndexPacker.class );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ final IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir );
+ indexPacker.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
Thread.sleep( 1000L );
@@ -338,11 +358,13 @@ public class FullIndexNexusIndexerTest
Directory newIndexDir = FSDirectory.open( newIndex );
- DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( os.toByteArray() ), newIndexDir, context );
-
IndexingContext newContext =
nexusIndexer.addIndexingContext( "test-new", "test", null, newIndexDir, null, null, DEFAULT_CREATORS );
+ final IndexUpdater indexUpdater = lookup( IndexUpdater.class );
+ indexUpdater.fetchAndUpdateIndex( new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) ) );
+
+
assertEquals( context.getTimestamp().getTime(), newContext.getTimestamp().getTime() );
assertEquals( context.getTimestamp(), newContext.getTimestamp() );
@@ -377,11 +399,11 @@ public class FullIndexNexusIndexerTest
newIndexDir = FSDirectory.open( newIndex );
- DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( os.toByteArray() ), newIndexDir, context );
-
newContext =
nexusIndexer.addIndexingContext( "test-new", "test", null, newIndexDir, null, null, DEFAULT_CREATORS );
+ indexUpdater.fetchAndUpdateIndex( new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) ) );
+
assertEquals( timestamp, newContext.getTimestamp() );
newContext.close( true );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java b/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java
deleted file mode 100644
index 027ecb2..0000000
--- a/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java
+++ /dev/null
@@ -1,288 +0,0 @@
-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 java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.maven.index.search.grouping.GAGrouping;
-import org.apache.maven.index.updater.DefaultIndexUpdater;
-import org.junit.Ignore;
-
-/**
- * @author Eugene Kuleshov
- */
-@Ignore("Index format too old for Lucene 4")
-public class Index20081108RegressionTest
- extends AbstractRepoNexusIndexerTest
-{
- @Override
- protected void prepareNexusIndexer( NexusIndexer nexusIndexer )
- throws Exception
- {
- context = nexusIndexer.addIndexingContextForced( "test", "test", null, indexDir, null, null, DEFAULT_CREATORS );
-
- InputStream is = new FileInputStream( getBasedir() + //
- File.separator + "src" + //
- File.separator + "test" + //
- File.separator + "nexus-maven-repository-index.20081108.zip" );
-
- Directory tempDir = new RAMDirectory();
- DefaultIndexUpdater.unpackIndexArchive( is, tempDir, context );
- context.replace( tempDir );
- }
-
- public void testExtension()
- throws Exception
- {
- assertEquals( 31, context.getSize() );
-
- {
- Query q = nexusIndexer.constructQuery( MAVEN.GROUP_ID, "qdox", SearchType.SCORED );
- FlatSearchResponse response = nexusIndexer.searchFlat( new FlatSearchRequest( q ) );
- assertEquals( response.getResults().toString(), 2, response.getTotalHits() );
-
- List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( response.getResults() );
- assertEquals( 2, list.size() );
-
- {
- ArtifactInfo ai = list.get( 0 );
- assertEquals( "1.6.1", ai.getVersion() );
- assertEquals( "jar", ai.getFileExtension() );
- assertEquals( "jar", ai.getPackaging() );
- }
- {
- ArtifactInfo ai = list.get( 1 );
- assertEquals( "1.5", ai.getVersion() );
- assertEquals( "jar", ai.getFileExtension() );
- assertEquals( "jar", ai.getPackaging() );
- }
- }
- {
- Query query = new TermQuery( new Term( ArtifactInfo.PACKAGING, "tar.gz" ) );
- FlatSearchResponse response = nexusIndexer.searchFlat( new FlatSearchRequest( query ) );
- assertEquals( response.getResults().toString(), 1, response.getTotalHits() );
-
- ArtifactInfo ai = response.getResults().iterator().next();
- assertEquals( "tar.gz", ai.getPackaging() );
- assertEquals( "tar.gz", ai.getFileExtension() );
- }
- {
- Query query = new TermQuery( new Term( ArtifactInfo.PACKAGING, "zip" ) );
- FlatSearchResponse response = nexusIndexer.searchFlat( new FlatSearchRequest( query ) );
- assertEquals( response.getResults().toString(), 1, response.getTotalHits() );
-
- ArtifactInfo ai = response.getResults().iterator().next();
- assertEquals( "zip", ai.getPackaging() );
- assertEquals( "zip", ai.getFileExtension() );
- }
- }
-
- @Override
- public void testRootGroups()
- throws Exception
- {
- Set<String> rootGroups = context.getRootGroups();
- assertEquals( rootGroups.toString(), 8, rootGroups.size() );
-
- assertGroup( 2, "qdox", context );
-
- assertGroup( 1, "proptest", context );
-
- assertGroup( 1, "junit", context );
-
- assertGroup( 6, "commons-logging", context );
-
- assertGroup( 1, "regexp", context );
-
- assertGroup( 1, "commons-cli", context );
-
- assertGroup( 15, "org", context );
-
- assertGroup( 6, "org.slf4j", context );
-
- assertGroup( 3, "org.testng", context );
-
- assertGroup( 3, "org.apache", context );
-
- assertGroup( 1, "org.apache.directory", context );
- assertGroup( 1, "org.apache.directory.server", context );
-
- assertGroup( 1, "org.apache.maven", context );
- assertGroup( 1, "org.apache.maven.plugins", context );
- assertGroup( 0, "org.apache.maven.plugins.maven-core-it-plugin", context );
- }
-
- @Override
- public void testSearchFlatPaged()
- throws Exception
- {
- FlatSearchRequest request = new FlatSearchRequest( nexusIndexer.constructQuery( MAVEN.GROUP_ID, "org", SearchType.SCORED ) );
-
- // See MINDEXER-22
- // Flat search is not pageable
- // request.setStart( 0 );
-
- request.setCount( 50 );
-
- FlatSearchResponse response = nexusIndexer.searchFlat( request );
-
- assertEquals( response.getResults().toString(), 15, response.getTotalHits() );
- }
-
- @Override
- public void testSearchGroupedProblematicNames()
- throws Exception
- {
-
- // ----------------------------------------------------------------------------
- // Artifacts with "problematic" names
- // ----------------------------------------------------------------------------
- {
- // "-" in the name
- Query q = nexusIndexer.constructQuery( MAVEN.ARTIFACT_ID, "commons-logg*", SearchType.SCORED );
-
- GroupedSearchRequest request = new GroupedSearchRequest( q, new GAGrouping() );
-
- GroupedSearchResponse response = nexusIndexer.searchGrouped( request );
-
- Map<String, ArtifactInfoGroup> r = response.getResults();
-
- assertEquals( 1, r.size() );
-
- ArtifactInfoGroup ig = r.values().iterator().next();
-
- assertEquals( "commons-logging : commons-logging", ig.getGroupKey() );
-
- assertEquals( ig.getArtifactInfos().toString(), 6, ig.getArtifactInfos().size() );
- }
-
- {
- // numbers and "-" in the name
- Query q = nexusIndexer.constructQuery( MAVEN.ARTIFACT_ID, "jcl104-over-slf4*", SearchType.SCORED );
-
- GroupedSearchRequest request = new GroupedSearchRequest( q, new GAGrouping() );
-
- GroupedSearchResponse response = nexusIndexer.searchGrouped( request );
- Map<String, ArtifactInfoGroup> r = response.getResults();
-
- assertEquals( 1, r.size() );
-
- ArtifactInfoGroup ig = r.values().iterator().next();
-
- assertEquals( ig.getArtifactInfos().toString(), 1, ig.getArtifactInfos().size() );
-
- assertEquals( "org.slf4j : jcl104-over-slf4j", ig.getGroupKey() );
- }
- }
-
- // See MINDEXER-22
- // Flat search is not pageable
-// @Override
-// public void donttestPaging()
-// throws Exception
-// {
-// // we have 15 artifact for this search
-// int total = 15;
-//
-// int pageSize = 4;
-//
-// Query q = nexusIndexer.constructQuery( MAVEN.GROUP_ID, "org", SearchType.SCORED );
-//
-// FlatSearchRequest req = new FlatSearchRequest( q );
-//
-// // have page size of 4, that will make us 4 pages
-// req.setCount( pageSize );
-//
-// List<ArtifactInfo> constructedPageList = new ArrayList<ArtifactInfo>();
-//
-// int offset = 0;
-//
-// while ( true )
-// {
-// req.setStart( offset );
-//
-// FlatSearchResponse resp = nexusIndexer.searchFlat( req );
-//
-// Collection<ArtifactInfo> p = resp.getResults();
-//
-// assertEquals( p.toString(), total, resp.getTotalHits() );
-//
-// assertEquals( Math.min( pageSize, total - offset ), p.size() );
-//
-// constructedPageList.addAll( p );
-//
-// offset += pageSize;
-//
-// if ( offset > total )
-// {
-// break;
-// }
-// }
-//
-// //
-// FlatSearchResponse response = nexusIndexer.searchFlat( new FlatSearchRequest( q ) );
-// Collection<ArtifactInfo> onePage = response.getResults();
-//
-// List<ArtifactInfo> onePageList = new ArrayList<ArtifactInfo>( onePage );
-//
-// // onePage and constructedPage should hold equal elems in the same order
-// assertTrue( resultsAreEqual( onePageList, constructedPageList ) );
-// }
-
- @Override
- public void testPurge()
- throws Exception
- {
- // we have 14 artifact for this search
- Query q = nexusIndexer.constructQuery( MAVEN.GROUP_ID, "org", SearchType.SCORED );
- FlatSearchRequest request = new FlatSearchRequest( q );
-
- FlatSearchResponse response1 = nexusIndexer.searchFlat( request );
- Collection<ArtifactInfo> p1 = response1.getResults();
-
- assertEquals( 15, p1.size() );
-
- context.purge();
-
- FlatSearchResponse response2 = nexusIndexer.searchFlat( request );
- Collection<ArtifactInfo> p2 = response2.getResults();
-
- assertEquals( 0, p2.size() );
- }
-
- @Override
- public void testIdentify()
- {
- // skip test (sha1 field wasn't stored in the old index format)
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
index 8d2006c..fc23b79 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java
@@ -68,7 +68,7 @@ public class Nexus1179NexusIndexerTest
assertEquals( "ant", ai.getGroupId() );
assertEquals( "ant", ai.getArtifactId() );
assertEquals( "1.6.5", ai.getVersion() );
- assertEquals( "jar", ai.getPackaging() );
+ assertEquals( null, ai.getPackaging() ); // coz no POM present
assertEquals( null, ai.getClassifier() );
assertEquals( "nexus-1179", ai.getRepository() );
assertEquals( "jar", ai.getFileExtension() );
@@ -79,7 +79,7 @@ public class Nexus1179NexusIndexerTest
assertEquals( "ant", ai.getGroupId() );
assertEquals( "ant", ai.getArtifactId() );
assertEquals( "1.5.1", ai.getVersion() );
- assertEquals( null, ai.getPackaging() );
+ assertEquals( "jar", ai.getPackaging() ); // coz POM is present and says so
assertEquals( null, ai.getClassifier() );
assertEquals( "nexus-1179", ai.getRepository() );
assertEquals( "pom", ai.getFileExtension() );
@@ -101,7 +101,7 @@ public class Nexus1179NexusIndexerTest
assertEquals( "org", ai.getGroupId() );
assertEquals( "test", ai.getArtifactId() );
assertEquals( "1.0", ai.getVersion() );
- assertEquals( null, ai.getPackaging() );
+ assertEquals( "jar", ai.getPackaging() ); // coz POM is present and says so
assertEquals( null, ai.getClassifier() );
assertEquals( "nexus-1179", ai.getRepository() );
assertEquals( "pom", ai.getFileExtension() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
index 21d01b7..c93e9f5 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java
@@ -29,14 +29,19 @@ import java.util.Map;
import java.util.Set;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.index.packer.DefaultIndexPacker;
+import org.apache.maven.index.packer.IndexPacker;
+import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.search.grouping.GAGrouping;
import org.apache.maven.index.updater.DefaultIndexUpdater;
+import org.apache.maven.index.updater.IndexUpdateRequest;
+import org.apache.maven.index.updater.IndexUpdater;
/** http://issues.sonatype.org/browse/NEXUS-13 */
public class Nexus13NexusIndexerTest
@@ -106,9 +111,22 @@ public class Nexus13NexusIndexerTest
public void testIndexTimestamp()
throws Exception
{
- ByteArrayOutputStream os = new ByteArrayOutputStream();
+ final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" );
+ targetDir.delete();
+ targetDir.mkdirs();
- DefaultIndexPacker.packIndexArchive( context, os );
+ final IndexPacker indexPacker = lookup( IndexPacker.class );
+ final IndexSearcher indexSearcher = context.acquireIndexSearcher();
+ try
+ {
+ final IndexPackingRequest request =
+ new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir );
+ indexPacker.packIndex( request );
+ }
+ finally
+ {
+ context.releaseIndexSearcher( indexSearcher );
+ }
Thread.sleep( 1000L );
@@ -117,10 +135,9 @@ public class Nexus13NexusIndexerTest
IndexingContext newContext =
nexusIndexer.addIndexingContext( "test-new", "nexus-13", null, indexDir, null, null, DEFAULT_CREATORS );
- Directory newIndexDir = new RAMDirectory();
-
- DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( os.toByteArray() ), newIndexDir, newContext );
- newContext.replace( newIndexDir );
+ final IndexUpdater indexUpdater = lookup( IndexUpdater.class );
+ final IndexUpdateRequest updateRequest = new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) );
+ indexUpdater.fetchAndUpdateIndex( updateRequest );
assertEquals( 0, newContext.getTimestamp().getTime() - context.getTimestamp().getTime() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalMergedCtxTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalMergedCtxTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalMergedCtxTest.java
index 3e72fb3..d52fc87 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalMergedCtxTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalMergedCtxTest.java
@@ -40,6 +40,7 @@ public class Nexus1911IncrementalMergedCtxTest
member = context;
indexMergedDir = super.getDirectory( "index/nexus-1911-merged" );
+ indexMergedDir.mkdirs();
context =
indexer.addMergedIndexingContext( "merged", "merged", member.getRepository(), indexMergedDir, false,
[4/6] git commit: Merge remote-tracking branch 'asf/master' into
sixpack
Posted by cs...@apache.org.
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
----------------------------------------------------------------------
[5/6] git commit: Fixing the tests and more
Posted by cs...@apache.org.
Fixing the tests and more
relates to previous changes mostly in tests, to
not pollute "randomly created" files the build itself
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/875d7b4c
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/875d7b4c
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/875d7b4c
Branch: refs/heads/master
Commit: 875d7b4c6f6de0a965b443cb963a937cac9f24b6
Parents: 85dace8
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Tue Jul 8 12:09:02 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Tue Jul 8 12:09:02 2014 +0200
----------------------------------------------------------------------
.../org/apache/maven/index/ArtifactContext.java | 4 +--
.../org/apache/maven/index/ArtifactInfo.java | 7 +++---
.../index/DefaultArtifactContextProducer.java | 2 +-
.../main/java/org/apache/maven/index/MAVEN.java | 2 +-
.../index/context/DefaultIndexingContext.java | 26 ++++++++++++++++++--
.../index/context/MergedIndexingContext.java | 25 +++++++++++++++++--
.../maven/index/packer/DefaultIndexPacker.java | 2 +-
.../apache/maven/index/util/zip/ZipFacade.java | 2 +-
.../apache/maven/index/ConcurrentUseTest.java | 4 +--
.../index/DefaultIndexNexusIndexerTest.java | 7 ------
.../maven/index/Mindexer14HitLimitTest.java | 2 +-
.../index/Nexus3293TimestampSnapshotTest.java | 2 +-
.../JarFileContentsIndexCreatorTest.java | 6 ++---
...MavenPluginArtifactInfoIndexCreatorTest.java | 2 +-
.../creator/OsgiArtifactIndexCreatorTest.java | 2 +-
.../index/updater/AbstractIndexUpdaterTest.java | 2 +-
16 files changed, 67 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
index c911406..bd148a6 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
@@ -84,7 +84,7 @@ public class ArtifactContext
public Model getPomModel()
{
// First check for local pom file
- if ( getPom() != null && getPom().exists() )
+ if ( getPom() != null && getPom().isFile() )
{
try
{
@@ -100,7 +100,7 @@ public class ArtifactContext
}
}
// Otherwise, check for pom contained in maven generated artifact
- else if ( getArtifact() != null )
+ else if ( getArtifact() != null && getArtifact().isFile() )
{
ZipHandle handle = null;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
index d9011ec..40a3125 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
@@ -27,18 +27,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.google.common.base.Strings;
import org.apache.maven.index.artifact.Gav;
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
import org.apache.maven.index.creator.OsgiArtifactIndexCreator;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.InvalidVersionSpecificationException;
import org.eclipse.aether.version.Version;
import org.eclipse.aether.version.VersionScheme;
+import com.google.common.base.Strings;
+
/**
* ArtifactInfo holds the values known about an repository artifact. This is a simple Value Object kind of stuff.
* Phasing out.
@@ -295,7 +295,7 @@ public class ArtifactInfo
versionScheme = new GenericVersionScheme();
}
- public ArtifactInfo( String repository, String groupId, String artifactId, String version, String classifier )
+ public ArtifactInfo( String repository, String groupId, String artifactId, String version, String classifier, String extension )
{
this();
this.repository = repository;
@@ -303,6 +303,7 @@ public class ArtifactInfo
this.artifactId = artifactId;
this.version = version;
this.classifier = classifier;
+ this.fileExtension = extension;
}
public Version getArtifactVersion()
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/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 35886cb..6e96222 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
@@ -117,7 +117,7 @@ public class DefaultArtifactContextProducer
String classifier = gav.getClassifier();
- ArtifactInfo ai = new ArtifactInfo( context.getRepositoryId(), groupId, artifactId, version, classifier );
+ ArtifactInfo ai = new ArtifactInfo( context.getRepositoryId(), groupId, artifactId, version, classifier, gav.getExtension() );
// store extension if classifier is not empty
if ( !StringUtils.isEmpty( ai.getClassifier() ) )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java b/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
index af2e472..42c124b 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
@@ -44,7 +44,7 @@ public interface MAVEN
// Artifact Packaging (extension for secondary artifacts!).
Field PACKAGING = new Field( null, MAVEN_NAMESPACE, "packaging", "Packaging/Extension" );
- // Artifact Packaging (extension for secondary artifacts!).
+ // Artifact extension
Field EXTENSION = new Field( null, MAVEN_NAMESPACE, "extension", "Extension" );
Field CLASSIFIER = new Field( null, MAVEN_NAMESPACE, "classifier", "Classifier" );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
index a02bfa1..afae82b 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
@@ -146,6 +146,8 @@ public class DefaultIndexingContext
this.gavCalculator = new M2GavCalculator();
prepareIndex( reclaimIndex );
+
+ setIndexDirectoryFile( null );
}
public DefaultIndexingContext( String id, String repositoryId, File repository, File indexDirectoryFile,
@@ -156,7 +158,7 @@ public class DefaultIndexingContext
this( id, repositoryId, repository, repositoryUrl, indexUpdateUrl, indexCreators,
FSDirectory.open( indexDirectoryFile ), reclaimIndex );
- this.indexDirectoryFile = indexDirectoryFile;
+ setIndexDirectoryFile( indexDirectoryFile );
}
@Deprecated
@@ -169,7 +171,7 @@ public class DefaultIndexingContext
if ( indexDirectory instanceof FSDirectory )
{
- this.indexDirectoryFile = ( (FSDirectory) indexDirectory ).getDirectory();
+ setIndexDirectoryFile(( (FSDirectory) indexDirectory ).getDirectory() );
}
}
@@ -177,6 +179,26 @@ public class DefaultIndexingContext
{
return indexDirectory;
}
+
+ /**
+ * Sets index location. As usually index is persistent (is on disk), this will point to that value, but in
+ * some circumstances (ie, using RAMDisk for index), this will point to an existing tmp directory.
+ */
+ protected void setIndexDirectoryFile(File dir) throws IOException
+ {
+ if ( dir == null )
+ {
+ // best effort, to have a directory thru the life of a ctx
+ File tmpFile = File.createTempFile( "mindexer-ctx" + id, "tmp" );
+ tmpFile.delete();
+ tmpFile.mkdirs();
+ this.indexDirectoryFile = tmpFile;
+ }
+ else
+ {
+ this.indexDirectoryFile = dir;
+ }
+ }
public File getIndexDirectoryFile()
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
index 2fe0880..fc008ff 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
@@ -72,6 +72,7 @@ public class MergedIndexingContext
this.gavCalculator = new M2GavCalculator();
this.directory = indexDirectory;
this.searchable = searchable;
+ setIndexDirectoryFile( null );
}
public MergedIndexingContext( String id, String repositoryId, File repository, File indexDirectoryFile,
@@ -80,7 +81,7 @@ public class MergedIndexingContext
{
this( membersProvider, id, repositoryId, repository, FSDirectory.open( indexDirectoryFile ), searchable );
- this.directoryFile = indexDirectoryFile;
+ setIndexDirectoryFile( indexDirectoryFile );
}
@Deprecated
@@ -92,7 +93,7 @@ public class MergedIndexingContext
if ( indexDirectory instanceof FSDirectory )
{
- this.directoryFile = ( (FSDirectory) indexDirectory ).getDirectory();
+ setIndexDirectoryFile( ( (FSDirectory) indexDirectory ).getDirectory() );
}
}
@@ -291,6 +292,26 @@ public class MergedIndexingContext
return directoryFile;
}
+ /**
+ * Sets index location. As usually index is persistent (is on disk), this will point to that value, but in
+ * some circumstances (ie, using RAMDisk for index), this will point to an existing tmp directory.
+ */
+ protected void setIndexDirectoryFile(File dir) throws IOException
+ {
+ if ( dir == null )
+ {
+ // best effort, to have a directory thru the life of a ctx
+ File tmpFile = File.createTempFile( "mindexer-ctx" + id, "tmp" );
+ tmpFile.delete();
+ tmpFile.mkdirs();
+ this.directoryFile = tmpFile;
+ }
+ else
+ {
+ this.directoryFile = dir;
+ }
+ }
+
public GavCalculator getGavCalculator()
{
return gavCalculator;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/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 4c084f3..b66cbde 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
@@ -183,7 +183,7 @@ public class DefaultIndexPacker
{
File file = null;
- if ( request.isUseTargetProperties() )
+ if ( request.isUseTargetProperties() || request.getContext().getIndexDirectoryFile() == null )
{
file = new File( request.getTargetDir(), IndexingContext.INDEX_REMOTE_PROPERTIES_FILE );
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java b/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
index 9c0fa51..1dcae06 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
@@ -62,7 +62,7 @@ public class ZipFacade
}
}
- throw new IOException( "The targetFile should point to an existing ZIP file!" );
+ throw new IOException( "The targetFile should point to an existing ZIP file:" + targetFile );
}
public static void close( ZipHandle handle )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
index af70b34..fd9e6de 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
@@ -63,7 +63,7 @@ public class ConcurrentUseTest
IndexUserThread[] threads = new IndexUserThread[THREAD_COUNT];
ArtifactInfo ai =
- new ArtifactInfo( "test-default", "org.apache.maven.indexer", "index-concurrent-artifact", "", null );
+ new ArtifactInfo( "test-default", "org.apache.maven.indexer", "index-concurrent-artifact", "", null, "jar" );
for ( int i = 0; i < THREAD_COUNT; i++ )
{
@@ -115,7 +115,7 @@ public class ConcurrentUseTest
{
final ArtifactInfo artifactInfo =
new ArtifactInfo( "test-default", "org.apache.maven.indexer", "index-concurrent-artifact", "1."
- + String.valueOf( versionSource.getAndIncrement() ), null );
+ + String.valueOf( versionSource.getAndIncrement() ), null , "jar");
final ArtifactContext ac = new ArtifactContext( null, null, null, artifactInfo, artifactInfo.calculateGav() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
index 7d589a6..99f6183 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
@@ -19,8 +19,6 @@ package org.apache.maven.index;
* under the License.
*/
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,12 +36,7 @@ import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.index.FlatSearchRequest;
-import org.apache.maven.index.FlatSearchResponse;
-import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
-import org.apache.maven.index.packer.DefaultIndexPacker;
import org.apache.maven.index.packer.IndexPacker;
import org.apache.maven.index.packer.IndexPackingRequest;
import org.apache.maven.index.updater.DefaultIndexUpdater;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java b/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
index 9391399..5f62d1b 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
@@ -55,7 +55,7 @@ public class Mindexer14HitLimitTest
for ( int i = 0; i < count; i++ )
{
- final ArtifactInfo ai = new ArtifactInfo( "mindexer14", gid, aid, String.valueOf( version++ ), null );
+ final ArtifactInfo ai = new ArtifactInfo( "mindexer14", gid, aid, String.valueOf( version++ ), null, "jar" );
final ArtifactContext ac = new ArtifactContext( null, null, null, ai, ai.calculateGav() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
index ead5ef6..6a4500a 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
@@ -69,7 +69,7 @@ public class Nexus3293TimestampSnapshotTest
File pom = new File( getBasedir(), "src/test/nexus-3293/aopalliance/aopalliance/1.0/aopalliance-1.0.pom" );
- ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0-SNAPSHOT", null );
+ ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0-SNAPSHOT", null, "jar" );
M2GavCalculator gavCalc = new M2GavCalculator();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/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 a0ef5b8..7d559fc 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
@@ -50,7 +50,7 @@ public class JarFileContentsIndexCreatorTest
File pom = new File( getBasedir(), "src/test/nexus-2318/aopalliance/aopalliance/1.0/aopalliance-1.0.pom" );
- ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null );
+ ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null, "jar" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
@@ -67,7 +67,7 @@ public class JarFileContentsIndexCreatorTest
File pom = new File( getBasedir(), "src/test/nexus-2318/aopalliance/aopalliance/1.0/aopalliance-1.0.pom" );
- ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null );
+ ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null, "jar" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
@@ -88,7 +88,7 @@ public class JarFileContentsIndexCreatorTest
"src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/1.0-SNAPSHOT/sample-war-1.0-SNAPSHOT.pom" );
ArtifactInfo artifactInfo =
- new ArtifactInfo( "test", "org.apache.maven.indexer.test", "sample-war", "1.0-SNAPSHOT", null );
+ new ArtifactInfo( "test", "org.apache.maven.indexer.test", "sample-war", "1.0-SNAPSHOT", null, "war" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/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 a149d45..f8062bb 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
@@ -57,7 +57,7 @@ public class MavenPluginArtifactInfoIndexCreatorTest
"src/test/repo-creator/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom" );
ArtifactInfo artifactInfo =
- new ArtifactInfo( "test", "org.apache.maven.plugins", "maven-dependency-plugin", "2.0", null );
+ new ArtifactInfo( "test", "org.apache.maven.plugins", "maven-dependency-plugin", "2.0", null, "jar" );
artifactInfo.setPackaging( "maven-plugin" );
artifactInfo.setFileExtension( "jar" );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/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 6965cd3..027d471 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
@@ -77,7 +77,7 @@ public class OsgiArtifactIndexCreatorTest
"src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.pom" );
ArtifactInfo artifactInfo =
- new ArtifactInfo( "test", "org.apache.karaf.features", "org.apache.karaf.features.command", "2.2.2", null );
+ new ArtifactInfo( "test", "org.apache.karaf.features", "org.apache.karaf.features.command", "2.2.2", null, "jar" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
index fe5cc9f..6a3b108 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java
@@ -109,7 +109,7 @@ public abstract class AbstractIndexUpdaterTest
File pomFile = new File( path + ".pom" );
File artifact = new File( path + ".jar" );
File metadata = null;
- ArtifactInfo artifactInfo = new ArtifactInfo( repositoryId, groupId, artifactId, version, classifier );
+ ArtifactInfo artifactInfo = new ArtifactInfo( repositoryId, groupId, artifactId, version, classifier, "jar");
Gav gav =
new Gav( groupId, artifactId, version, classifier, "jar", null, null, artifact.getName(), false,
null, false, null );
[3/6] git commit: Add file ext to be searchable.
Posted by cs...@apache.org.
Add file ext to be searchable.
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/11bd6b96
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/11bd6b96
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/11bd6b96
Branch: refs/heads/master
Commit: 11bd6b96465cb6b9d3f51378e5dc47616541fb61
Parents: 22fbfe0
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Sun Jun 29 19:41:00 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Sun Jun 29 19:41:00 2014 +0200
----------------------------------------------------------------------
indexer-core/src/main/java/org/apache/maven/index/MAVEN.java | 3 +++
.../maven/index/creator/MinimalArtifactInfoIndexCreator.java | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/11bd6b96/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java b/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
index 9505cfb..af2e472 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
@@ -44,6 +44,9 @@ public interface MAVEN
// Artifact Packaging (extension for secondary artifacts!).
Field PACKAGING = new Field( null, MAVEN_NAMESPACE, "packaging", "Packaging/Extension" );
+ // Artifact Packaging (extension for secondary artifacts!).
+ Field EXTENSION = new Field( null, MAVEN_NAMESPACE, "extension", "Extension" );
+
Field CLASSIFIER = new Field( null, MAVEN_NAMESPACE, "classifier", "Classifier" );
// NAME: Artifact Name (from POM)
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/11bd6b96/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 316e4c8..fe90bdb 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
@@ -84,6 +84,9 @@ public class MinimalArtifactInfoIndexCreator
public static final IndexerField FLD_PACKAGING = new IndexerField( MAVEN.PACKAGING, IndexerFieldVersion.V1, "p",
"Artifact Packaging (as keyword)", Store.NO, Index.NOT_ANALYZED );
+ public static final IndexerField FLD_EXTENSION = new IndexerField( MAVEN.EXTENSION, IndexerFieldVersion.V1, "e",
+ "Artifact extension (as keyword)", Store.NO, Index.NOT_ANALYZED );
+
public static final IndexerField FLD_CLASSIFIER = new IndexerField( MAVEN.CLASSIFIER, IndexerFieldVersion.V1, "l",
"Artifact classifier (as keyword)", Store.NO, Index.NOT_ANALYZED );
@@ -263,6 +266,7 @@ public class MinimalArtifactInfoIndexCreator
doc.add( FLD_GROUP_ID.toField( ai.getGroupId() ) );
doc.add( FLD_ARTIFACT_ID.toField( ai.getArtifactId() ) );
doc.add( FLD_VERSION.toField( ai.getVersion() ) );
+ doc.add( FLD_EXTENSION.toField( ai.getFileExtension() ) );
if ( ai.getName() != null )
{
[6/6] git commit: Merge remote-tracking branch 'origin/master' into
sixpack
Posted by cs...@apache.org.
Merge remote-tracking branch 'origin/master' into sixpack
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/b03b841c
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/b03b841c
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/b03b841c
Branch: refs/heads/master
Commit: b03b841c00b51bc5cd1bc2687a30bc59e7796471
Parents: 875d7b4 7e7202d
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Wed Aug 27 17:36:09 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Wed Aug 27 17:36:09 2014 +0200
----------------------------------------------------------------------
.../apache/maven/index/cli/NexusIndexerCli.java | 2 +-
indexer-cli/src/site/apt/index.apt.vm | 34 ++++++++++
.../maven/index/cli/NexusIndexerCliTest.java | 66 ++++++++++++++++++++
indexer-examples/src/site/site.xml | 42 +++++++++++++
4 files changed, 143 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/b03b841c/indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
----------------------------------------------------------------------
diff --cc indexer-cli/src/main/java/org/apache/maven/index/cli/NexusIndexerCli.java
index 5fe0738,2fac778..dc4a8f7
--- 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
@@@ -206,8 -207,11 +206,8 @@@ public class NexusIndexerCl
.withDescription( "Create checksums for all files (sha1, md5)." ).create( CREATE_FILE_CHECKSUMS ) );
options.addOption( OptionBuilder.withLongOpt( "type" ).hasArg() //
- .withDescription( "Indexer type (default, min, full or coma separated list of custom types)." ).create( TYPE ) );
+ .withDescription( "Indexer type (default, min, full or comma separated list of custom types)." ).create( TYPE ) );
- options.addOption( OptionBuilder.withLongOpt( "legacy" ) //
- .withDescription( "Build legacy .zip index file" ).create( LEGACY ) );
-
options.addOption( OptionBuilder.withLongOpt( "unpack" ) //
.withDescription( "Unpack an index file" ).create( UNPACK ) );