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 2007/09/12 11:33:55 UTC
svn commit: r574859 [1/5] - in /maven/archiva/trunk: ./
archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/
archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/
archiva-b...
Author: brett
Date: Wed Sep 12 02:33:41 2007
New Revision: 574859
URL: http://svn.apache.org/viewvc?rev=574859&view=rev
Log:
[MRM-462] separate configuration of managed and remote repositories
Merged from branches/MRM-462
Added:
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
- copied, changed from r574821, maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractConfigureRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryAction.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/
- copied from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.xml
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRemoteRepositoryActionTest.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.xml
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml
- copied unchanged from r574821, maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.xml
Removed:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/IndexedRepositoryPredicate.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/LocalRepositoryPredicate.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RemoteRepositoryPredicate.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationToMapClosure.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryIdListClosure.java
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/functors/ManagedRepositoryPredicate.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ActiveManagedRepositories.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryConfigurationAdminTransformer.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/WebworkIsDoingStrangeThingsInterceptor.java
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-user.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
maven/archiva/trunk/archiva-base/archiva-model/pom.xml
maven/archiva/trunk/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java
maven/archiva/trunk/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ChecksumTransferTest.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/RelocateTransferTest.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AllTests.java
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-parent/1.0-SNAPSHOT/archiva-parent-1.0-SNAPSHOT.pom
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/archiva/archiva-webapp/1.0-SNAPSHOT/archiva-webapp-1.0-SNAPSHOT.pom
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-20061126.005254-2.pom
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/repositories/default-repository/org/apache/maven/archiva/archiva/1.0-SNAPSHOT/archiva-1.0-SNAPSHOT.pom
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatistics.java
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java
maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ConfigurationSynchronization.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/repositoryForm.jspf
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/RepositoryServletTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/RepositoryServletTest.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java Wed Sep 12 02:33:41 2007
@@ -20,7 +20,7 @@
*/
/**
- * Utility methods for testing the configuration property name.
+ * Utility methods for testing the configuration property name.
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
@@ -37,9 +37,14 @@
return startsWith( "repositoryScanning.", propertyName );
}
- public static boolean isRepositories( String propertyName )
+ public static boolean isManagedRepositories( String propertyName )
{
- return startsWith( "repositories.", propertyName );
+ return startsWith( "managedRepositories.", propertyName );
+ }
+
+ public static boolean isRemoteRepositories( String propertyName )
+ {
+ return startsWith( "remoteRepositories.", propertyName );
}
public static boolean isProxyConnector( String propertyName )
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Wed Sep 12 02:33:41 2007
@@ -117,6 +117,34 @@
Configuration config = new ConfigurationRegistryReader().read( subset );
+ if ( !config.getRepositories().isEmpty() )
+ {
+ for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
+ {
+ V1RepositoryConfiguration r = (V1RepositoryConfiguration) i.next();
+
+ if ( r.getUrl().startsWith( "file://" ) )
+ {
+ r.setLocation( r.getUrl().substring( 7 ) );
+ config.addManagedRepository( r );
+ }
+ else if ( r.getUrl().startsWith( "file:" ) )
+ {
+ r.setLocation( r.getUrl().substring( 5 ) );
+ config.addManagedRepository( r );
+ }
+ else
+ {
+ RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ repo.setId( r.getId() );
+ repo.setLayout( r.getLayout() );
+ repo.setName( r.getName() );
+ repo.setUrl( r.getUrl() );
+ config.addRemoteRepository( repo );
+ }
+ }
+ }
+
return config;
}
@@ -162,7 +190,8 @@
// that configuration
if ( key.startsWith( "repositories" ) || key.startsWith( "proxyConnectors" ) ||
key.startsWith( "networkProxies" ) || key.startsWith( "repositoryScanning" ) ||
- key.startsWith( "databaseScanning" ) )
+ key.startsWith( "databaseScanning" ) || key.startsWith( "remoteRepositories" ) ||
+ key.startsWith( "managedRepositories" ) )
{
foundList = true;
}
@@ -178,9 +207,9 @@
}
// escape all cron expressions to handle ','
- for ( Iterator i = configuration.getRepositories().iterator(); i.hasNext(); )
+ for ( Iterator i = configuration.getManagedRepositories().iterator(); i.hasNext(); )
{
- RepositoryConfiguration c = (RepositoryConfiguration) i.next();
+ ManagedRepositoryConfiguration c = (ManagedRepositoryConfiguration) i.next();
c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
}
@@ -289,10 +318,10 @@
private Configuration processExpressions( Configuration config )
{
// TODO: for commons-configuration 1.3 only
- for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
+ for ( Iterator i = config.getManagedRepositories().iterator(); i.hasNext(); )
{
- RepositoryConfiguration c = (RepositoryConfiguration) i.next();
- c.setUrl( removeExpressions( c.getUrl() ) );
+ ManagedRepositoryConfiguration c = (ManagedRepositoryConfiguration) i.next();
+ c.setLocation( removeExpressions( c.getLocation() ) );
c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) );
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java Wed Sep 12 02:33:41 2007
@@ -20,7 +20,6 @@
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.archiva.policies.ReleasesPolicy;
import org.apache.maven.archiva.policies.SnapshotsPolicy;
@@ -48,11 +47,14 @@
// set up the managed repository
String localCachePath = getMandatoryProperty( props, REPO_LOCAL_STORE );
- RepositoryConfiguration config = new RepositoryConfiguration();
- config.setUrl( PathUtil.toUrl( localCachePath ) );
+ ManagedRepositoryConfiguration config = new ManagedRepositoryConfiguration();
+ config.setLocation( localCachePath );
config.setName( "Imported Maven-Proxy Cache" );
config.setId( "maven-proxy" );
- configuration.addRepository( config );
+ config.setIndexed( false );
+ config.setReleases( true );
+ config.setSnapshots( false );
+ configuration.addManagedRepository( config );
// Add the network proxies.
String propertyList = props.getProperty( PROXY_LIST );
@@ -91,26 +93,21 @@
int cachePeriod = Integer.parseInt( repoProps.getProperty( "cache.period", "60" ) );
- RepositoryConfiguration repository = new RepositoryConfiguration();
+ RemoteRepositoryConfiguration repository = new RemoteRepositoryConfiguration();
repository.setId( key );
repository.setName( "Imported Maven-Proxy Remote Proxy" );
repository.setUrl( url );
repository.setLayout( "legacy" );
- repository.setIndexed( false );
- repository.setReleases( true );
- repository.setSnapshots( false );
- configuration.addRepository( repository );
+ configuration.addRemoteRepository( repository );
ProxyConnectorConfiguration proxyConnector = new ProxyConnectorConfiguration();
proxyConnector.setSourceRepoId( "maven-proxy" );
proxyConnector.setTargetRepoId( key );
proxyConnector.setProxyId( proxyKey );
// TODO: convert cachePeriod to closest "daily" or "hourly"
- proxyConnector.addPolicy( ProxyConnectorConfiguration.POLICY_SNAPSHOTS,
- SnapshotsPolicy.DAILY );
- proxyConnector.addPolicy( ProxyConnectorConfiguration.POLICY_RELEASES,
- ReleasesPolicy.IGNORED );
+ proxyConnector.addPolicy( ProxyConnectorConfiguration.POLICY_SNAPSHOTS, SnapshotsPolicy.DAILY );
+ proxyConnector.addPolicy( ProxyConnectorConfiguration.POLICY_RELEASES, ReleasesPolicy.IGNORED );
configuration.addProxyConnector( proxyConnector );
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java Wed Sep 12 02:33:41 2007
@@ -19,45 +19,36 @@
* under the License.
*/
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
import java.util.Comparator;
/**
- * RepositoryConfigurationComparator
+ * RepositoryConfigurationComparator
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
public class RepositoryConfigurationComparator
- implements Comparator
+ implements Comparator<AbstractRepositoryConfiguration>
{
-
- public int compare( Object o1, Object o2 )
+ public int compare( AbstractRepositoryConfiguration o1, AbstractRepositoryConfiguration o2 )
{
if ( o1 == null && o2 == null )
{
return 0;
}
- if ( o1 == null && o2 != null )
- {
- return 1;
- }
-
- if ( o1 != null && o2 == null )
+ if ( o1 == null )
{
return -1;
}
- if ( ( o1 instanceof RepositoryConfiguration ) && ( o2 instanceof RepositoryConfiguration ) )
+ if ( o2 == null )
{
- String id1 = ( (RepositoryConfiguration) o1 ).getId();
- String id2 = ( (RepositoryConfiguration) o2 ).getId();
- return id1.compareToIgnoreCase( id2 );
+ return 1;
}
- return 0;
+ return o1.getId().compareToIgnoreCase( o2.getId() );
}
-
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Wed Sep 12 02:33:41 2007
@@ -43,14 +43,31 @@
</field>
<field>
<name>repositories</name>
+ <version>1.0.0</version>
+ <association>
+ <type>V1RepositoryConfiguration</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ </field>
+ <field>
+ <name>managedRepositories</name>
<version>1.0.0+</version>
<association>
- <type>RepositoryConfiguration</type>
+ <type>ManagedRepositoryConfiguration</type>
<multiplicity>*</multiplicity>
</association>
<description>The list of repositories that this archiva instance uses.</description>
</field>
<field>
+ <name>remoteRepositories</name>
+ <version>1.0.0+</version>
+ <association>
+ <type>RemoteRepositoryConfiguration</type>
+ <multiplicity>*</multiplicity>
+ </association>
+ <description>The list of repositories that this archiva can retrieve from or publish to.</description>
+ </field>
+ <field>
<name>proxyConnectors</name>
<version>1.0.0+</version>
<association>
@@ -119,58 +136,78 @@
<codeSegment>
<version>1.0.0+</version>
<code><![CDATA[
- /**
- * Find {@link RepositoryConfiguration} with specified Id.
- *
- * @param id the id of the repository to find.
- * @return the repository configuration.
- */
- public RepositoryConfiguration findRepositoryById( String id )
+ public java.util.Map<String, NetworkProxyConfiguration> getNetworkProxiesAsMap()
{
- // null id = null repo config.
- if ( id == null )
+ java.util.Map<String, NetworkProxyConfiguration> map = new java.util.HashMap<String, NetworkProxyConfiguration>();
+ if ( networkProxies != null )
{
- return null;
+ for ( java.util.Iterator i = networkProxies.iterator(); i.hasNext(); )
+ {
+ NetworkProxyConfiguration proxy = (NetworkProxyConfiguration) i.next();
+ map.put( proxy.getId(), proxy );
+ }
}
+ return map;
+ }
- // empty id = null repo config.
- if ( id.trim().length() <= 0 )
+ public java.util.Map<String, RemoteRepositoryConfiguration> getRemoteRepositoriesAsMap()
+ {
+ java.util.Map<String, RemoteRepositoryConfiguration> map = new java.util.HashMap<String, RemoteRepositoryConfiguration>();
+ if ( remoteRepositories != null )
{
- return null;
+ for ( java.util.Iterator i = remoteRepositories.iterator(); i.hasNext(); )
+ {
+ RemoteRepositoryConfiguration repo = (RemoteRepositoryConfiguration) i.next();
+ map.put( repo.getId(), repo );
+ }
}
-
- return (RepositoryConfiguration) createRepositoryMap().get( id );
+ return map;
}
- /**
- * Create a RepositoryMap of the current repositories.
- *
- * @return the map of repository id's, to repository configurations.
- */
- public java.util.Map createRepositoryMap()
+ public RemoteRepositoryConfiguration findRemoteRepositoryById( String id )
{
- java.util.Map ret = new java.util.HashMap();
-
- // null repository list = null repo config.
- if ( getRepositories() == null )
+ if ( remoteRepositories != null )
{
- return ret;
+ for ( java.util.Iterator i = remoteRepositories.iterator(); i.hasNext(); )
+ {
+ RemoteRepositoryConfiguration repo = (RemoteRepositoryConfiguration) i.next();
+ if ( repo.getId().equals( id ) )
+ {
+ return repo;
+ }
+ }
}
+ return null;
+ }
- // empty repository list == null repo config.
- if ( getRepositories().isEmpty() )
+ public java.util.Map<String, ManagedRepositoryConfiguration> getManagedRepositoriesAsMap()
+ {
+ java.util.Map<String, ManagedRepositoryConfiguration> map = new java.util.HashMap<String, ManagedRepositoryConfiguration>();
+ if ( managedRepositories != null )
{
- return ret;
+ for ( java.util.Iterator i = managedRepositories.iterator(); i.hasNext(); )
+ {
+ ManagedRepositoryConfiguration repo = (ManagedRepositoryConfiguration) i.next();
+ map.put( repo.getId(), repo );
+ }
}
-
- java.util.Iterator it = getRepositories().iterator();
- while ( it.hasNext() )
+ return map;
+ }
+
+ public ManagedRepositoryConfiguration findManagedRepositoryById( String id )
+ {
+ if ( managedRepositories != null )
{
- RepositoryConfiguration repoConfig = (RepositoryConfiguration) it.next();
- ret.put( repoConfig.getId(), repoConfig );
+ for ( java.util.Iterator i = managedRepositories.iterator(); i.hasNext(); )
+ {
+ ManagedRepositoryConfiguration repo = (ManagedRepositoryConfiguration) i.next();
+ if ( repo.getId().equals( id ) )
+ {
+ return repo;
+ }
+ }
}
-
- return ret;
+ return null;
}
]]></code>
</codeSegment>
@@ -188,8 +225,9 @@
-->
<class>
- <name>RepositoryConfiguration</name>
+ <name>AbstractRepositoryConfiguration</name>
<version>1.0.0+</version>
+ <abstract>true</abstract>
<fields>
<field>
<name>id</name>
@@ -210,6 +248,24 @@
</description>
</field>
<field>
+ <name>layout</name>
+ <version>1.0.0+</version>
+ <type>String</type>
+ <required>true</required>
+ <description>
+ The layout of the repository. Valid values are "default" and "legacy".
+ </description>
+ <!-- TODO: should be able to detect this from the repository (perhaps by metadata at the root) -->
+ <defaultValue>default</defaultValue>
+ </field>
+ </fields>
+ </class>
+ <class>
+ <name>RemoteRepositoryConfiguration</name>
+ <version>1.0.0+</version>
+ <superClass>AbstractRepositoryConfiguration</superClass>
+ <fields>
+ <field>
<name>url</name>
<version>1.0.0+</version>
<type>String</type>
@@ -218,16 +274,21 @@
The URL for this repository.
</description>
</field>
+ </fields>
+ </class>
+ <class>
+ <name>ManagedRepositoryConfiguration</name>
+ <version>1.0.0+</version>
+ <superClass>AbstractRepositoryConfiguration</superClass>
+ <fields>
<field>
- <name>layout</name>
+ <name>location</name>
<version>1.0.0+</version>
<type>String</type>
<required>true</required>
<description>
- The layout of the repository. Valid values are "default" and "legacy".
+ The file system location for this repository.
</description>
- <!-- TODO: should be able to detect this from the repository (perhaps by metadata at the root) -->
- <defaultValue>default</defaultValue>
</field>
<field>
<name>releases</name>
@@ -243,6 +304,7 @@
<description>True if this repository contains snapshot versioned artifacts.</description>
<defaultValue>false</defaultValue>
</field>
+ <!-- TODO! is indexed better named as scanned? check it's usages (or lack of usages) when iterating repos -->
<field>
<name>indexed</name>
<version>1.0.0+</version>
@@ -273,7 +335,7 @@
<version>1.0.0+</version>
<type>int</type>
<description>
- The total count of the artifact to be retained for each snapshot.
+ The total count of the artifact to be retained for each snapshot.
</description>
<defaultValue>2</defaultValue>
</field>
@@ -282,7 +344,7 @@
<version>1.0.0+</version>
<type>int</type>
<description>
- The number of days old which will be the basis for removing a snapshot.
+ The number of days old which will be the basis for removing a snapshot.
</description>
<defaultValue>100</defaultValue>
</field>
@@ -291,52 +353,27 @@
<version>1.0.0+</version>
<type>boolean</type>
<description>
- True if the released snapshots are to be removed from the repo during repository purge.
+ True if the released snapshots are to be removed from the repo during repository purge.
</description>
<defaultValue>false</defaultValue>
</field>
</fields>
- <codeSegments>
- <codeSegment>
+ </class>
+ <class>
+ <name>V1RepositoryConfiguration</name>
+ <version>1.0.0</version>
+ <superClass>ManagedRepositoryConfiguration</superClass>
+ <fields>
+ <field>
+ <name>url</name>
<version>1.0.0+</version>
- <code><![CDATA[
- /**
- * Utility method to help determine if configuration refers to a remote repository.
- *
- * @return true if configuration belongs to a remote repository.
- * (note: false does not automatically mean this is a managed repository,
- * you must use {@link #isManaged()} to test for that.)
- */
- public boolean isRemote()
- {
- if ( this.url == null )
- {
- return false;
- }
-
- return !this.url.startsWith( "file" );
- }
-
- /**
- * Utility method to help determine if configuration refers to a managed repository.
- *
- * @return true if configuration belongs to a managed repository.
- * (note: false does not automatically mean this is a remote repository,
- * you must use {@link #isRemote()} to test for that.)
- */
- public boolean isManaged()
- {
- if ( this.url == null )
- {
- return false;
- }
-
- return this.url.startsWith( "file" );
- }
-
- ]]></code>
- </codeSegment>
- </codeSegments>
+ <type>String</type>
+ <required>true</required>
+ <description>
+ The URL for this repository.
+ </description>
+ </field>
+ </fields>
</class>
<!--
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml Wed Sep 12 02:33:41 2007
@@ -1,48 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
- <version>1</version>
- <repositories>
- <repository>
+ <version>2</version>
+ <managedRepositories>
+ <managedRepository>
<id>internal</id>
<name>Archiva Managed Internal Repository</name>
- <url>file://${appserver.base}/data/repositories/internal</url>
+ <location>${appserver.base}/data/repositories/internal</location>
<layout>default</layout>
<releases>true</releases>
<snapshots>false</snapshots>
<indexed>true</indexed>
<refreshCronExpression>0 0 0 * * ?</refreshCronExpression>
<daysOlder>30</daysOlder>
- </repository>
- <repository>
+ </managedRepository>
+ <managedRepository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/data/repositories/snapshots</url>
+ <location>${appserver.base}/data/repositories/snapshots</location>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
<indexed>true</indexed>
<refreshCronExpression>0 0\,30 0 * * ?</refreshCronExpression>
<daysOlder>30</daysOlder>
- </repository>
- <repository>
+ </managedRepository>
+ </managedRepositories>
+ <remoteRepositories>
+ <remoteRepository>
<id>central</id>
<name>Central Repository</name>
<url>http://repo1.maven.org/maven2</url>
<layout>default</layout>
- <releases>true</releases>
- <snapshots>false</snapshots>
- <indexed>false</indexed>
- </repository>
- <repository>
+ </remoteRepository>
+ <remoteRepository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven 2</name>
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
- <releases>true</releases>
- <snapshots>false</snapshots>
- <indexed>false</indexed>
- </repository>
- </repositories>
+ </remoteRepository>
+ </remoteRepositories>
<proxyConnectors>
<proxyConnector>
Copied: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml (from r574821, maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml)
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml?p2=maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml&p1=maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml&r1=574821&r2=574859&rev=574859&view=diff
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml Wed Sep 12 02:33:41 2007
@@ -156,6 +156,8 @@
<knownContentConsumer>index-content</knownContentConsumer>
<knownContentConsumer>auto-remove</knownContentConsumer>
<knownContentConsumer>auto-rename</knownContentConsumer>
+ <knownContentConsumer>metadata-updater</knownContentConsumer>
+ <!--knownContentConsumer>repository-purge</knownContentConsumer-->
</knownContentConsumers>
<invalidContentConsumers>
<invalidContentConsumer>update-db-bad-content</invalidContentConsumer>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml Wed Sep 12 02:33:41 2007
@@ -33,7 +33,7 @@
<repository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <url>file:${appserver.base}/repositories/snapshots</url>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-base.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-base.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-base.xml Wed Sep 12 02:33:41 2007
@@ -19,47 +19,43 @@
-->
<configuration>
- <version>1</version>
- <repositories>
- <repository>
+ <version>2</version>
+ <managedRepositories>
+ <managedRepository>
<id>internal</id>
<name>Archiva Managed Internal Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <location>${appserver.base}/repositories/internal</location>
<layout>default</layout>
<releases>true</releases>
<snapshots>false</snapshots>
<indexed>true</indexed>
<refreshCronExpression>0 0 * * ?</refreshCronExpression>
- </repository>
- <repository>
+ </managedRepository>
+ <managedRepository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <location>${appserver.base}/repositories/snapshots</location>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
<indexed>true</indexed>
<refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
- </repository>
- <repository>
+ </managedRepository>
+ </managedRepositories>
+ <remoteRepositories>
+ <remoteRepository>
<id>central</id>
<name>Central Repository</name>
<url>http://repo1.maven.org/maven2</url>
<layout>default</layout>
- <releases>true</releases>
- <snapshots>false</snapshots>
- <indexed>false</indexed>
- </repository>
- <repository>
+ </remoteRepository>
+ <remoteRepository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven 2</name>
<url>https://maven2-repository.dev.java.net/nonav/repository</url>
<layout>default</layout>
- <releases>true</releases>
- <snapshots>false</snapshots>
- <indexed>false</indexed>
- </repository>
- </repositories>
+ </remoteRepository>
+ </remoteRepositories>
<webapp>
<ui>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-user.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-user.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-user.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/conf-user.xml Wed Sep 12 02:33:41 2007
@@ -18,7 +18,7 @@
~ under the License.
-->
<configuration>
- <version>1</version>
+ <version>2</version>
<proxyConnectors>
<proxyConnector>
<sourceRepoId>internal</sourceRepoId>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml Wed Sep 12 02:33:41 2007
@@ -18,17 +18,17 @@
~ under the License.
-->
<configuration>
- <version>1</version>
- <repositories>
- <repository>
+ <version>2</version>
+ <managedRepositories>
+ <managedRepository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <location>file://${appserver.base}/repositories/internal</location>
<releases>false</releases>
<snapshots>true</snapshots>
<refreshCronExpression>0 0\,30 * * ?</refreshCronExpression>
- </repository>
- </repositories>
+ </managedRepository>
+ </managedRepositories>
<databaseScanning>
<cronExpression>0 0 0 * * ?</cronExpression>
<unprocessedConsumers>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml Wed Sep 12 02:33:41 2007
@@ -19,47 +19,43 @@
-->
<configuration>
- <version>1</version>
- <repositories>
- <repository>
+ <version>2</version>
+ <managedRepositories>
+ <managedRepository>
<id>internal</id>
<name>Archiva Managed Internal Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <location>${appserver.base}/repositories/internal</location>
<layout>default</layout>
<releases>true</releases>
<snapshots>false</snapshots>
<indexed>true</indexed>
<refreshCronExpression>0 0 * * ?</refreshCronExpression>
- </repository>
- <repository>
+ </managedRepository>
+ <managedRepository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <location>${appserver.base}/repositories/internal</location>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>
<indexed>true</indexed>
<refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
- </repository>
- <repository>
+ </managedRepository>
+ </managedRepositories>
+ <remoteRepositories>
+ <remoteRepository>
<id>central</id>
<name>Central Repository</name>
<url>http://repo1.maven.org/maven2</url>
<layout>default</layout>
- <releases>true</releases>
- <snapshots>false</snapshots>
- <indexed>false</indexed>
- </repository>
- <repository>
+ </remoteRepository>
+ <remoteRepository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven 2</name>
<url>https://maven2-repository.dev.java.net/nonav/repository</url>
<layout>default</layout>
- <releases>true</releases>
- <snapshots>false</snapshots>
- <indexed>false</indexed>
- </repository>
- </repositories>
+ </remoteRepository>
+ </remoteRepositories>
<proxyConnectors>
<proxyConnector>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Wed Sep 12 02:33:41 2007
@@ -28,6 +28,7 @@
import java.io.File;
import java.util.List;
+import java.util.Map;
/**
* Test the configuration store.
@@ -57,11 +58,11 @@
assertConfiguration( configuration );
assertEquals( "check network proxies", 1, configuration.getNetworkProxies().size() );
- RepositoryConfiguration repository =
- (RepositoryConfiguration) configuration.getRepositories().iterator().next();
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
- assertEquals( "check managed repositories", "file://${appserver.base}/repositories/internal",
- repository.getUrl() );
+ assertEquals( "check managed repositories", "${appserver.base}/repositories/internal",
+ repository.getLocation() );
assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
assertEquals( "check managed repositories", "internal", repository.getId() );
assertEquals( "check managed repositories", "default", repository.getLayout() );
@@ -78,11 +79,11 @@
assertConfiguration( configuration );
assertEquals( "check network proxies", 0, configuration.getNetworkProxies().size() );
- RepositoryConfiguration repository =
- (RepositoryConfiguration) configuration.getRepositories().iterator().next();
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
- assertEquals( "check managed repositories", "file://${appserver.base}/data/repositories/internal",
- repository.getUrl() );
+ assertEquals( "check managed repositories", "${appserver.base}/data/repositories/internal",
+ repository.getLocation() );
assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
assertEquals( "check managed repositories", "internal", repository.getId() );
assertEquals( "check managed repositories", "default", repository.getLayout() );
@@ -97,7 +98,8 @@
{
FileTypes filetypes = (FileTypes) lookup( FileTypes.class.getName() );
- assertEquals( "check repositories", 4, configuration.getRepositories().size() );
+ assertEquals( "check repositories", 2, configuration.getManagedRepositories().size() );
+ assertEquals( "check repositories", 2, configuration.getRemoteRepositories().size() );
assertEquals( "check proxy connectors", 2, configuration.getProxyConnectors().size() );
RepositoryScanningConfiguration repoScanning = configuration.getRepositoryScanning();
@@ -133,7 +135,8 @@
Configuration configuration = archivaConfiguration.getConfiguration();
// from base
- assertEquals( "check repositories", 4, configuration.getRepositories().size() );
+ assertEquals( "check repositories", 2, configuration.getManagedRepositories().size() );
+ assertEquals( "check repositories", 2, configuration.getRemoteRepositories().size() );
// from user
assertEquals( "check proxy connectors", 2, configuration.getProxyConnectors().size() );
@@ -478,11 +481,11 @@
assertConfiguration( configuration );
assertEquals( "check network proxies", 0, configuration.getNetworkProxies().size() );
- RepositoryConfiguration repository =
- (RepositoryConfiguration) configuration.getRepositories().iterator().next();
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
- assertEquals( "check managed repositories", "file://${appserver.base}/data/repositories/internal",
- repository.getUrl() );
+ assertEquals( "check managed repositories", "${appserver.base}/data/repositories/internal",
+ repository.getLocation() );
assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
assertEquals( "check managed repositories", "internal", repository.getId() );
assertEquals( "check managed repositories", "default", repository.getLayout() );
@@ -499,17 +502,50 @@
assertConfiguration( configuration );
assertEquals( "check network proxies", 1, configuration.getNetworkProxies().size() );
- RepositoryConfiguration repository =
- (RepositoryConfiguration) configuration.getRepositories().iterator().next();
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
- assertEquals( "check managed repositories", "file://${appserver.base}/repositories/internal",
- repository.getUrl() );
+ assertEquals( "check managed repositories", "${appserver.base}/repositories/internal",
+ repository.getLocation() );
assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
assertEquals( "check managed repositories", "internal", repository.getId() );
assertEquals( "check managed repositories", "default", repository.getLayout() );
assertTrue( "check managed repositories", repository.isIndexed() );
}
+ public void testArchivaV1()
+ throws Exception
+ {
+ ArchivaConfiguration archivaConfiguration =
+ (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-archiva-v1" );
+
+ Configuration configuration = archivaConfiguration.getConfiguration();
+ assertConfiguration( configuration );
+ assertEquals( "check network proxies", 1, configuration.getNetworkProxies().size() );
+
+ assertEquals( "check managed repositories", 2, configuration.getManagedRepositories().size() );
+
+ Map<String, ManagedRepositoryConfiguration> map = configuration.getManagedRepositoriesAsMap();
+
+ ManagedRepositoryConfiguration repository = map.get( "internal" );
+ assertEquals( "check managed repositories", "${appserver.base}/repositories/internal",
+ repository.getLocation() );
+ assertEquals( "check managed repositories", "Archiva Managed Internal Repository", repository.getName() );
+ assertEquals( "check managed repositories", "internal", repository.getId() );
+ assertEquals( "check managed repositories", "default", repository.getLayout() );
+ assertTrue( "check managed repositories", repository.isIndexed() );
+ assertFalse( "check managed repositories", repository.isSnapshots() );
+
+ repository = map.get( "snapshots" );
+ assertEquals( "check managed repositories", "${appserver.base}/repositories/snapshots",
+ repository.getLocation() );
+ assertEquals( "check managed repositories", "Archiva Managed Snapshot Repository", repository.getName() );
+ assertEquals( "check managed repositories", "snapshots", repository.getId() );
+ assertEquals( "check managed repositories", "default", repository.getLayout() );
+ assertTrue( "check managed repositories", repository.isIndexed() );
+ assertTrue( "check managed repositories", repository.isSnapshots() );
+ }
+
public void testCronExpressionsWithComma()
throws Exception
{
@@ -530,12 +566,12 @@
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-cron-expressions" );
- Configuration configuration = archivaConfiguration.getConfiguration();
-
- RepositoryConfiguration repository =
- (RepositoryConfiguration) configuration.getRepositories().iterator().next();
+ Configuration configuration = archivaConfiguration.getConfiguration();
- assertEquals( "check cron expression", "0 0,30 * * ?", repository.getRefreshCronExpression() );
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
+
+ assertEquals( "check cron expression", "0 0,30 * * ?", repository.getRefreshCronExpression().trim() );
configuration.getDatabaseScanning().setCronExpression( "0 0,15 0 * * ?" );
@@ -544,17 +580,15 @@
configuration = archivaConfiguration.getConfiguration();
assertEquals( "check cron expression", "0 0,15 0 * * ?",
- configuration.getDatabaseScanning().getCronExpression() );
+ configuration.getDatabaseScanning().getCronExpression() );
// test for the escape character '\' showing up on repositories.jsp
repository.setRefreshCronExpression( "0 0,20 0 * * ?" );
archivaConfiguration.save( configuration );
- repository = archivaConfiguration.getConfiguration().findRepositoryById( "snapshots" );
+ repository = archivaConfiguration.getConfiguration().findManagedRepositoryById( "snapshots" );
assertEquals( "check cron expression", "0 0,20 0 * * ?", repository.getRefreshCronExpression() );
-
}
-
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java Wed Sep 12 02:33:41 2007
@@ -24,20 +24,19 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
/**
* @author Edwin Punzalan
*/
-public class MavenProxyPropertyLoaderTest extends PlexusTestCase
+public class MavenProxyPropertyLoaderTest
+ extends PlexusTestCase
{
private MavenProxyPropertyLoader loader;
- public void testLoadValidMavenProxyConfiguration() throws IOException, InvalidConfigurationException
+ public void testLoadValidMavenProxyConfiguration()
+ throws IOException, InvalidConfigurationException
{
File confFile = getTestFile( "src/test/conf/maven-proxy-complete.conf" );
@@ -48,27 +47,30 @@
loader.load( new FileInputStream( confFile ), configuration );
- List repos = configuration.getRepositories();
- assertEquals( "Count repositories", 5, repos.size() );
-
- Map repositoryIdMap = new HashMap();
-
- for ( Iterator itRepo = repos.iterator(); itRepo.hasNext(); )
- {
- RepositoryConfiguration repo = (RepositoryConfiguration) itRepo.next();
- repositoryIdMap.put( repo.getId(), repo );
- }
-
- assertRepositoryExists( repositoryIdMap, "local-repo", "file://target" );
+ Map<String, ManagedRepositoryConfiguration> repositoryIdMap = configuration.getManagedRepositoriesAsMap();
+ assertEquals( "Count repositories", 1, repositoryIdMap.size() );
+ assertRepositoryExists( "maven-proxy", "target", repositoryIdMap.get( "maven-proxy" ) );
+
+ Map<String, RemoteRepositoryConfiguration> remoteRepositoryMap = configuration.getRemoteRepositoriesAsMap();
+ assertEquals( "Count repositories", 4, remoteRepositoryMap.size() );
+ assertRepositoryExists( "local-repo", "file://target", remoteRepositoryMap.get( "local-repo" ) );
+ assertRepositoryExists( "www-ibiblio-org", "http://www.ibiblio.org/maven2",
+ remoteRepositoryMap.get( "www-ibiblio-org" ) );
+ assertRepositoryExists( "dist-codehaus-org", "http://dist.codehaus.org",
+ remoteRepositoryMap.get( "dist-codehaus-org" ) );
+ assertRepositoryExists( "private-example-com", "http://private.example.com/internal",
+ remoteRepositoryMap.get( "private-example-com" ) );
+ }
- assertRepositoryExists( repositoryIdMap, "www-ibiblio-org", "http://www.ibiblio.org/maven2" );
- assertRepositoryExists( repositoryIdMap, "dist-codehaus-org", "http://dist.codehaus.org" );
- assertRepositoryExists( repositoryIdMap, "private-example-com", "http://private.example.com/internal" );
+ private void assertRepositoryExists( String id, String expectedLocation, ManagedRepositoryConfiguration repo )
+ {
+ assertNotNull( "Repository id [" + id + "] should not be null", repo );
+ assertEquals( "Repository id", id, repo.getId() );
+ assertEquals( "Repository url", expectedLocation, repo.getLocation() );
}
- private void assertRepositoryExists( Map repoMap, String id, String expectedUrl )
+ private void assertRepositoryExists( String id, String expectedUrl, RemoteRepositoryConfiguration repo )
{
- RepositoryConfiguration repo = (RepositoryConfiguration) repoMap.get( id );
assertNotNull( "Repository id [" + id + "] should not be null", repo );
assertEquals( "Repository id", id, repo.getId() );
assertEquals( "Repository url", expectedUrl, repo.getUrl() );
@@ -88,7 +90,8 @@
}
}
- protected void setUp() throws Exception
+ protected void setUp()
+ throws Exception
{
super.setUp();
loader = new MavenProxyPropertyLoader();
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml Wed Sep 12 02:33:41 2007
@@ -112,6 +112,30 @@
<component>
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
+ <role-hint>test-archiva-v1</role-hint>
+ <implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.registry.Registry</role>
+ <role-hint>archiva-v1</role-hint>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.codehaus.plexus.registry.Registry</role>
+ <role-hint>archiva-v1</role-hint>
+ <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
+ <configuration>
+ <properties>
+ <system/>
+ <xml fileName="${basedir}/src/test/conf/archiva-v1.xml"
+ config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+ </properties>
+ </configuration>
+ </component>
+
+ <component>
+ <role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
<role-hint>test-save</role-hint>
<implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
<requirements>
@@ -236,6 +260,6 @@
config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
</properties>
</configuration>
- </component>
+ </component>
</components>
</component-set>
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java Wed Sep 12 02:33:41 2007
@@ -46,10 +46,11 @@
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
* @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="create-missing-checksums"
- * instantiation-strategy="per-lookup"
+ * role-hint="create-missing-checksums"
+ * instantiation-strategy="per-lookup"
*/
-public class ArtifactMissingChecksumsConsumer extends AbstractMonitoredConsumer
+public class ArtifactMissingChecksumsConsumer
+ extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer, RegistryListener, Initializable
{
/**
@@ -66,7 +67,7 @@
* @plexus.requirement
*/
private ArchivaConfiguration configuration;
-
+
/**
* @plexus.requirement
*/
@@ -123,22 +124,18 @@
return false;
}
- public void beginScan( ArchivaRepository repository ) throws ConsumerException
+ public void beginScan( ArchivaRepository repository )
+ throws ConsumerException
{
- if ( !repository.isManaged() )
- {
- throw new ConsumerException( "Consumer requires managed repository." );
- }
-
this.repository = repository;
this.repositoryDir = new File( repository.getUrl().getPath() );
String layoutName = repository.getModel().getLayoutName();
if ( !bidirectionalLayoutMap.containsKey( layoutName ) )
{
- throw new ConsumerException( "Unable to process repository with layout [" + layoutName
- + "] as there is no corresponding " + BidirectionalRepositoryLayout.class.getName()
- + " implementation available." );
+ throw new ConsumerException( "Unable to process repository with layout [" + layoutName +
+ "] as there is no corresponding " + BidirectionalRepositoryLayout.class.getName() +
+ " implementation available." );
}
this.layout = (BidirectionalRepositoryLayout) bidirectionalLayoutMap.get( layoutName );
@@ -159,7 +156,8 @@
return includes;
}
- public void processFile( String path ) throws ConsumerException
+ public void processFile( String path )
+ throws ConsumerException
{
createIfMissing( path, digestSha1 );
createIfMissing( path, digestMd5 );
@@ -177,19 +175,19 @@
}
catch ( DigesterException e )
{
- triggerConsumerError( TYPE_CHECKSUM_CANNOT_CALC, "Cannot calculate checksum for file " + checksumFile
- + ": " + e.getMessage() );
+ triggerConsumerError( TYPE_CHECKSUM_CANNOT_CALC,
+ "Cannot calculate checksum for file " + checksumFile + ": " + e.getMessage() );
}
catch ( IOException e )
{
- triggerConsumerError( TYPE_CHECKSUM_CANNOT_CREATE, "Cannot create checksum for file " + checksumFile
- + ": " + e.getMessage() );
+ triggerConsumerError( TYPE_CHECKSUM_CANNOT_CREATE,
+ "Cannot create checksum for file " + checksumFile + ": " + e.getMessage() );
}
}
else if ( !checksumFile.isFile() )
{
- triggerConsumerWarning( TYPE_CHECKSUM_NOT_FILE, "Checksum file " + checksumFile.getAbsolutePath()
- + " is not a file." );
+ triggerConsumerWarning( TYPE_CHECKSUM_NOT_FILE,
+ "Checksum file " + checksumFile.getAbsolutePath() + " is not a file." );
}
}
@@ -210,11 +208,12 @@
private void initIncludes()
{
includes.clear();
-
+
includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
- public void initialize() throws InitializationException
+ public void initialize()
+ throws InitializationException
{
propertyNameTriggers = new ArrayList();
propertyNameTriggers.add( "repositoryScanning" );
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java Wed Sep 12 02:33:41 2007
@@ -35,14 +35,13 @@
import java.util.List;
/**
- * AutoRemoveConsumer
+ * AutoRemoveConsumer
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
* @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="auto-remove"
- * instantiation-strategy="per-lookup"
+ * role-hint="auto-remove"
+ * instantiation-strategy="per-lookup"
*/
public class AutoRemoveConsumer
extends AbstractMonitoredConsumer
@@ -62,7 +61,7 @@
* @plexus.requirement
*/
private ArchivaConfiguration configuration;
-
+
/**
* @plexus.requirement
*/
@@ -92,11 +91,6 @@
public void beginScan( ArchivaRepository repository )
throws ConsumerException
{
- if ( !repository.isManaged() )
- {
- throw new ConsumerException( "Consumer requires managed repository." );
- }
-
this.repositoryDir = new File( repository.getUrl().getPath() );
}
@@ -142,7 +136,7 @@
private void initIncludes()
{
includes.clear();
-
+
includes.addAll( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
}
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java Wed Sep 12 02:33:41 2007
@@ -22,7 +22,6 @@
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.codehaus.plexus.util.FileUtils;
@@ -35,14 +34,13 @@
import java.util.Map;
/**
- * AutoRenameConsumer
+ * AutoRenameConsumer
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
* @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="auto-rename"
- * instantiation-strategy="per-lookup"
+ * role-hint="auto-rename"
+ * instantiation-strategy="per-lookup"
*/
public class AutoRenameConsumer
extends AbstractMonitoredConsumer
@@ -95,11 +93,6 @@
public void beginScan( ArchivaRepository repository )
throws ConsumerException
{
- if ( !repository.isManaged() )
- {
- throw new ConsumerException( "Consumer requires managed repository." );
- }
-
this.repositoryDir = new File( repository.getUrl().getPath() );
}
@@ -139,8 +132,8 @@
}
catch ( IOException e )
{
- triggerConsumerWarning( RENAME_FAILURE, "Unable to rename " + path + " to " + correctedPath
- + ": " + e.getMessage() );
+ triggerConsumerWarning( RENAME_FAILURE, "Unable to rename " + path + " to " + correctedPath +
+ ": " + e.getMessage() );
}
}
}
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/MetadataUpdaterConsumer.java Wed Sep 12 02:33:41 2007
@@ -49,10 +49,9 @@
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
-
* @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- * role-hint="metadata-updater"
- * instantiation-strategy="per-lookup"
+ * role-hint="metadata-updater"
+ * instantiation-strategy="per-lookup"
*/
public class MetadataUpdaterConsumer
extends AbstractMonitoredConsumer
@@ -122,11 +121,6 @@
public void beginScan( ArchivaRepository repository )
throws ConsumerException
{
- if ( !repository.isManaged() )
- {
- throw new ConsumerException( "Consumer requires managed repository." );
- }
-
this.repository = repository;
this.repositoryDir = new File( repository.getUrl().getPath() );
try
@@ -135,8 +129,9 @@
}
catch ( LayoutException e )
{
- throw new ConsumerException( "Cannot operate with bad layout definition on repo [" + repository.getId()
- + "]: " + e.getMessage(), e );
+ throw new ConsumerException(
+ "Cannot operate with bad layout definition on repo [" + repository.getId() + "]: " + e.getMessage(),
+ e );
}
this.scanStartTimestamp = System.currentTimeMillis();
}
@@ -195,18 +190,18 @@
}
catch ( LayoutException e )
{
- triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF, "Unable to convert path [" + path
- + "] to an internal project reference: " + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF, "Unable to convert path [" + path +
+ "] to an internal project reference: " + e.getMessage() );
}
catch ( RepositoryMetadataException e )
{
- triggerConsumerError( TYPE_METADATA_WRITE_FAILURE, "Unable to write project metadata for artifact [" + path
- + "]: " + e.getMessage() );
+ triggerConsumerError( TYPE_METADATA_WRITE_FAILURE,
+ "Unable to write project metadata for artifact [" + path + "]: " + e.getMessage() );
}
catch ( IOException e )
{
- triggerConsumerWarning( TYPE_METADATA_IO, "Project metadata not written due to IO warning: "
- + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_IO,
+ "Project metadata not written due to IO warning: " + e.getMessage() );
}
}
@@ -235,18 +230,18 @@
}
catch ( LayoutException e )
{
- triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF, "Unable to convert path [" + path
- + "] to an internal version reference: " + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF, "Unable to convert path [" + path +
+ "] to an internal version reference: " + e.getMessage() );
}
catch ( RepositoryMetadataException e )
{
- triggerConsumerError( TYPE_METADATA_WRITE_FAILURE, "Unable to write version metadata for artifact [" + path
- + "]: " + e.getMessage() );
+ triggerConsumerError( TYPE_METADATA_WRITE_FAILURE,
+ "Unable to write version metadata for artifact [" + path + "]: " + e.getMessage() );
}
catch ( IOException e )
{
- triggerConsumerWarning( TYPE_METADATA_IO, "Version metadata not written due to IO warning: "
- + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_IO,
+ "Version metadata not written due to IO warning: " + e.getMessage() );
}
}