Author: jzurbano
Date: Tue Apr 27 10:29:58 2010
New Revision: 938402
URL: http://svn.apache.org/viewvc?rev=938402&view=rev
Log:
[MRM-1345] MRM-1345 update use of Nexus indexer
* applied patch
* moved the constant in a new class
Submitted by: Gwen Harold Autencio
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
Tue Apr 27 10:29:58 2010
@@ -933,7 +933,7 @@ public class LegacyToDefaultConverterTes
private static String normalizeString( String path )
{
- return path.trim().replaceAll( "\r\n", "\n" ).replace( '\r', '\n'
).replaceAll( "<\\?xml .+\\?>", "" );
+ return path.trim().replaceAll( "\r\n", "\n" ).replace( '\r', '\n'
).replaceAll( "<\\?xml .+\\?>", "" ).replaceAll("^\\s+", "");
}
private void checkSuccess( ArtifactConverter converter )
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/pom.xml Tue Apr
27 10:29:58 2010
@@ -66,6 +66,10 @@
<version>1.6.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-indexer</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java?rev=938402&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java
(added)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java
Tue Apr 27 10:29:58 2010
@@ -0,0 +1,41 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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.util.Arrays;
+import java.util.List;
+
+import org.sonatype.nexus.index.context.IndexCreator;
+import org.sonatype.nexus.index.creator.JarFileContentsIndexCreator;
+import org.sonatype.nexus.index.creator.MavenPluginArtifactInfoIndexCreator;
+import org.sonatype.nexus.index.creator.MinimalArtifactInfoIndexCreator;
+
+/**
+ * ArchivaNexusIndexerUtil
+ *
+ */
+public class ArchivaNexusIndexerUtil
+{
+ public static final List<? extends IndexCreator> FULL_INDEX =
Arrays.<IndexCreator>asList(
+ new
MinimalArtifactInfoIndexCreator(),
+ new
JarFileContentsIndexCreator(),
+ new
MavenPluginArtifactInfoIndexCreator() );
+
+}
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/ArchivaNexusIndexerUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/NexusRepositorySearch.java
Tue Apr 27 10:29:58 2010
@@ -28,6 +28,7 @@ import java.util.Set;
import org.apache.archiva.indexer.util.SearchUtil;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -216,7 +217,7 @@ public class NexusRepositorySearch
IndexingContext context =
indexer.addIndexingContext( repoConfig.getId(),
repoConfig.getId(), new File( repoConfig.getLocation() ),
- indexDirectory, null,
null, NexusIndexer.FULL_INDEX );
+ indexDirectory, null,
null, ArchivaNexusIndexerUtil.FULL_INDEX );
context.setSearchable( repoConfig.isScanned() );
}
else
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
Tue Apr 27 10:29:58 2010
@@ -25,11 +25,13 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
+import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
+import org.sonatype.nexus.artifact.IllegalArtifactCoordinateException;
import org.sonatype.nexus.index.ArtifactContext;
import org.sonatype.nexus.index.ArtifactContextProducer;
import org.sonatype.nexus.index.NexusIndexer;
@@ -85,7 +87,7 @@ public class NexusRepositorySearchTest
}
private void createIndexForQuickSearch()
- throws IOException, UnsupportedExistingLuceneIndexException
+ throws IOException, UnsupportedExistingLuceneIndexException,
IllegalArtifactCoordinateException
{
List<File> files = new ArrayList<File>();
files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1 +
@@ -126,11 +128,11 @@ public class NexusRepositorySearchTest
}
private void createIndex( String repository, List<File> filesToBeIndexed )
- throws IOException, UnsupportedExistingLuceneIndexException
+ throws IOException, UnsupportedExistingLuceneIndexException,
IllegalArtifactCoordinateException
{
context = new DefaultIndexingContext( repository, repository, new
File( getBasedir(), "/target/test-classes/" +
repository ), new File( getBasedir(),
"/target/test-classes/" + repository + "/.indexer" ), null, null,
- NexusIndexer.FULL_INDEX, false );
+ ArchivaNexusIndexerUtil.FULL_INDEX, false );
//indexer.addIndexingContext( repository, repository, new File(
getBasedir(), "/target/test-classes/" +
// repository ), new File( getBasedir(),
"/target/test-classes/" + repository + "/.indexer" ), null, null,
// NexusIndexer.FULL_INDEX );
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Tue Apr 27 10:29:58 2010
@@ -32,6 +32,7 @@ import org.codehaus.plexus.taskqueue.exe
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.sonatype.nexus.artifact.IllegalArtifactCoordinateException;
import org.sonatype.nexus.index.ArtifactContext;
import org.sonatype.nexus.index.ArtifactContextProducer;
import org.sonatype.nexus.index.ArtifactInfo;
@@ -170,6 +171,11 @@ public class ArchivaIndexingTaskExecutor
throw new TaskExecutionException( "Error occurred while
executing indexing task '" + indexingTask
+ "'", e );
}
+ catch ( IllegalArtifactCoordinateException e )
+ {
+ log.error( "Error occurred while getting artifact context:
" + e.getMessage() );
+ throw new TaskExecutionException( "Error occurred while
getting artifact context.", e );
+ }
}
}
}
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
Tue Apr 27 10:29:58 2010
@@ -22,9 +22,9 @@ package org.apache.archiva.scheduler.ind
import java.io.File;
import java.io.IOException;
+import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.taskqueue.Task;
-import org.sonatype.nexus.index.NexusIndexer;
import org.sonatype.nexus.index.context.DefaultIndexingContext;
import org.sonatype.nexus.index.context.IndexingContext;
import
org.sonatype.nexus.index.context.UnsupportedExistingLuceneIndexException;
@@ -139,7 +139,7 @@ public class ArtifactIndexingTask
IndexingContext context =
new DefaultIndexingContext( repository.getId(),
repository.getId(), managedRepository, indexDirectory,
- null, null, NexusIndexer.FULL_INDEX,
false );
+ null, null,
ArchivaNexusIndexerUtil.FULL_INDEX, false );
context.setSearchable( repository.isScanned() );
return context;
}
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
Tue Apr 27 10:29:58 2010
@@ -35,6 +35,7 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
+import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
@@ -134,7 +135,7 @@ public class ArchivaIndexingTaskExecutor
indexer.addIndexingContext( repositoryConfig.getId(),
repositoryConfig.getId(),
new File(
repositoryConfig.getLocation() ),
new File(
repositoryConfig.getLocation(), ".indexer" ), null, null,
- NexusIndexer.FULL_INDEX );
+ ArchivaNexusIndexerUtil.FULL_INDEX );
context.setSearchable( true );
FlatSearchRequest request = new FlatSearchRequest( q );
@@ -270,7 +271,7 @@ public class ArchivaIndexingTaskExecutor
IndexingContext context =
indexer.addIndexingContext( repositoryConfig.getId(),
repositoryConfig.getId(),
new File(
repositoryConfig.getLocation() ), destDir, null, null,
- NexusIndexer.FULL_INDEX );
+ ArchivaNexusIndexerUtil.FULL_INDEX );
context.setSearchable( true );
FlatSearchRequest request = new FlatSearchRequest( q );
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=938402&r1=938401&r2=938402&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Apr 27 10:29:58 2010
@@ -251,7 +251,7 @@
<dependency>
<groupId>org.sonatype.nexus</groupId>
<artifactId>nexus-indexer</artifactId>
- <version>2.0.0</version>
+ <version>2.0.5</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -688,7 +688,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.4.5</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus.cache</groupId>
