You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/12/01 10:06:45 UTC
svn commit: r722004 [1/2] - in /archiva/branches/MRM-1025: ./
archiva-cli/src/main/java/org/apache/maven/archiva/cli/
archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archi...
Author: brett
Date: Mon Dec 1 01:06:41 2008
New Revision: 722004
URL: http://svn.apache.org/viewvc?rev=722004&view=rev
Log:
split the scanner from the repository-layer as it is not dependent on the rest
Added:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/ (with props)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml (with props)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanStatistics.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java (with props)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java (contents, props changed)
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/SampleKnownConsumer.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/repositories/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/repositories/default-repository/
- copied from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/repositories/legacy-repository/
- copied from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/legacy-repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/repositories/simple-repository/
- copied from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml
- copied, changed from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/scanner-archiva.xml
- copied unchanged from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/scanner-archiva.xml
Removed:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/dependencies/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanStatistics.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/repositories/simple-repository/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/scanner/
Modified:
archiva/branches/MRM-1025/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumerTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/StubRepositoryContentConsumers.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletSecurityTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/resources/org/apache/maven/archiva/webdav/RepositoryServletTest.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
archiva/branches/MRM-1025/pom.xml
Modified: archiva/branches/MRM-1025/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java (original)
+++ archiva/branches/MRM-1025/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java Mon Dec 1 01:06:41 2008
@@ -31,6 +31,9 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
+import org.apache.archiva.repository.scanner.RepositoryScanner;
+import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.ConsumerException;
@@ -39,9 +42,6 @@
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.apache.maven.archiva.converter.RepositoryConversionException;
import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter;
-import org.apache.maven.archiva.repository.RepositoryException;
-import org.apache.maven.archiva.repository.scanner.RepositoryScanStatistics;
-import org.apache.maven.archiva.repository.scanner.RepositoryScanner;
import org.apache.maven.artifact.manager.WagonManager;
import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext;
import org.codehaus.plexus.spring.PlexusToSpringUtils;
@@ -172,7 +172,7 @@
System.out.println( "\n" + stats.toDump( repo ) );
}
- catch ( RepositoryException e )
+ catch ( RepositoryScannerException e )
{
e.printStackTrace( System.err );
}
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner.functors;
+package org.apache.maven.archiva.consumers.functors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/ConsumerWantsFilePredicate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/AbstractArtifactConsumerTest.java Mon Dec 1 01:06:41 2008
@@ -24,7 +24,7 @@
import org.apache.maven.archiva.configuration.FileType;
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.repository.scanner.functors.ConsumerWantsFilePredicate;
+import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import java.io.File;
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java Mon Dec 1 01:06:41 2008
@@ -29,7 +29,7 @@
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.repository.scanner.functors.ConsumerWantsFilePredicate;
+import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.custommonkey.xmlunit.XMLAssert;
/**
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumerTest.java?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumerTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumerTest.java Mon Dec 1 01:06:41 2008
@@ -24,7 +24,7 @@
import org.apache.maven.archiva.configuration.FileType;
import org.apache.maven.archiva.configuration.FileTypes;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.repository.scanner.functors.ConsumerWantsFilePredicate;
+import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import java.io.File;
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/pom.xml Mon Dec 1 01:06:41 2008
@@ -41,6 +41,10 @@
<artifactId>archiva-repository-layer</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-scanner</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
</dependency>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java Mon Dec 1 01:06:41 2008
@@ -19,21 +19,21 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.archiva.repository.scanner.RepositoryScanner;
+import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.converter.RepositoryConversionException;
-import org.apache.maven.archiva.repository.RepositoryException;
-import org.apache.maven.archiva.repository.scanner.RepositoryScanner;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
/**
* DefaultLegacyRepositoryConverter
*
@@ -95,7 +95,7 @@
repoScanner.scan( legacyRepository, knownConsumers, invalidConsumers, ignoredContent,
RepositoryScanner.FRESH_SCAN );
}
- catch ( RepositoryException e )
+ catch ( RepositoryScannerException e )
{
throw new RepositoryConversionException( "Error convering legacy repository.", e );
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/pom.xml Mon Dec 1 01:06:41 2008
@@ -42,6 +42,10 @@
<artifactId>archiva-repository-layer</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-scanner</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Mon Dec 1 01:06:41 2008
@@ -30,6 +30,7 @@
import java.util.Properties;
import java.util.Map.Entry;
+import org.apache.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
@@ -55,7 +56,6 @@
import org.apache.maven.archiva.repository.RepositoryNotFoundException;
import org.apache.maven.archiva.repository.metadata.MetadataTools;
import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
-import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.Wagon;
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -74,7 +74,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -72,7 +72,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml Mon Dec 1 01:06:41 2008
@@ -81,7 +81,7 @@
<field-name>urlFailureCache</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
</requirements>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/HttpProxyTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -64,7 +64,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -72,7 +72,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -72,7 +72,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -91,7 +91,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -72,7 +72,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml?rev=722004&r1=722003&r2=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml Mon Dec 1 01:06:41 2008
@@ -72,7 +72,7 @@
<field-name>postDownloadPolicies</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers</role>
+ <role>org.apache.archiva.repository.scanner.RepositoryContentConsumers</role>
<field-name>consumers</field-name>
</requirement>
<requirement>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 1 01:06:41 2008
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Added: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml?rev=722004&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml Mon Dec 1 01:06:41 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>archiva-base</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <version>1.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>archiva-repository-scanner</artifactId>
+ <name>Archiva Repository Scanner</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-consumer-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,22 +29,17 @@
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
-import org.apache.maven.archiva.repository.RepositoryException;
import org.codehaus.plexus.util.DirectoryWalker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* DefaultRepositoryScanner
*
* @version $Id$
- * @plexus.component role="org.apache.maven.archiva.repository.scanner.RepositoryScanner"
+ * @plexus.component role="org.apache.archiva.repository.scanner.RepositoryScanner"
*/
public class DefaultRepositoryScanner
implements RepositoryScanner
{
- private Logger log = LoggerFactory.getLogger( DefaultRepositoryScanner.class );
-
/**
* @plexus.requirement
*/
@@ -56,7 +51,7 @@
private RepositoryContentConsumers consumerUtil;
public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository, long changesSince )
- throws RepositoryException
+ throws RepositoryScannerException
{
List<KnownRepositoryContentConsumer> knownContentConsumers = consumerUtil.getSelectedKnownConsumers();
List<InvalidRepositoryContentConsumer> invalidContentConsumers = consumerUtil.getSelectedInvalidConsumers();
@@ -69,7 +64,7 @@
List<KnownRepositoryContentConsumer> knownContentConsumers,
List<InvalidRepositoryContentConsumer> invalidContentConsumers,
List<String> ignoredContentPatterns, long changesSince )
- throws RepositoryException
+ throws RepositoryScannerException
{
if ( repository == null )
{
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java (from r721945, archiva/branches/MRM-1025/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/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumers.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,6 +26,8 @@
import java.util.List;
import java.util.Map;
+import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
+import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.functors.IfClosure;
@@ -35,9 +37,7 @@
import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-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.consumers.functors.ConsumerWantsFilePredicate;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanStatistics.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanStatistics.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanStatistics.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.model.RepositoryContentStatistics;
import java.text.SimpleDateFormat;
import java.util.List;
@@ -32,7 +31,6 @@
* @version $Id$
*/
public class RepositoryScanStatistics
- extends RepositoryContentStatistics
{
private transient List<String> knownConsumers;
@@ -42,28 +40,78 @@
private SimpleDateFormat df = new SimpleDateFormat();
+ /**
+ * Field repositoryId
+ */
+ private String repositoryId;
+
+ /**
+ * Field whenGathered
+ */
+ private java.util.Date whenGathered;
+
+ /**
+ * Field duration
+ */
+ private long duration = 0;
+
+ /**
+ * Field totalFileCount
+ */
+ private long totalFileCount = 0;
+
+ /**
+ * Field newFileCount
+ */
+ private long newFileCount = 0;
+
+ /**
+ * Field totalProjectCount
+ */
+ private long totalProjectCount = 0;
+
+ /**
+ * Field totalGroupCount
+ */
+ private long totalGroupCount = 0;
+
+ /**
+ * Field totalArtifactCount
+ */
+ private long totalArtifactCount = 0;
+
+ /**
+ * Field totalSize
+ */
+ private long totalSize = 0;
+
public void triggerStart()
{
startTimestamp = System.currentTimeMillis();
}
+ public java.util.Date getWhenGathered()
+ {
+ return whenGathered;
+ }
+
public void triggerFinished()
{
long finished = System.currentTimeMillis();
- setDuration( finished - startTimestamp );
- setWhenGathered( new java.util.Date( finished ) );
+ this.duration = finished - startTimestamp;
+ this.whenGathered = new java.util.Date( finished );
}
public void increaseFileCount()
{
long count = getTotalFileCount();
- setTotalFileCount( ++count );
+ this.totalFileCount = ++count;
}
public void increaseNewFileCount()
{
long count = getNewFileCount();
- setNewFileCount( ++count );
+ this.newFileCount = ++count;
}
public void setKnownConsumers( List<String> consumers )
@@ -142,4 +190,49 @@
return buf.toString();
}
+
+ public void setRepositoryId( String repositoryId )
+ {
+ this.repositoryId = repositoryId;
+ }
+
+ public String getRepositoryId()
+ {
+ return repositoryId;
+ }
+
+ public long getDuration()
+ {
+ return duration;
+ }
+
+ public long getTotalFileCount()
+ {
+ return totalFileCount;
+ }
+
+ public long getNewFileCount()
+ {
+ return newFileCount;
+ }
+
+ public long getTotalProjectCount()
+ {
+ return totalProjectCount;
+ }
+
+ public long getTotalGroupCount()
+ {
+ return totalGroupCount;
+ }
+
+ public long getTotalArtifactCount()
+ {
+ return totalArtifactCount;
+ }
+
+ public long getTotalSize()
+ {
+ return totalSize;
+ }
}
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScanner.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,6 @@
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.repository.RepositoryException;
import java.util.List;
@@ -79,10 +78,10 @@
* (To have all content be taken into consideration regardless of timestamp,
* use the {@link #FRESH_SCAN} constant)
* @return the statistics for this scan.
- * @throws RepositoryException if there was a fundamental problem with getting the discoverer started.
+ * @throws RepositoryScannerException if there was a fundamental problem with getting the discoverer started.
*/
public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository, long changesSince )
- throws RepositoryException;
+ throws RepositoryScannerException;
/**
* Scan the repository for content changes.
@@ -99,12 +98,12 @@
* (To have all content be taken into consideration regardless of timestamp,
* use the {@link #FRESH_SCAN} constant)
* @return the statistics for this scan.
- * @throws RepositoryException if there was a fundamental problem with getting the discoverer started.
+ * @throws RepositoryScannerException if there was a fundamental problem with getting the discoverer started.
*/
public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository,
List<KnownRepositoryContentConsumer> knownContentConsumers,
List<InvalidRepositoryContentConsumer> invalidContentConsumers,
List<String> ignoredContentPatterns, long changesSince )
- throws RepositoryException;
+ throws RepositoryScannerException;
}
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java?rev=722004&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java Mon Dec 1 01:06:41 2008
@@ -0,0 +1,51 @@
+package org.apache.archiva.repository.scanner;
+
+/*
+ * 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.
+ */
+
+/**
+ * RepositoryException
+ *
+ * @version $Id: RepositoryException.java 718864 2008-11-19 06:33:35Z brett $
+ */
+public class RepositoryScannerException
+ extends Exception
+{
+
+ public RepositoryScannerException()
+ {
+ super();
+ }
+
+ public RepositoryScannerException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ public RepositoryScannerException( String message )
+ {
+ super( message );
+ }
+
+ public RepositoryScannerException( Throwable cause )
+ {
+ super( cause );
+ }
+
+}
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java (from r721945, archiva/branches/MRM-1025/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/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/RepositoryScannerInstance.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,8 @@
import java.util.Date;
import java.util.List;
+import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
+import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.functors.IfClosure;
@@ -31,9 +33,7 @@
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-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.consumers.functors.ConsumerWantsFilePredicate;
import org.codehaus.plexus.util.DirectoryWalkListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner.functors;
+package org.apache.archiva.repository.scanner.functors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/TriggerBeginScanClosure.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/TriggerBeginScanClosure.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/TriggerBeginScanClosure.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner.functors;
+package org.apache.archiva.repository.scanner.functors;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml Mon Dec 1 01:06:41 2008
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <bean id="repositoryContentConsumers" class="org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers" scope="prototype">
+ <bean id="repositoryContentConsumers" class="org.apache.archiva.repository.scanner.RepositoryContentConsumers" scope="prototype">
<constructor-arg>
<ref bean="archivaConfiguration"/>
</constructor-arg>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/InvalidScanConsumer.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/KnownScanConsumer.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/KnownScanConsumer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersStub.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersStub.java Mon Dec 1 01:06:41 2008
@@ -1,6 +1,8 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
import java.util.Date;
+
+import org.apache.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
public class RepositoryContentConsumersStub
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java (from r721945, archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java&r1=721945&r2=722004&rev=722004&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/scanner/RepositoryContentConsumersTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java Mon Dec 1 01:06:41 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.scanner;
+package org.apache.archiva.repository.scanner;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,12 +21,15 @@
import java.io.IOException;
import java.util.Locale;
+
+import org.apache.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import java.io.File;
@@ -52,8 +55,36 @@
* @version $Id$
*/
public class RepositoryContentConsumersTest
- extends AbstractRepositoryLayerTestCase
+ extends PlexusInSpringTestCase
{
+ /**
+ * {@inheritDoc}
+ * @see org.codehaus.plexus.spring.PlexusInSpringTestCase#getSpringConfigLocation()
+ */
+ @Override
+ protected String getSpringConfigLocation()
+ {
+ return "org/apache/maven/archiva/repository/spring-context.xml";
+ }
+
+ protected ManagedRepositoryConfiguration createRepository( String id, String name, File location )
+ {
+ ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ repo.setId( id );
+ repo.setName( name );
+ repo.setLocation( location.getAbsolutePath() );
+ return repo;
+ }
+
+ protected RemoteRepositoryConfiguration createRemoteRepository( String id, String name, String url )
+ {
+ RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ repo.setId( id );
+ repo.setName( name );
+ repo.setUrl( url );
+ return repo;
+ }
+
private RepositoryContentConsumers lookupRepositoryConsumers()
throws Exception
{
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain