Author: oching
Date: Thu Jan 22 03:03:38 2009
New Revision: 736609
URL: http://svn.apache.org/viewvc?rev=736609&view=rev
Log:
[MRM-749]
o re-packaged TriggerScanCompleteClosure
o invoke TriggerScanCompleteClosure at the end of the scan
Added:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/functors/
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
Removed:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
Modified:
archiva/branches/archiva-nexus-indexer/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/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=736609&r1=736608&r2=736609&view=diff
==============================================================================
---
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
(original)
+++
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
Thu Jan 22 03:03:38 2009
@@ -91,7 +91,7 @@
public void beginScan( ManagedRepositoryConfiguration repository, Date
whenGathered )
throws ConsumerException
- {
+ {
this.repository = repository;
managedRepository = new File( repository.getLocation() );
File indexDirectory = new File( managedRepository, ".indexer" );
@@ -125,14 +125,14 @@
throws ConsumerException
{
File artifactFile = new File( managedRepository, path );
-
+
ArtifactContext artifactContext =
artifactContextProducer.getArtifactContext( context, artifactFile );
if ( artifactContext != null )
{
try
{
- indexer.artifactDiscovered( artifactContext, context );
-
+ //indexer.artifactDiscovered( artifactContext, context );
+
indexerEngine.index( context, artifactContext );
}
catch ( IOException e )
@@ -143,12 +143,13 @@
}
public void completeScan()
- {
+ {
final File indexLocation = new File( managedRepository, ".index" );
try
{
- indexPacker.packIndex( context, indexLocation );
indexerEngine.endIndexing( context );
+
+ indexPacker.packIndex( context, indexLocation );
}
catch ( IOException e )
{
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java?rev=736609&r1=736608&r2=736609&view=diff
==============================================================================
---
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
(original)
+++
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
Thu Jan 22 03:03:38 2009
@@ -120,7 +120,13 @@
ArtifactInfo artifactInfo = (ArtifactInfo) results.iterator().next();
assertEquals( "org.apache.archiva", artifactInfo.groupId );
assertEquals( "archiva-index-methods-jar-test",
artifactInfo.artifactId );
- assertEquals( "test-repo", artifactInfo.repository );
+ assertEquals( "test-repo", artifactInfo.repository );
+ }
+
+ public void testIndexerArtifactAlreadyIndexed()
+ throws Exception
+ {
+
}
/*public void testIndexerIndexPom()
Added:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java?rev=736609&view=auto
==============================================================================
---
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
(added)
+++
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
Thu Jan 22 03:03:38 2009
@@ -0,0 +1,52 @@
+package org.apache.archiva.repository.scanner.functors;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.collections.Closure;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * TriggerScanCompletedClosure
+ */
+public class TriggerScanCompletedClosure
+ implements Closure
+{
+ private Logger log = LoggerFactory.getLogger(
TriggerScanCompletedClosure.class );
+
+ private final ManagedRepositoryConfiguration repository;
+
+ public TriggerScanCompletedClosure( ManagedRepositoryConfiguration
repository )
+ {
+ this.repository = repository;
+ }
+
+ public void execute( Object input )
+ {
+ if ( input instanceof RepositoryContentConsumer )
+ {
+ RepositoryContentConsumer consumer = (RepositoryContentConsumer)
input;
+ consumer.completeScan();
+ log.info( "Consumer [" + consumer.getId() + "] completed for
repository [" + repository.getId() + "]" );
+ }
+ }
+}
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java?rev=736609&r1=736608&r2=736609&view=diff
==============================================================================
---
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
(original)
+++
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
Thu Jan 22 03:03:38 2009
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
+import
org.apache.archiva.repository.scanner.functors.TriggerScanCompletedClosure;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.functors.IfClosure;
@@ -38,7 +39,6 @@
import
org.apache.maven.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
import
org.apache.maven.archiva.repository.scanner.functors.ConsumerWantsFilePredicate;
import
org.apache.maven.archiva.repository.scanner.functors.TriggerBeginScanClosure;
-import
org.apache.maven.archiva.repository.scanner.functors.TriggerScanCompletedClosure;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
Modified:
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java?rev=736609&r1=736608&r2=736609&view=diff
==============================================================================
---
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
(original)
+++
archiva/branches/archiva-nexus-indexer/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
Thu Jan 22 03:03:38 2009
@@ -23,6 +23,7 @@
import java.util.Date;
import java.util.List;
+import
org.apache.archiva.repository.scanner.functors.TriggerScanCompletedClosure;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.functors.IfClosure;
@@ -34,7 +35,6 @@
import
org.apache.maven.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
import
org.apache.maven.archiva.repository.scanner.functors.ConsumerWantsFilePredicate;
import
org.apache.maven.archiva.repository.scanner.functors.TriggerBeginScanClosure;
-import
org.apache.maven.archiva.repository.scanner.functors.TriggerScanCompletedClosure;
import org.codehaus.plexus.util.DirectoryWalkListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,11 +91,6 @@
{
consumerWantsFile.setCaseSensitive( false );
}
-
- TriggerScanCompletedClosure scanCompletedClosure = new
TriggerScanCompletedClosure(repository);
-
- CollectionUtils.forAllDo(knownConsumers, scanCompletedClosure);
- CollectionUtils.forAllDo(invalidConsumerList, scanCompletedClosure);
}
public RepositoryScannerInstance( ManagedRepositoryConfiguration
repository,
@@ -150,6 +145,11 @@
public void directoryWalkFinished()
{
+ TriggerScanCompletedClosure scanCompletedClosure = new
TriggerScanCompletedClosure(repository);
+
+ CollectionUtils.forAllDo( knownConsumers, scanCompletedClosure );
+ CollectionUtils.forAllDo( invalidConsumers, scanCompletedClosure );
+
log.info( "Walk Finished: [" + this.repository.getId() + "] " +
this.repository.getLocation() );
stats.triggerFinished();
}
