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/08/18 15:37:48 UTC
svn commit: r567269 [1/4] - in /maven/archiva/branches/MRM-462:
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/
a...
Author: brett
Date: Sat Aug 18 06:37:43 2007
New Revision: 567269
URL: http://svn.apache.org/viewvc?view=rev&rev=567269
Log:
[MRM-462] separate repository configuration (not yet applied to web application screens)
Added:
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml (with props)
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java (with props)
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java (with props)
Removed:
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/IndexedRepositoryPredicate.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/LocalRepositoryPredicate.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RemoteRepositoryPredicate.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationToMapClosure.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryIdListClosure.java
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/functors/ManagedRepositoryPredicate.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ActiveManagedRepositories.java
Modified:
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-user.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ValidateChecksumConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexArtifactConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/maven/archiva/consumers/lucene/IndexContentConsumer.java
maven/archiva/branches/MRM-462/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/lucene/LuceneRepositoryContentIndexFactory.java
maven/archiva/branches/MRM-462/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearch.java
maven/archiva/branches/MRM-462/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java
maven/archiva/branches/MRM-462/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-model/pom.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaRepository.java
maven/archiva/branches/MRM-462/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ChecksumTransferTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/RelocateTransferTest.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java
maven/archiva/branches/MRM-462/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AllTests.java
maven/archiva/branches/MRM-462/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/branches/MRM-462/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/branches/MRM-462/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/branches/MRM-462/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/branches/MRM-462/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java
maven/archiva/branches/MRM-462/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
maven/archiva/branches/MRM-462/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
maven/archiva/branches/MRM-462/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java
maven/archiva/branches/MRM-462/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ConfigureProxyConnectorAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AdminRepositoryConfiguration.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryConfigurationAdminTransformer.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ConfigurationSynchronization.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/branches/MRM-462/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Sat Aug 18 06:37:43 2007
@@ -118,6 +118,29 @@
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
+ {
+ 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;
}
@@ -163,7 +186,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;
}
@@ -279,10 +303,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() ) );
}
@@ -298,9 +322,9 @@
private Configuration escapeCronExpressions( Configuration config )
{
- for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
+ for ( Iterator i = config.getManagedRepositories().iterator(); i.hasNext(); )
{
- RepositoryConfiguration c = (RepositoryConfiguration) i.next();
+ ManagedRepositoryConfiguration c = (ManagedRepositoryConfiguration) i.next();
c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
}
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/main/resources/org/apache/maven/archiva/configuration/default-archiva.xml Sat Aug 18 06:37:43 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>
Added: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml?view=auto&rev=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml (added)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml Sat Aug 18 06:37:43 2007
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
+<configuration>
+ <repositories>
+ <repository>
+ <id>internal</id>
+ <name>Archiva Managed Internal Repository</name>
+ <url>file://${appserver.base}/repositories/internal</url>
+ <layout>default</layout>
+ <releases>true</releases>
+ <snapshots>false</snapshots>
+ <indexed>true</indexed>
+ <refreshCronExpression>0 0 * * ?</refreshCronExpression>
+ </repository>
+ <repository>
+ <id>snapshots</id>
+ <name>Archiva Managed Snapshot Repository</name>
+ <url>file://${appserver.base}/repositories/internal</url>
+ <layout>default</layout>
+ <releases>false</releases>
+ <snapshots>true</snapshots>
+ <indexed>true</indexed>
+ <refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
+ </repository>
+ <repository>
+ <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>
+ <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>
+
+ <proxyConnectors>
+ <proxyConnector>
+ <sourceRepoId>internal</sourceRepoId>
+ <targetRepoId>central</targetRepoId>
+ <proxyId/>
+ <snapshotsPolicy>disabled</snapshotsPolicy>
+ <releasePolicy>never</releasePolicy>
+ <failurePolicy>not-found</failurePolicy>
+ </proxyConnector>
+ <proxyConnector>
+ <sourceRepoId>internal</sourceRepoId>
+ <targetRepoId>maven2-repository.dev.java.net</targetRepoId>
+ <proxyId/>
+ <snapshotsPolicy>disabled</snapshotsPolicy>
+ <releasePolicy>never</releasePolicy>
+ <failurePolicy>not-found</failurePolicy>
+ <whiteListPatterns>
+ <whiteListPattern>javax/**</whiteListPattern>
+ </whiteListPatterns>
+ </proxyConnector>
+ </proxyConnectors>
+
+ <networkProxies>
+ <networkProxy>
+ <id>example</id>
+ <protocol>http</protocol>
+ <host>proxy.mycompany.com</host>
+ <port>8080</port>
+ <username>myself</username>
+ <password>mypass</password>
+ </networkProxy>
+ </networkProxies>
+
+ <repositoryScanning>
+ <fileTypes>
+ <fileType>
+ <id>artifacts</id>
+ <patterns>
+ <pattern>**/*.pom</pattern>
+ <pattern>**/*.jar</pattern>
+ <pattern>**/*.ear</pattern>
+ <pattern>**/*.war</pattern>
+ <pattern>**/*.car</pattern>
+ <pattern>**/*.sar</pattern>
+ <pattern>**/*.mar</pattern>
+ <pattern>**/*.rar</pattern>
+ <pattern>**/*.dtd</pattern>
+ <pattern>**/*.tld</pattern>
+ <pattern>**/*.tar.gz</pattern>
+ <pattern>**/*.tar.bz2</pattern>
+ <pattern>**/*.zip</pattern>
+ </patterns>
+ </fileType>
+ <fileType>
+ <id>indexable-content</id>
+ <patterns>
+ <pattern>**/*.txt</pattern>
+ <pattern>**/*.TXT</pattern>
+ <pattern>**/*.block</pattern>
+ <pattern>**/*.config</pattern>
+ <pattern>**/*.pom</pattern>
+ <pattern>**/*.xml</pattern>
+ <pattern>**/*.xsd</pattern>
+ <pattern>**/*.dtd</pattern>
+ <pattern>**/*.tld</pattern>
+ </patterns>
+ </fileType>
+ <fileType>
+ <id>auto-remove</id>
+ <patterns>
+ <pattern>**/*.bak</pattern>
+ <pattern>**/*~</pattern>
+ <pattern>**/*-</pattern>
+ </patterns>
+ </fileType>
+ <fileType>
+ <id>ignored</id>
+ <patterns>
+ <pattern>**/.htaccess</pattern>
+ <pattern>**/KEYS</pattern>
+ <pattern>**/*.rb</pattern>
+ <pattern>**/*.sh</pattern>
+ <pattern>**/.svn/**</pattern>
+ <pattern>**/.DAV/**</pattern>
+ </patterns>
+ </fileType>
+ </fileTypes>
+ <knownContentConsumers>
+ <knownContentConsumer>update-db-artifact</knownContentConsumer>
+ <knownContentConsumer>create-missing-checksums</knownContentConsumer>
+ <knownContentConsumer>update-db-repository-metadata</knownContentConsumer>
+ <knownContentConsumer>validate-checksum</knownContentConsumer>
+ <knownContentConsumer>validate-signature</knownContentConsumer>
+ <knownContentConsumer>index-content</knownContentConsumer>
+ <knownContentConsumer>auto-remove</knownContentConsumer>
+ <knownContentConsumer>auto-rename</knownContentConsumer>
+ </knownContentConsumers>
+ <invalidContentConsumers>
+ <invalidContentConsumer>update-db-bad-content</invalidContentConsumer>
+ </invalidContentConsumers>
+ </repositoryScanning>
+
+ <databaseScanning>
+ <cronExpression>0 0 * * ?</cronExpression>
+ <unprocessedConsumers>
+ <unprocessedConsumer>index-artifact</unprocessedConsumer>
+ <unprocessedConsumer>update-db-project</unprocessedConsumer>
+ <unprocessedConsumer>validate-repository-metadata</unprocessedConsumer>
+ <unprocessedConsumer>index-archive-toc</unprocessedConsumer>
+ <unprocessedConsumer>update-db-bytecode-stats</unprocessedConsumer>
+ <unprocessedConsumer>index-public-methods</unprocessedConsumer>
+ </unprocessedConsumers>
+ <cleanupConsumers>
+ <cleanupConsumer>not-present-remove-db-artifact</cleanupConsumer>
+ <cleanupConsumer>not-present-remove-db-project</cleanupConsumer>
+ <cleanupConsumer>not-present-remove-indexed</cleanupConsumer>
+ </cleanupConsumers>
+ </databaseScanning>
+
+ <webapp>
+ <ui>
+ <showFindArtifacts>true</showFindArtifacts>
+ <appletFindEnabled>true</appletFindEnabled>
+ </ui>
+ </webapp>
+
+</configuration>
Propchange: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/archiva-v1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-base.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-base.xml?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-base.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-base.xml Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-user.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-user.xml?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-user.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/conf-user.xml Sat Aug 18 06:37:43 2007
@@ -18,7 +18,7 @@
~ under the License.
-->
<configuration>
- <version>1</version>
+ <version>2</version>
<proxyConnectors>
<proxyConnector>
<sourceRepoId>internal</sourceRepoId>
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/escape-cron-expressions.xml Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml Sat Aug 18 06:37:43 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/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Sat Aug 18 06:37:43 2007
@@ -57,11 +57,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 +78,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() );
@@ -94,7 +94,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();
@@ -130,7 +131,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() );
@@ -475,11 +477,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() );
@@ -496,11 +498,32 @@
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() );
+
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
+
+ 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() );
@@ -527,10 +550,10 @@
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();
+
+ ManagedRepositoryConfiguration repository =
+ (ManagedRepositoryConfiguration) configuration.getManagedRepositories().get( 0 );
assertEquals( "check cron expression", "0 0,30 * * ?", repository.getRefreshCronExpression().trim() );
@@ -539,9 +562,9 @@
archivaConfiguration.save( configuration );
configuration = archivaConfiguration.getConfiguration();
-
+
assertEquals( "check cron expression", "0 0,15 0 * * ?",
- configuration.getDatabaseScanning().getCronExpression() );
+ configuration.getDatabaseScanning().getCronExpression() );
}
-
+
}
Added: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java?view=auto&rev=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java (added)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java Sat Aug 18 06:37:43 2007
@@ -0,0 +1,144 @@
+package org.apache.maven.archiva.configuration;
+
+import junit.framework.TestCase;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+
+/*
+ * 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.
+ */
+
+/**
+ * Test the generated Configuration class from Modello. This is primarily to test the hand coded methods.
+ */
+public class ConfigurationTest
+ extends TestCase
+{
+ private Configuration configuration = new Configuration();
+
+ public void testNetworkProxyRetrieval()
+ {
+ NetworkProxyConfiguration proxy1 = createNetworkProxy( "id1", "host1", 8080 );
+ configuration.addNetworkProxy( proxy1 );
+ NetworkProxyConfiguration proxy2 = createNetworkProxy( "id2", "host2", 9090 );
+ configuration.addNetworkProxy( proxy2 );
+
+ Map<String, NetworkProxyConfiguration> map = configuration.getNetworkProxiesAsMap();
+ assertNotNull( map );
+ assertEquals( 2, map.size() );
+ assertEquals( new HashSet<String>( Arrays.asList( "id1", "id2" ) ), map.keySet() );
+ assertEquals( new HashSet<NetworkProxyConfiguration>( Arrays.asList( proxy1, proxy2 ) ),
+ new HashSet<NetworkProxyConfiguration>( map.values() ) );
+ }
+
+ private NetworkProxyConfiguration createNetworkProxy( String id, String host, int port )
+ {
+ NetworkProxyConfiguration proxy = new NetworkProxyConfiguration();
+ proxy.setId( id );
+ proxy.setHost( host );
+ proxy.setPort( port );
+ proxy.setProtocol( "http" );
+ return proxy;
+ }
+
+ public void testRemoteRepositoryRetrieval()
+ {
+ RemoteRepositoryConfiguration repo1 = createRemoteRepository( "id1", "name 1", "url 1" );
+ configuration.addRemoteRepository( repo1 );
+ RemoteRepositoryConfiguration repo2 = createRemoteRepository( "id2", "name 2", "url 2" );
+ configuration.addRemoteRepository( repo2 );
+
+ Map<String, RemoteRepositoryConfiguration> map = configuration.getRemoteRepositoriesAsMap();
+ assertNotNull( map );
+ assertEquals( 2, map.size() );
+ assertEquals( new HashSet<String>( Arrays.asList( "id1", "id2" ) ), map.keySet() );
+ assertEquals( new HashSet<RemoteRepositoryConfiguration>( Arrays.asList( repo1, repo2 ) ),
+ new HashSet<RemoteRepositoryConfiguration>( map.values() ) );
+
+ assertEquals( repo1, configuration.findRemoteRepositoryById( "id1" ) );
+ assertEquals( repo2, configuration.findRemoteRepositoryById( "id2" ) );
+ assertNull( configuration.findRemoteRepositoryById( "id3" ) );
+ }
+
+ private RemoteRepositoryConfiguration createRemoteRepository( String id, String name, String url )
+ {
+ RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ repo.setId( id );
+ repo.setName( name );
+ repo.setLayout( "default" );
+ repo.setUrl( url );
+ return repo;
+ }
+
+ public void testManagedRepositoryRetrieval()
+ {
+ ManagedRepositoryConfiguration repo1 = createManagedRepository( "id1", "name 1", "path 1", false );
+ configuration.addManagedRepository( repo1 );
+ ManagedRepositoryConfiguration repo2 = createManagedRepository( "id2", "name 2", "path 2", true );
+ configuration.addManagedRepository( repo2 );
+
+ Map<String, ManagedRepositoryConfiguration> map = configuration.getManagedRepositoriesAsMap();
+ assertNotNull( map );
+ assertEquals( 2, map.size() );
+ assertEquals( new HashSet<String>( Arrays.asList( "id1", "id2" ) ), map.keySet() );
+ assertEquals( new HashSet<ManagedRepositoryConfiguration>( Arrays.asList( repo1, repo2 ) ),
+ new HashSet<ManagedRepositoryConfiguration>( map.values() ) );
+
+ assertEquals( repo1, configuration.findManagedRepositoryById( "id1" ) );
+ assertEquals( repo2, configuration.findManagedRepositoryById( "id2" ) );
+ assertNull( configuration.findManagedRepositoryById( "id3" ) );
+ }
+
+ private ManagedRepositoryConfiguration createManagedRepository( String id, String name, String location,
+ boolean indexed )
+ {
+ ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ repo.setId( id );
+ repo.setName( name );
+ repo.setLocation( location );
+ repo.setIndexed( indexed );
+ return repo;
+ }
+
+ public void testNetworkProxyRetrievalWhenEmpty()
+ {
+ Map<String, NetworkProxyConfiguration> map = configuration.getNetworkProxiesAsMap();
+ assertNotNull( map );
+ assertTrue( map.isEmpty() );
+ }
+
+ public void testRemoteRepositoryRetrievalWhenEmpty()
+ {
+ Map<String, RemoteRepositoryConfiguration> map = configuration.getRemoteRepositoriesAsMap();
+ assertNotNull( map );
+ assertTrue( map.isEmpty() );
+
+ assertNull( configuration.findRemoteRepositoryById( "id" ) );
+ }
+
+ public void testManagedRepositoryRetrievalWhenEmpty()
+ {
+ Map<String, ManagedRepositoryConfiguration> map = configuration.getManagedRepositoriesAsMap();
+ assertNotNull( map );
+ assertTrue( map.isEmpty() );
+
+ assertNull( configuration.findManagedRepositoryById( "id" ) );
+ }
+}
Propchange: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java Sat Aug 18 06:37:43 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();
Added: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java?view=auto&rev=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java (added)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java Sat Aug 18 06:37:43 2007
@@ -0,0 +1,52 @@
+package org.apache.maven.archiva.configuration.functors;
+
+import junit.framework.TestCase;
+import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+
+import java.util.Comparator;
+
+/*
+ * 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.
+ */
+
+/**
+ * Test the repositry comparator.
+ */
+public class RepositoryConfigurationComparatorTest
+ extends TestCase
+{
+ public void testComparator()
+ {
+ Comparator<AbstractRepositoryConfiguration> comparator = new RepositoryConfigurationComparator();
+
+ assertEquals( 0, comparator.compare( null, null ) );
+ assertEquals( 1, comparator.compare( createRepository( "id" ), null ) );
+ assertEquals( -1, comparator.compare( null, createRepository( "id" ) ) );
+ assertEquals( 0, comparator.compare( createRepository( "id1" ), createRepository( "id1" ) ) );
+ assertEquals( -1, comparator.compare( createRepository( "id1" ), createRepository( "id2" ) ) );
+ assertEquals( 1, comparator.compare( createRepository( "id2" ), createRepository( "id1" ) ) );
+ }
+
+ private ManagedRepositoryConfiguration createRepository( String id )
+ {
+ ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ repo.setId( id );
+ return repo;
+ }
+}
Propchange: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml Sat Aug 18 06:37:43 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/branches/MRM-462/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/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java Sat Aug 18 06:37:43 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 coresponding " + BidirectionalRepositoryLayout.class.getName()
- + " implementation available." );
+ throw new ConsumerException( "Unable to process repository with layout [" + layoutName +
+ "] as there is no coresponding " + 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/branches/MRM-462/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/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java Sat Aug 18 06:37:43 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/branches/MRM-462/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/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java?view=diff&rev=567269&r1=567268&r2=567269
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java Sat Aug 18 06:37:43 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() );
}
}
}