svn commit: r888675 - in /archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers: pom.xml src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java

[br...@apache.org]

Author: brett
Date: Wed Dec  9 02:07:46 2009
New Revision: 888675

URL: http://svn.apache.org/viewvc?rev=888675&view=rev
Log:
[MRM-1025] remove unused dependencies

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=888675&r1=888674&r2=888675&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Wed Dec  9 02:07:46 2009
@@ -40,10 +40,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-repository-layer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-scheduler-api</artifactId>
     </dependency>
     <dependency>

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=888675&r1=888674&r2=888675&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java Wed Dec  9 02:07:46 2009
@@ -35,7 +35,6 @@
 import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
 import org.apache.maven.archiva.consumers.ConsumerException;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.registry.Registry;
@@ -59,8 +58,6 @@
 
     private FileTypes filetypes;
 
-    private ManagedDefaultRepositoryContent repositoryContent;
-
     private File managedRepository;
 
     private ArchivaTaskScheduler<ArtifactIndexingTask> scheduler;
@@ -69,6 +66,8 @@
 
     private List<String> includes = new ArrayList<String>();
 
+    private ManagedRepositoryConfiguration repository;
+
     public NexusIndexerConsumer( ArchivaTaskScheduler<ArtifactIndexingTask> scheduler,
                                  ArchivaConfiguration configuration, FileTypes filetypes )
     {
@@ -95,11 +94,9 @@
     public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
         throws ConsumerException
     {
+        this.repository = repository;
         managedRepository = new File( repository.getLocation() );
 
-        repositoryContent = new ManagedDefaultRepositoryContent();
-        repositoryContent.setRepository( repository );
-
         try
         {
             context = ArtifactIndexingTask.createContext( repository );
@@ -120,8 +117,7 @@
         File artifactFile = new File( managedRepository, path );
 
         ArtifactIndexingTask task =
-            new ArtifactIndexingTask( repositoryContent.getRepository(), artifactFile, ArtifactIndexingTask.Action.ADD,
-                                      context );
+            new ArtifactIndexingTask( repository, artifactFile, ArtifactIndexingTask.Action.ADD, context );
         try
         {
             log.debug( "Queueing indexing task + '" + task + "' to add or update the artifact in the index." );
@@ -136,8 +132,7 @@
     public void completeScan()
     {
         ArtifactIndexingTask task =
-            new ArtifactIndexingTask( repositoryContent.getRepository(), null, ArtifactIndexingTask.Action.FINISH,
-                                      context );
+            new ArtifactIndexingTask( repository, null, ArtifactIndexingTask.Action.FINISH, context );
         try
         {
             log.debug( "Queueing indexing task + '" + task + "' to finish indexing." );