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 [3/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...
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Wed Sep 12 02:33:41 2007
@@ -23,15 +23,17 @@
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.ProjectReference;
import org.apache.maven.archiva.model.VersionedReference;
import org.apache.maven.archiva.policies.DownloadPolicy;
import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
+import org.apache.maven.archiva.repository.ArchivaConfigurationAdaptor;
import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory;
import org.apache.maven.archiva.repository.layout.LayoutException;
@@ -60,15 +62,14 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Map.Entry;
+import java.util.Properties;
/**
- * DefaultRepositoryProxyConnectors
+ * DefaultRepositoryProxyConnectors
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
* @plexus.component role-hint="default"
*/
public class DefaultRepositoryProxyConnectors
@@ -116,18 +117,16 @@
/**
* Fetch an artifact from a remote repository.
- *
+ *
* @param repository the managed repository to utilize for the request.
- * @param artifact the artifact reference to fetch.
- * @return the local file in the managed repository that was fetched, or null if the artifact was not (or
- * could not be) fetched.
+ * @param artifact the artifact reference to fetch.
+ * @return the local file in the managed repository that was fetched, or null if the artifact was not (or
+ * could not be) fetched.
* @throws ProxyException if there was a problem fetching the artifact.
*/
public File fetchFromProxies( ArchivaRepository repository, ArtifactReference artifact )
throws ProxyException
{
- assertProxyCapable( repository );
-
File localFile = toLocalFile( repository, artifact );
Properties requestProperties = new Properties();
@@ -155,14 +154,12 @@
/**
* Fetch, from the proxies, a metadata.xml file for the groupId:artifactId:version metadata contents.
- *
+ *
* @return the (local) metadata file that was fetched/merged/updated, or null if no metadata file exists.
*/
public File fetchFromProxies( ArchivaRepository repository, VersionedReference metadata )
throws ProxyException
{
- assertProxyCapable( repository );
-
File localFile = toLocalFile( repository, metadata );
Properties requestProperties = new Properties();
@@ -175,9 +172,10 @@
ProxyConnector connector = (ProxyConnector) it.next();
ArchivaRepository targetRepository = connector.getTargetRepository();
String targetPath = metadataTools.toPath( metadata );
-
+
File localRepoFile = toLocalRepoFile( repository, targetRepository, targetPath );
- File downloadedFile = transferFile( connector, targetRepository, targetPath, localRepoFile, requestProperties );
+ File downloadedFile =
+ transferFile( connector, targetRepository, targetPath, localRepoFile, requestProperties );
if ( fileExists( downloadedFile ) )
{
@@ -221,14 +219,12 @@
/**
* Fetch from the proxies a metadata.xml file for the groupId:artifactId metadata contents.
- *
+ *
* @return the (local) metadata file that was fetched/merged/updated, or null if no metadata file exists.
*/
public File fetchFromProxies( ArchivaRepository repository, ProjectReference metadata )
throws ProxyException
{
- assertProxyCapable( repository );
-
File localFile = toLocalFile( repository, metadata );
Properties requestProperties = new Properties();
@@ -243,7 +239,8 @@
String targetPath = metadataTools.toPath( metadata );
File localRepoFile = toLocalRepoFile( repository, targetRepository, targetPath );
- File downloadedFile = transferFile( connector, targetRepository, targetPath, localRepoFile, requestProperties );
+ File downloadedFile =
+ transferFile( connector, targetRepository, targetPath, localRepoFile, requestProperties );
if ( fileExists( downloadedFile ) )
{
@@ -302,21 +299,6 @@
}
}
- /**
- * Test the repository to see if it is proxy capable.
- *
- * @param repository the repository to test.
- * @throws ProxyException if the repository is not proxy capable.
- */
- private void assertProxyCapable( ArchivaRepository repository )
- throws ProxyException
- {
- if ( !repository.isManaged() )
- {
- throw new ProxyException( "Can only proxy managed repositories." );
- }
- }
-
private File toLocalFile( ArchivaRepository repository, ArtifactReference artifact )
throws ProxyException
{
@@ -341,7 +323,7 @@
/**
* Get the layout for the repository.
- *
+ *
* @param repository the repository to get the layout from.
* @return the layout
* @throws ProxyException if there was a problem obtaining the layout from the repository (usually due to a bad
@@ -356,14 +338,14 @@
}
catch ( LayoutException e )
{
- throw new ProxyException( "Unable to proxy due to bad repository layout definition [" + repository.getId()
- + "] had a layout defined as [" + repository.getLayoutType() + "] : " + e.getMessage(), e );
+ throw new ProxyException( "Unable to proxy due to bad repository layout definition [" + repository.getId() +
+ "] had a layout defined as [" + repository.getLayoutType() + "] : " + e.getMessage(), e );
}
}
/**
* Simple method to test if the file exists on the local disk.
- *
+ *
* @param file the file to test. (may be null)
* @return true if file exists. false if the file param is null, doesn't exist, or is not of type File.
*/
@@ -389,11 +371,11 @@
/**
* Perform the transfer of the file.
- *
- * @param connector the connector configuration to use.
- * @param remoteRepository the remote repository get the resource from.
- * @param remotePath the path in the remote repository to the resource to get.
- * @param localFile the local file to place the downloaded resource into
+ *
+ * @param connector the connector configuration to use.
+ * @param remoteRepository the remote repository get the resource from.
+ * @param remotePath the path in the remote repository to the resource to get.
+ * @param localFile the local file to place the downloaded resource into
* @param requestProperties the request properties to utilize for policy handling.
* @return the local file that was downloaded, or null if not downloaded.
* @throws ProxyException if transfer was unsuccessful.
@@ -499,14 +481,14 @@
/**
* Quietly transfer the checksum file from the remote repository to the local file.
- *
+ * <p/>
* NOTE: This will not throw a WagonException if the checksum is unable to be downloaded.
- *
- * @param wagon the wagon instance (should already be connected) to use.
+ *
+ * @param wagon the wagon instance (should already be connected) to use.
* @param remoteRepository the remote repository to transfer from.
- * @param remotePath the remote path to the resource to get.
- * @param localFile the local file that should contain the downloaded contents
- * @param type the type of checksum to transfer (example: ".md5" or ".sha1")
+ * @param remotePath the remote path to the resource to get.
+ * @param localFile the local file that should contain the downloaded contents
+ * @param type the type of checksum to transfer (example: ".md5" or ".sha1")
* @throws ProxyException if copying the downloaded file into place did not succeed.
*/
private void transferChecksum( Wagon wagon, ArchivaRepository remoteRepository, String remotePath, File localFile,
@@ -540,16 +522,17 @@
/**
* Perform the transfer of the remote file to the local file specified.
- *
- * @param wagon the wagon instance to use.
+ *
+ * @param wagon the wagon instance to use.
* @param remoteRepository the remote repository to use
- * @param remotePath the remote path to attempt to get
- * @param localFile the local file to save to
+ * @param remotePath the remote path to attempt to get
+ * @param localFile the local file to save to
* @return The local file that was transfered.
* @throws ProxyException if there was a problem moving the downloaded file into place.
* @throws WagonException if there was a problem tranfering the file.
*/
- private File transferSimpleFile( Wagon wagon, ArchivaRepository remoteRepository, String remotePath, File localFile )
+ private File transferSimpleFile( Wagon wagon, ArchivaRepository remoteRepository, String remotePath,
+ File localFile )
throws ProxyException, WagonException
{
assert ( remotePath != null );
@@ -584,8 +567,7 @@
if ( !success )
{
getLogger().info(
- "Not downloaded, as local file is newer than remote side: "
- + localFile.getAbsolutePath() );
+ "Not downloaded, as local file is newer than remote side: " + localFile.getAbsolutePath() );
}
else if ( temp.exists() )
{
@@ -617,11 +599,11 @@
/**
* Apply the policies.
- * @param policies the map of policies to execute. (Map of String policy keys, to {@link DownloadPolicy} objects)
- * @param settings the map of settings for the policies to execute. (Map of String policy keys, to String policy setting)
- * @param request the request properties (utilized by the {@link DownloadPolicy#applyPolicy(String, Properties, File)})
- * @param localFile the local file (utilized by the {@link DownloadPolicy#applyPolicy(String, Properties, File)})
- *
+ *
+ * @param policies the map of policies to execute. (Map of String policy keys, to {@link DownloadPolicy} objects)
+ * @param settings the map of settings for the policies to execute. (Map of String policy keys, to String policy setting)
+ * @param request the request properties (utilized by the {@link DownloadPolicy#applyPolicy(String,Properties,File)})
+ * @param localFile the local file (utilized by the {@link DownloadPolicy#applyPolicy(String,Properties,File)})
* @return true if all of the policies passed, false if a policy failed.
*/
private boolean applyPolicies( Map policies, Map settings, Properties request, File localFile )
@@ -682,9 +664,9 @@
/**
* Using wagon, connect to the remote repository.
- *
- * @param connector the connector configuration to utilize (for obtaining network proxy configuration from)
- * @param wagon the wagon instance to establish the connection on.
+ *
+ * @param connector the connector configuration to utilize (for obtaining network proxy configuration from)
+ * @param wagon the wagon instance to establish the connection on.
* @param remoteRepository the remote repository to connect to.
* @return true if the connection was successful. false if not connected.
*/
@@ -700,7 +682,8 @@
try
{
- Repository wagonRepository = new Repository( remoteRepository.getId(), remoteRepository.getUrl().toString() );
+ Repository wagonRepository =
+ new Repository( remoteRepository.getId(), remoteRepository.getUrl().toString() );
if ( networkProxy != null )
{
wagon.connect( wagonRepository, networkProxy );
@@ -727,8 +710,8 @@
/**
* Tests whitelist and blacklist patterns against path.
- *
- * @param path the path to test.
+ *
+ * @param path the path to test.
* @param patterns the list of patterns to check.
* @return true if the path matches at least 1 pattern in the provided patterns list.
*/
@@ -770,8 +753,10 @@
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
- if ( ConfigurationNames.isNetworkProxy( propertyName ) || ConfigurationNames.isRepositories( propertyName )
- || ConfigurationNames.isProxyConnector( propertyName ) )
+ if ( ConfigurationNames.isNetworkProxy( propertyName ) ||
+ ConfigurationNames.isManagedRepositories( propertyName ) ||
+ ConfigurationNames.isRemoteRepositories( propertyName ) ||
+ ConfigurationNames.isProxyConnector( propertyName ) )
{
initConnectorsAndNetworkProxies();
}
@@ -799,8 +784,8 @@
// Create connector object.
ProxyConnector connector = new ProxyConnector();
- connector.setSourceRepository( getRepository( proxyConfig.getSourceRepoId() ) );
- connector.setTargetRepository( getRepository( proxyConfig.getTargetRepoId() ) );
+ connector.setSourceRepository( getManagedRepository( proxyConfig.getSourceRepoId() ) );
+ connector.setTargetRepository( getRemoteRepository( proxyConfig.getTargetRepoId() ) );
connector.setProxyId( proxyConfig.getProxyId() );
connector.setPolicies( proxyConfig.getPolicies() );
@@ -870,17 +855,22 @@
return collection.size() == 0;
}
- private ArchivaRepository getRepository( String repoId )
+ private ArchivaRepository getRemoteRepository( String repoId )
{
- RepositoryConfiguration repoConfig = archivaConfiguration.getConfiguration().findRepositoryById( repoId );
- if ( repoConfig == null )
- {
- return null;
- }
+ RemoteRepositoryConfiguration repoConfig =
+ archivaConfiguration.getConfiguration().findRemoteRepositoryById( repoId );
ArchivaRepository repo = new ArchivaRepository( repoConfig.getId(), repoConfig.getName(), repoConfig.getUrl() );
repo.getModel().setLayoutName( repoConfig.getLayout() );
return repo;
+ }
+
+ private ArchivaRepository getManagedRepository( String repoId )
+ {
+ ManagedRepositoryConfiguration repoConfig =
+ archivaConfiguration.getConfiguration().findManagedRepositoryById( repoId );
+
+ return ArchivaConfigurationAdaptor.toArchivaRepository( repoConfig );
}
public void initialize()
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java Wed Sep 12 02:33:41 2007
@@ -22,8 +22,9 @@
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.apache.maven.archiva.model.ArtifactReference;
@@ -47,12 +48,12 @@
import java.util.Locale;
/**
- * AbstractProxyTestCase
+ * AbstractProxyTestCase
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
-public class AbstractProxyTestCase
+public abstract class AbstractProxyTestCase
extends PlexusTestCase
{
protected static final String ID_LEGACY_PROXIED = "legacy-proxied";
@@ -161,7 +162,7 @@
return;
}
- Collection tmpFiles = FileUtils.listFiles( workingDir, new String[] { "tmp" }, false );
+ Collection tmpFiles = FileUtils.listFiles( workingDir, new String[]{"tmp"}, false );
if ( !tmpFiles.isEmpty() )
{
StringBuffer emsg = new StringBuffer();
@@ -220,8 +221,8 @@
{
if ( !destination.exists() && !destination.mkdirs() )
{
- throw new IOException( "Could not create destination directory '"
- + destination.getAbsolutePath() + "'." );
+ throw new IOException(
+ "Could not create destination directory '" + destination.getAbsolutePath() + "'." );
}
copyDirectoryStructure( file, destination );
@@ -260,19 +261,19 @@
"Test Proxied (Legacy) Repository", "legacy" );
}
- protected RepositoryConfiguration createRepoConfig( ArchivaRepository repo )
+ protected ManagedRepositoryConfiguration createRepoConfig( ArchivaRepository repo )
{
return createRepoConfig( repo.getId(), repo.getName(), repo.getUrl().toString(), repo.getLayoutType() );
}
- protected RepositoryConfiguration createRepoConfig( String id, String name, String path, String layout )
+ protected ManagedRepositoryConfiguration createRepoConfig( String id, String name, String path, String layout )
{
- RepositoryConfiguration repoConfig = new RepositoryConfiguration();
+ ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
repoConfig.setId( id );
repoConfig.setName( name );
- repoConfig.setUrl( PathUtil.toUrl( path ) );
+ repoConfig.setLocation( path );
repoConfig.setLayout( layout );
return repoConfig;
@@ -323,8 +324,8 @@
}
}
- protected void saveConnector( String sourceRepoId, String targetRepoId, String checksumPolicy,
- String releasePolicy, String snapshotPolicy, String cacheFailuresPolicy )
+ protected void saveConnector( String sourceRepoId, String targetRepoId, String checksumPolicy, String releasePolicy,
+ String snapshotPolicy, String cacheFailuresPolicy )
{
ProxyConnectorConfiguration connectorConfig = new ProxyConnectorConfiguration();
connectorConfig.setSourceRepoId( sourceRepoId );
@@ -348,24 +349,33 @@
config.triggerChange( prefix + ".policies.cache-failures", connectorConfig.getPolicy( "cache-failures", "" ) );
}
- protected void saveRepositoryConfig( String id, String name, String path, String layout )
+ protected void saveManagedRepositoryConfig( String id, String name, String path, String layout )
{
- RepositoryConfiguration repoConfig = new RepositoryConfiguration();
+ ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
repoConfig.setId( id );
repoConfig.setName( name );
+ repoConfig.setLayout( layout );
- if ( path.startsWith( "test://" ) )
- {
- repoConfig.setUrl( path );
- }
- else
- {
- repoConfig.setUrl( PathUtil.toUrl( path ) );
- }
+ repoConfig.setLocation( path );
+
+ config.getConfiguration().addManagedRepository( repoConfig );
+
+ config.triggerChange( "repository", "" );
+ }
+
+ protected void saveRemoteRepositoryConfig( String id, String name, String path, String layout )
+ {
+ RemoteRepositoryConfiguration repoConfig = new RemoteRepositoryConfiguration();
+
+ repoConfig.setId( id );
+ repoConfig.setName( name );
repoConfig.setLayout( layout );
- config.getConfiguration().addRepository( repoConfig );
+ repoConfig.setUrl( path );
+
+ config.getConfiguration().addRemoteRepository( repoConfig );
+
config.triggerChange( "repository", "" );
}
@@ -376,7 +386,7 @@
FileUtils.deleteDirectory( repoLocation );
copyDirectoryStructure( getTestFile( originalPath ), repoLocation );
- saveRepositoryConfig( id, "Target Repo-" + id, targetPath, layout );
+ saveRemoteRepositoryConfig( id, "Target Repo-" + id, targetPath, layout );
return repoLocation;
}
@@ -390,20 +400,19 @@
.getName() );
config = (MockConfiguration) lookup( ArchivaConfiguration.class.getName(), "mock" );
- RepositoryConfiguration repoConfig;
// Setup source repository (using default layout)
String repoPath = "target/test-repository/managed/" + getName();
File repoLocation = getTestFile( repoPath );
- managedDefaultRepository = createRepository( ID_DEFAULT_MANAGED, "Default Managed Repository", repoPath,
- "default" );
+ managedDefaultRepository =
+ createRepository( ID_DEFAULT_MANAGED, "Default Managed Repository", repoPath, "default" );
managedDefaultDir = new File( managedDefaultRepository.getUrl().getPath() );
- repoConfig = createRepoConfig( managedDefaultRepository );
+ ManagedRepositoryConfiguration repoConfig = createRepoConfig( managedDefaultRepository );
- config.getConfiguration().addRepository( repoConfig );
+ config.getConfiguration().addManagedRepository( repoConfig );
// Setup source repository (using legacy layout)
repoLocation = getTestFile( REPOPATH_LEGACY_MANAGED_TARGET );
@@ -417,16 +426,19 @@
repoConfig = createRepoConfig( managedLegacyRepository );
- config.getConfiguration().addRepository( repoConfig );
+ config.getConfiguration().addManagedRepository( repoConfig );
// Setup target (proxied to) repository.
- saveRepositoryConfig( ID_PROXIED1, "Proxied Repository 1", REPOPATH_PROXIED1, "default" );
+ saveRemoteRepositoryConfig( ID_PROXIED1, "Proxied Repository 1",
+ new File( REPOPATH_PROXIED1 ).toURL().toExternalForm(), "default" );
// Setup target (proxied to) repository.
- saveRepositoryConfig( ID_PROXIED2, "Proxied Repository 2", REPOPATH_PROXIED2, "default" );
+ saveRemoteRepositoryConfig( ID_PROXIED2, "Proxied Repository 2",
+ new File( REPOPATH_PROXIED2 ).toURL().toExternalForm(), "default" );
// Setup target (proxied to) repository using legacy layout.
- saveRepositoryConfig( ID_LEGACY_PROXIED, "Proxied Legacy Repository", REPOPATH_PROXIED_LEGACY, "legacy" );
+ saveRemoteRepositoryConfig( ID_LEGACY_PROXIED, "Proxied Legacy Repository",
+ new File( REPOPATH_PROXIED_LEGACY ).toURL().toExternalForm(), "legacy" );
// Setup the proxy handler.
proxyHandler = (RepositoryProxyConnectors) lookup( RepositoryProxyConnectors.class.getName() );
@@ -443,21 +455,21 @@
/**
* Copy the specified resource directory from the src/test/repository/managed/ to
* the testable directory under target/test-repository/managed/${testName}/
- *
+ *
* @param resourceDir
- * @throws IOException
+ * @throws IOException
*/
protected void setupTestableManagedRepository( String resourcePath )
throws IOException
{
String resourceDir = resourcePath;
-
- if( !resourcePath.endsWith( "/" ) )
+
+ if ( !resourcePath.endsWith( "/" ) )
{
int idx = resourcePath.lastIndexOf( '/' );
resourceDir = resourcePath.substring( 0, idx );
}
-
+
File sourceRepoDir = new File( REPOPATH_DEFAULT_MANAGED );
File sourceDir = new File( sourceRepoDir, resourceDir );
@@ -474,8 +486,8 @@
if ( !sourceDir.exists() )
{
// This is just a warning.
- System.err.println( "Skipping setup of testable managed repsoitory, source dir does not exist: "
- + sourceDir );
+ System.err.println(
+ "Skipping setup of testable managed repsoitory, source dir does not exist: " + sourceDir );
return;
}
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AllTests.java Wed Sep 12 02:33:41 2007
@@ -23,7 +23,7 @@
import junit.framework.TestSuite;
/**
- * IDE Provided Utility Class for all tests.
+ * IDE Provided Utility Class for all tests.
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.java Wed Sep 12 02:33:41 2007
@@ -31,7 +31,7 @@
import java.io.File;
/**
- * CacheFailuresTransferTest
+ * CacheFailuresTransferTest
*
* @author Brett Porter
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
@@ -51,8 +51,8 @@
assertFalse( expectedFile.exists() );
// Configure Repository (usually done within archiva.xml configuration)
- saveRepositoryConfig( "badproxied1", "Bad Proxied 1", "test://bad.machine.com/repo/", "default" );
- saveRepositoryConfig( "badproxied2", "Bad Proxied 2", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied1", "Bad Proxied 1", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied2", "Bad Proxied 2", "test://bad.machine.com/repo/", "default" );
// Configure Connector (usually done within archiva.xml configuration)
saveConnector( ID_DEFAULT_MANAGED, "badproxied1", ChecksumPolicy.FIX, ReleasesPolicy.IGNORED,
@@ -85,8 +85,8 @@
assertFalse( expectedFile.exists() );
// Configure Repository (usually done within archiva.xml configuration)
- saveRepositoryConfig( "badproxied1", "Bad Proxied 1", "test://bad.machine.com/repo/", "default" );
- saveRepositoryConfig( "badproxied2", "Bad Proxied 2", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied1", "Bad Proxied 1", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied2", "Bad Proxied 2", "test://bad.machine.com/repo/", "default" );
// Configure Connector (usually done within archiva.xml configuration)
saveConnector( ID_DEFAULT_MANAGED, "badproxied1", ChecksumPolicy.FIX, ReleasesPolicy.IGNORED,
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ChecksumTransferTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ChecksumTransferTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ChecksumTransferTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ChecksumTransferTest.java Wed Sep 12 02:33:41 2007
@@ -30,7 +30,7 @@
import java.io.File;
/**
- * ChecksumTransferTest
+ * ChecksumTransferTest
*
* @author Brett Porter
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
@@ -44,7 +44,7 @@
{
String path = "org/apache/maven/test/get-checksum-both-right/1.0/get-checksum-both-right-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -69,7 +69,7 @@
{
String path = "org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -85,7 +85,8 @@
File proxied1File = new File( REPOPATH_PROXIED1, path );
assertFileEquals( expectedFile, downloadedFile, proxied1File );
assertNoTempFiles( expectedFile );
- assertChecksums( expectedFile, "748a3a013bf5eacf2bbb40a2ac7d37889b728837 *get-checksum-sha1-only-1.0.jar", null );
+ assertChecksums( expectedFile, "748a3a013bf5eacf2bbb40a2ac7d37889b728837 *get-checksum-sha1-only-1.0.jar",
+ null );
}
public void testGetChecksumNoSha1CorrectMd5()
@@ -93,7 +94,7 @@
{
String path = "org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -117,7 +118,7 @@
{
String path = "org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -141,7 +142,7 @@
{
String path = "org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -165,7 +166,7 @@
{
String path = "org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -187,7 +188,7 @@
{
String path = "org/apache/maven/test/get-checksum-both-bad/1.0/get-checksum-both-bad-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -212,7 +213,7 @@
{
String path = "org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -234,7 +235,7 @@
{
String path = "org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -259,7 +260,7 @@
{
String path = "org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -281,7 +282,7 @@
{
String path = "org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -306,7 +307,7 @@
{
String path = "org/apache/maven/test/get-checksum-sha1-bad-md5/1.0/get-checksum-sha1-bad-md5-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -331,7 +332,7 @@
{
String path = "org/apache/maven/test/get-checksum-md5-only/1.0/get-checksum-md5-only-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -356,7 +357,7 @@
{
String path = "org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -381,7 +382,7 @@
{
String path = "org/apache/maven/test/get-checksum-sha1-only/1.0/get-checksum-sha1-only-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -389,7 +390,7 @@
assertFalse( expectedFile.getParentFile().exists() );
assertFalse( expectedFile.exists() );
- saveRepositoryConfig( "badproxied", "Bad Proxied", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied", "Bad Proxied", "test://bad.machine.com/repo/", "default" );
// Configure Connector (usually done within archiva.xml configuration)
saveConnector( ID_DEFAULT_MANAGED, "badproxied", ChecksumPolicy.IGNORED, ReleasesPolicy.IGNORED,
@@ -417,7 +418,8 @@
File proxied1File = new File( REPOPATH_PROXIED1, path );
assertFileEquals( expectedFile, downloadedFile, proxied1File );
assertNoTempFiles( expectedFile );
- assertChecksums( expectedFile, "748a3a013bf5eacf2bbb40a2ac7d37889b728837 *get-checksum-sha1-only-1.0.jar", null );
+ assertChecksums( expectedFile, "748a3a013bf5eacf2bbb40a2ac7d37889b728837 *get-checksum-sha1-only-1.0.jar",
+ null );
}
public void testGetAlwaysBadChecksumPresentLocallyAbsentRemoteUsingIgnoredSetting()
@@ -425,7 +427,7 @@
{
String path = "org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -449,7 +451,7 @@
{
String path = "org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -473,7 +475,7 @@
{
String path = "org/apache/maven/test/get-bad-local-checksum/1.0/get-bad-local-checksum-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.java Wed Sep 12 02:33:41 2007
@@ -31,7 +31,7 @@
import java.io.File;
/**
- * ManagedDefaultTransferTest
+ * ManagedDefaultTransferTest
*
* @author Brett Porter
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
@@ -45,7 +45,7 @@
{
String path = "org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -67,9 +67,9 @@
/**
* The attempt here should result in no file being transferred.
- *
+ * <p/>
* The file exists locally, and the policy is ONCE.
- *
+ *
* @throws Exception
*/
public void testGetDefaultLayoutAlreadyPresentPolicyOnce()
@@ -77,7 +77,7 @@
{
String path = "org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -97,9 +97,9 @@
/**
* The attempt here should result in file being transferred.
- *
+ * <p/>
* The file exists locally, and the policy is IGNORE.
- *
+ *
* @throws Exception
*/
public void testGetDefaultLayoutAlreadyPresentPolicyIgnored()
@@ -107,7 +107,7 @@
{
String path = "org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
long originalModificationTime = expectedFile.lastModified();
@@ -135,15 +135,15 @@
* This delta is the amount of milliseconds of 'fudge factor' we allow for
* the unit test to still be considered 'passed'.
*/
- int delta = 1100;
+ int delta = 20000;
long hirange = originalModificationTime + ( delta / 2 );
long lorange = originalModificationTime - ( delta / 2 );
if ( ( downloadedLastModified < lorange ) || ( downloadedLastModified > hirange ) )
{
- fail( "Check file timestamp is that of original managed file: expected within range lo:<" + lorange
- + "> hi:<" + hirange + "> but was:<" + downloadedLastModified + ">" );
+ fail( "Check file timestamp is that of original managed file: expected within range lo:<" + lorange +
+ "> hi:<" + hirange + "> but was:<" + downloadedLastModified + ">" );
}
}
assertNoTempFiles( expectedFile );
@@ -151,9 +151,9 @@
/**
* The attempt here should result in file being transferred.
- *
+ * <p/>
* The file exists locally, is over 6 years old, and the policy is DAILY.
- *
+ *
* @throws Exception
*/
public void testGetDefaultLayoutRemoteUpdate()
@@ -161,7 +161,7 @@
{
String path = "org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -169,8 +169,8 @@
expectedFile.setLastModified( getPastDate().getTime() );
// Configure Connector (usually done within archiva.xml configuration)
- saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, ChecksumPolicy.FIX, ReleasesPolicy.DAILY,
- SnapshotsPolicy.DAILY, CachedFailuresPolicy.IGNORED );
+ saveConnector( ID_DEFAULT_MANAGED, ID_PROXIED1, ChecksumPolicy.FIX, ReleasesPolicy.DAILY, SnapshotsPolicy.DAILY,
+ CachedFailuresPolicy.IGNORED );
// Attempt the proxy fetch.
File downloadedFile = proxyHandler.fetchFromProxies( managedDefaultRepository, artifact );
@@ -185,7 +185,7 @@
{
String path = "org/apache/maven/test/get-in-both-proxies/1.0/get-in-both-proxies-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -209,8 +209,8 @@
// TODO: is this check even needed if it passes above?
String actualContents = FileUtils.readFileToString( downloadedFile, null );
String badContents = FileUtils.readFileToString( proxied2File, null );
- assertFalse( "Downloaded file contents should not be that of proxy 2", StringUtils.equals( actualContents,
- badContents ) );
+ assertFalse( "Downloaded file contents should not be that of proxy 2",
+ StringUtils.equals( actualContents, badContents ) );
}
public void testGetInSecondProxiedRepo()
@@ -218,7 +218,7 @@
{
String path = "org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -244,7 +244,7 @@
{
String path = "org/apache/maven/test/does-not-exist/1.0/does-not-exist-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -261,7 +261,8 @@
// Attempt the proxy fetch.
File downloadedFile = proxyHandler.fetchFromProxies( managedDefaultRepository, artifact );
- assertNull( "File returned was: " + downloadedFile + "; should have got a not found exception", downloadedFile );
+ assertNull( "File returned was: " + downloadedFile + "; should have got a not found exception",
+ downloadedFile );
assertNoTempFiles( expectedFile );
}
@@ -270,7 +271,7 @@
{
String path = "org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -278,7 +279,7 @@
assertFalse( expectedFile.exists() );
// Configure Repository (usually done within archiva.xml configuration)
- saveRepositoryConfig( "badproxied", "Bad Proxied", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied", "Bad Proxied", "test://bad.machine.com/repo/", "default" );
wagonMock.getIfNewer( path, new File( expectedFile.getAbsolutePath() + ".tmp" ), 0 );
wagonMockControl.setThrowable( new TransferFailedException( "transfer failed" ) );
@@ -305,7 +306,7 @@
{
String path = "org/apache/maven/test/get-in-second-proxy/1.0/get-in-second-proxy-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -313,8 +314,8 @@
assertFalse( expectedFile.exists() );
// Configure Repository (usually done within archiva.xml configuration)
- saveRepositoryConfig( "badproxied1", "Bad Proxied 1", "test://bad.machine.com/repo/", "default" );
- saveRepositoryConfig( "badproxied2", "Bad Proxied 2", "test://dead.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied1", "Bad Proxied 1", "test://bad.machine.com/repo/", "default" );
+ saveRemoteRepositoryConfig( "badproxied2", "Bad Proxied 2", "test://dead.machine.com/repo/", "default" );
// Configure Connector (usually done within archiva.xml configuration)
saveConnector( ID_DEFAULT_MANAGED, "badproxied1", ChecksumPolicy.FIX, ReleasesPolicy.IGNORED,
@@ -346,7 +347,7 @@
{
String path = "org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -358,8 +359,8 @@
File downloadedFile = proxyHandler.fetchFromProxies( managedDefaultRepository, artifact );
- File proxiedFile = new File( REPOPATH_PROXIED_LEGACY,
- "org.apache.maven.test/jars/get-default-layout-present-1.0.jar" );
+ File proxiedFile =
+ new File( REPOPATH_PROXIED_LEGACY, "org.apache.maven.test/jars/get-default-layout-present-1.0.jar" );
assertFileEquals( expectedFile, downloadedFile, proxiedFile );
assertNoTempFiles( expectedFile );
}
@@ -373,7 +374,7 @@
String legacyPath = "org.apache.maven.test/jars/get-default-layout-present-1.0.jar";
String path = "org/apache/maven/test/get-default-layout-present/1.0/get-default-layout-present-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
@@ -396,7 +397,7 @@
{
String path = "org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
setupTestableManagedRepository( path );
-
+
File expectedFile = new File( managedDefaultDir, path );
ArtifactReference artifact = createArtifactReference( "default", path );
Modified: maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/RelocateTransferTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/RelocateTransferTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/RelocateTransferTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/RelocateTransferTest.java Wed Sep 12 02:33:41 2007
@@ -19,31 +19,8 @@
* under the License.
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.common.utils.PathUtil;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepository;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.policies.CachedFailuresPolicy;
-import org.apache.maven.archiva.policies.ChecksumPolicy;
-import org.apache.maven.archiva.policies.ReleasesPolicy;
-import org.apache.maven.archiva.policies.SnapshotsPolicy;
-import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.Wagon;
-import org.easymock.MockControl;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Arrays;
-
/**
- * RelocateTransferTest
+ * RelocateTransferTest
*
* @author Brett Porter
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ArchivaConfigurationAdaptor.java Wed Sep 12 02:33:41 2007
@@ -20,11 +20,12 @@
*/
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.common.utils.PathUtil;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.model.ArchivaRepository;
/**
- * ArchivaConfigurationAdaptor
+ * ArchivaConfigurationAdaptor
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
@@ -32,7 +33,11 @@
*/
public class ArchivaConfigurationAdaptor
{
- public static ArchivaRepository toArchivaRepository( RepositoryConfiguration config )
+ private ArchivaConfigurationAdaptor()
+ {
+ }
+
+ public static ArchivaRepository toArchivaRepository( ManagedRepositoryConfiguration config )
{
if ( config == null )
{
@@ -44,13 +49,14 @@
throw new IllegalArgumentException( "Unable to repository config with blank ID to archiva repository." );
}
- if ( StringUtils.isBlank( config.getUrl() ) )
+ if ( StringUtils.isBlank( config.getLocation() ) )
{
throw new IllegalArgumentException(
- "Unable to convert repository config with blank URL to archiva repository." );
+ "Unable to convert repository config with blank location to archiva repository." );
}
- ArchivaRepository repository = new ArchivaRepository( config.getId(), config.getName(), config.getUrl() );
+ ArchivaRepository repository =
+ new ArchivaRepository( config.getId(), config.getName(), PathUtil.toUrl( config.getLocation() ) );
repository.getModel().setLayoutName( config.getLayout() );
repository.getModel().setReleasePolicy( config.isReleases() );
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java Wed Sep 12 02:33:41 2007
@@ -20,9 +20,9 @@
*/
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -98,13 +98,13 @@
throw new LayoutException( "Cannot determine layout using artifact with no repository id: " + artifact );
}
- RepositoryConfiguration repo = (RepositoryConfiguration) this.repositoryMap.get( repoId );
+ AbstractRepositoryConfiguration repo = (AbstractRepositoryConfiguration) this.repositoryMap.get( repoId );
return getLayout( repo.getLayout() );
}
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
- if ( ConfigurationNames.isRepositories( propertyName ) )
+ if ( ConfigurationNames.isManagedRepositories( propertyName ) )
{
initRepositoryMap();
}
@@ -120,7 +120,7 @@
synchronized ( this.repositoryMap )
{
this.repositoryMap.clear();
- this.repositoryMap.putAll( configuration.getConfiguration().createRepositoryMap() );
+ this.repositoryMap.putAll( configuration.getConfiguration().getManagedRepositoriesAsMap() );
}
}
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java Wed Sep 12 02:33:41 2007
@@ -19,12 +19,10 @@
* under the License.
*/
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
-import org.apache.maven.archiva.configuration.functors.LocalRepositoryPredicate;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.apache.maven.archiva.repository.ArchivaConfigurationAdaptor;
import org.apache.maven.archiva.repository.RepositoryException;
@@ -40,16 +38,13 @@
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
- * Factory for ProjectModelResolver objects
+ * Factory for ProjectModelResolver objects
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
* @plexus.component role="org.apache.maven.archiva.repository.project.ProjectModelResolverFactory"
*/
public class ProjectModelResolverFactory
@@ -80,7 +75,7 @@
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
- if ( ConfigurationNames.isRepositories( propertyName ) )
+ if ( ConfigurationNames.isManagedRepositories( propertyName ) )
{
update();
}
@@ -106,12 +101,6 @@
private RepositoryProjectResolver toResolver( ArchivaRepository repo )
throws RepositoryException
{
- if ( !repo.isManaged() )
- {
- throw new RepositoryException( "Unable to create RepositoryProjectResolver from non-managed repository: "
- + repo );
- }
-
try
{
BidirectionalRepositoryLayout layout = layoutFactory.getLayout( repo.getLayoutType() );
@@ -127,8 +116,8 @@
}
catch ( LayoutException e )
{
- throw new RepositoryException( "Unable to create RepositoryProjectResolver due to invalid layout spec: "
- + repo );
+ throw new RepositoryException(
+ "Unable to create RepositoryProjectResolver due to invalid layout spec: " + repo );
}
}
@@ -138,15 +127,11 @@
{
this.currentResolverStack.clearResolvers();
- List configLocalRepos = new ArrayList();
- CollectionUtils.select( archivaConfiguration.getConfiguration().getRepositories(), LocalRepositoryPredicate
- .getInstance(), configLocalRepos );
-
- Iterator it = configLocalRepos.iterator();
- while ( it.hasNext() )
+ List<ManagedRepositoryConfiguration> list =
+ archivaConfiguration.getConfiguration().getManagedRepositories();
+ for ( ManagedRepositoryConfiguration repositoryConfiguration : list )
{
- RepositoryConfiguration repoconfig = (RepositoryConfiguration) it.next();
- ArchivaRepository repo = ArchivaConfigurationAdaptor.toArchivaRepository( repoconfig );
+ ArchivaRepository repo = ArchivaConfigurationAdaptor.toArchivaRepository( repositoryConfiguration );
try
{
RepositoryProjectResolver resolver = toResolver( repo );
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/DefaultRepositoryScanner.java Wed Sep 12 02:33:41 2007
@@ -34,11 +34,10 @@
import java.util.List;
/**
- * DefaultRepositoryScanner
+ * DefaultRepositoryScanner
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
* @plexus.component role="org.apache.maven.archiva.repository.scanner.RepositoryScanner"
*/
public class DefaultRepositoryScanner
@@ -75,7 +74,7 @@
throw new IllegalArgumentException( "Unable to operate on a null repository." );
}
- if ( !repository.isManaged() )
+ if ( !"file".equals( repository.getUrl().getProtocol() ) )
{
throw new UnsupportedOperationException( "Only filesystem repositories are supported." );
}
@@ -84,14 +83,14 @@
if ( !repositoryBase.exists() )
{
- throw new UnsupportedOperationException( "Unable to scan a repository, directory "
- + repositoryBase.getAbsolutePath() + " does not exist." );
+ throw new UnsupportedOperationException(
+ "Unable to scan a repository, directory " + repositoryBase.getAbsolutePath() + " does not exist." );
}
if ( !repositoryBase.isDirectory() )
{
- throw new UnsupportedOperationException( "Unable to scan a repository, path "
- + repositoryBase.getAbsolutePath() + " is not a directory." );
+ throw new UnsupportedOperationException(
+ "Unable to scan a repository, path " + repositoryBase.getAbsolutePath() + " is not a directory." );
}
// Setup Includes / Excludes.
@@ -116,8 +115,8 @@
dirWalker.setExcludes( allExcludes );
// Setup the Scan Instance
- RepositoryScannerInstance scannerInstance = new RepositoryScannerInstance( repository, knownContentConsumers,
- invalidContentConsumers, getLogger() );
+ RepositoryScannerInstance scannerInstance =
+ new RepositoryScannerInstance( repository, knownContentConsumers, invalidContentConsumers, getLogger() );
scannerInstance.setOnlyModifiedAfterTimestamp( changesSince );
dirWalker.addDirectoryWalkListener( scannerInstance );
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AbstractBidirectionalRepositoryLayoutTestCase.java Wed Sep 12 02:33:41 2007
@@ -30,12 +30,12 @@
import java.io.File;
/**
- * AbstractBidirectionalRepositoryLayoutTestCase
+ * AbstractBidirectionalRepositoryLayoutTestCase
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
-public class AbstractBidirectionalRepositoryLayoutTestCase
+public abstract class AbstractBidirectionalRepositoryLayoutTestCase
extends PlexusTestCase
{
protected ArchivaRepository repository;
@@ -60,9 +60,7 @@
String repoUri = "file://" + StringUtils.replace( testRepo.getAbsolutePath(), "\\", "/" );
- ArchivaRepository repo = new ArchivaRepository( "testRepo", "Test Repository", repoUri );
-
- return repo;
+ return new ArchivaRepository( "testRepo", "Test Repository", repoUri );
}
protected ArchivaArtifact createArtifact( String groupId, String artifactId, String version, String classifier,
@@ -94,8 +92,8 @@
protected void assertArtifactReference( ArtifactReference actualReference, String groupId, String artifactId,
String version, String classifier, String type )
{
- String expectedId = "ArtifactReference - " + groupId + ":" + artifactId + ":" + version + ":" + classifier
- + ":" + type;
+ String expectedId =
+ "ArtifactReference - " + groupId + ":" + artifactId + ":" + version + ":" + classifier + ":" + type;
assertNotNull( expectedId + " - Should not be null.", actualReference );
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AllTests.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AllTests.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AllTests.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/layout/AllTests.java Wed Sep 12 02:33:41 2007
@@ -23,19 +23,17 @@
import junit.framework.TestSuite;
/**
- * AllTests - Useful for developers using IDEs.
+ * AllTests - Useful for developers using IDEs.
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
public class AllTests
{
-
public static Test suite()
{
TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.repository.layout" );
//$JUnit-BEGIN$
- suite.addTestSuite( AbstractBidirectionalRepositoryLayoutTestCase.class );
suite.addTestSuite( BidirectionalRepositoryLayoutFactoryTest.class );
suite.addTestSuite( LegacyBidirectionalRepositoryLayoutTest.class );
suite.addTestSuite( DefaultBidirectionalRepositoryLayoutTest.class );
Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- 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 (original)
+++ 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 Wed Sep 12 02:33:41 2007
@@ -492,7 +492,6 @@
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
- <!-- TODO! raise to 85/100 -->
<totalLineRate>77</totalLineRate>
<totalBranchRate>95</totalBranchRate>
</check>
Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- 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 (original)
+++ 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 Wed Sep 12 02:33:41 2007
@@ -321,7 +321,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <!-- TODO! add unit tests -->
<configuration>
<instrumentation>
<excludes>
Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- 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 (original)
+++ 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 Wed Sep 12 02:33:41 2007
@@ -74,13 +74,13 @@
</site>
</distributionManagement>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
- </extension>
- </extensions>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-alpha-5</version>
+ </extension>
+ </extensions>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
@@ -431,7 +431,6 @@
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
- <!-- TODO! raise to 85/100 -->
<totalLineRate>77</totalLineRate>
<totalBranchRate>95</totalBranchRate>
</check>
Modified: 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
URL: http://svn.apache.org/viewvc/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?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- 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 (original)
+++ 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 Wed Sep 12 02:33:41 2007
@@ -483,7 +483,6 @@
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<check>
- <!-- TODO! raise to 85/100 -->
<totalLineRate>77</totalLineRate>
<totalBranchRate>95</totalBranchRate>
</check>
Modified: maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java (original)
+++ maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArchivaRepositoryByUrlConstraint.java Wed Sep 12 02:33:41 2007
@@ -1,9 +1,28 @@
package org.apache.maven.archiva.database.constraints;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.archiva.database.Constraint;
/**
- * ArchivaRepositoryByUrlConstraint
+ * ArchivaRepositoryByUrlConstraint
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
Modified: maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatistics.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatistics.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatistics.java (original)
+++ maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/MostRecentRepositoryScanStatistics.java Wed Sep 12 02:33:41 2007
@@ -22,7 +22,7 @@
import org.apache.maven.archiva.model.RepositoryContentStatistics;
/**
- * MostRecentRepositoryScanStatistics
+ * MostRecentRepositoryScanStatistics
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
@@ -34,12 +34,11 @@
public MostRecentRepositoryScanStatistics( String repoId )
{
- sql = "SELECT FROM " + RepositoryContentStatistics.class.getName()
- + " WHERE repositoryId == repoId PARAMETERS String repoId"
- + " ORDER BY whenGathered DESCENDING"
- + " RANGE 1,1";
+ sql = "SELECT FROM " + RepositoryContentStatistics.class.getName() +
+ " WHERE repositoryId == repoId PARAMETERS String repoId" + " ORDER BY whenGathered DESCENDING" +
+ " RANGE 0,1";
- super.params = new Object[] { repoId };
+ super.params = new Object[]{repoId};
}
public Class getResultClass()
Modified: maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java (original)
+++ maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java Wed Sep 12 02:33:41 2007
@@ -23,7 +23,7 @@
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
import org.apache.maven.archiva.configuration.FileTypes;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ArchivaArtifactConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
@@ -48,10 +48,8 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -62,9 +60,8 @@
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
- *
* @plexus.component role="org.apache.maven.archiva.consumers.ArchivaArtifactConsumer"
- * role-hint="validate-artifacts-location"
+ * role-hint="validate-artifacts-location"
*/
public class LocationArtifactsConsumer
extends AbstractMonitoredConsumer
@@ -84,7 +81,7 @@
* @plexus.requirement
*/
private ArchivaConfiguration configuration;
-
+
/**
* @plexus.requirement
*/
@@ -146,11 +143,6 @@
throws ConsumerException
{
ArchivaRepository repository = findRepository( artifact );
- if ( !repository.isManaged() )
- {
- getLogger().warn( "Artifact Location Validation Cannot operate against a non-managed Repository." );
- return;
- }
File artifactFile = new File( repository.getUrl().toString(), toPath( artifact ) );
ArchivaProjectModel fsModel = readFilesystemModel( artifactFile );
@@ -167,23 +159,23 @@
{
if ( !StringUtils.equals( model.getGroupId(), artifact.getGroupId() ) )
{
- addProblem( artifact, "The groupId of the " + location
- + " project model doesn't match with the artifact, expected <" + artifact.getGroupId()
- + ">, but was actually <" + model.getGroupId() + ">" );
+ addProblem( artifact, "The groupId of the " + location +
+ " project model doesn't match with the artifact, expected <" + artifact.getGroupId() +
+ ">, but was actually <" + model.getGroupId() + ">" );
}
-
+
if ( !StringUtils.equals( model.getArtifactId(), artifact.getArtifactId() ) )
{
- addProblem( artifact, "The artifactId of the " + location
- + " project model doesn't match with the artifact, expected <" + artifact.getArtifactId()
- + ">, but was actually <" + model.getArtifactId() + ">" );
+ addProblem( artifact, "The artifactId of the " + location +
+ " project model doesn't match with the artifact, expected <" + artifact.getArtifactId() +
+ ">, but was actually <" + model.getArtifactId() + ">" );
}
-
+
if ( !StringUtils.equals( model.getVersion(), artifact.getVersion() ) )
{
- addProblem( artifact, "The version of the " + location
- + " project model doesn't match with the artifact, expected <" + artifact.getVersion()
- + ">, but was actually <" + model.getVersion() + ">" );
+ addProblem( artifact, "The version of the " + location +
+ " project model doesn't match with the artifact, expected <" + artifact.getVersion() +
+ ">, but was actually <" + model.getVersion() + ">" );
}
}
}
@@ -196,18 +188,18 @@
JarFile jar = new JarFile( artifactFile );
// Get the entry and its input stream.
- JarEntry expectedEntry = jar.getJarEntry( "META-INF/maven/" + artifact.getGroupId() + "/"
- + artifact.getArtifactId() + "/pom.xml" );
+ JarEntry expectedEntry = jar.getJarEntry(
+ "META-INF/maven/" + artifact.getGroupId() + "/" + artifact.getArtifactId() + "/pom.xml" );
if ( expectedEntry != null )
{
// TODO: read and resolve model here.
return null;
}
-
+
/* Expected Entry not found, look for alternate that might
- * indicate that the artifact is, indeed located in the wrong place.
- */
+ * indicate that the artifact is, indeed located in the wrong place.
+ */
List actualPomXmls = findJarEntryPattern( jar, "META-INF/maven/**/pom.xml" );
if ( actualPomXmls.isEmpty() )
@@ -215,7 +207,7 @@
// No check needed.
}
-
+
// TODO: test for invalid actual pom.xml
// TODO: test
}
@@ -276,7 +268,7 @@
File pomFile = createPomFileReference( artifactFile );
// TODO: read and resolve model here.
-
+
return null;
}
@@ -316,7 +308,7 @@
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
- if ( ConfigurationNames.isRepositories( propertyName ) )
+ if ( ConfigurationNames.isManagedRepositories( propertyName ) )
{
initRepositoryMap();
}
@@ -345,14 +337,12 @@
{
this.repositoryMap.clear();
- Iterator it = configuration.getConfiguration().createRepositoryMap().entrySet().iterator();
- while ( it.hasNext() )
+ Map<String, ManagedRepositoryConfiguration> map =
+ configuration.getConfiguration().getManagedRepositoriesAsMap();
+ for ( Map.Entry<String, ManagedRepositoryConfiguration> entry : map.entrySet() )
{
- Map.Entry entry = (Entry) it.next();
- String key = (String) entry.getKey();
- RepositoryConfiguration repoConfig = (RepositoryConfiguration) entry.getValue();
- ArchivaRepository repository = ArchivaConfigurationAdaptor.toArchivaRepository( repoConfig );
- this.repositoryMap.put( key, repository );
+ ArchivaRepository repository = ArchivaConfigurationAdaptor.toArchivaRepository( entry.getValue() );
+ this.repositoryMap.put( entry.getKey(), repository );
}
}
}
Modified: maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java (original)
+++ maven/archiva/trunk/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java Wed Sep 12 02:33:41 2007
@@ -20,9 +20,8 @@
*/
import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.common.utils.PathUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.RepositoryConfiguration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.ArchivaArtifactConsumer;
import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.model.ArchivaArtifact;
@@ -35,7 +34,7 @@
import java.util.List;
/**
- * DuplicateArtifactReportTest
+ * DuplicateArtifactReportTest
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
@@ -62,19 +61,19 @@
ArchivaConfiguration config = (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "default" );
- RepositoryConfiguration repoConfig = new RepositoryConfiguration();
+ ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
repoConfig.setId( TESTABLE_REPO );
repoConfig.setLayout( "default" );
File testRepoDir = new File( getBasedir(), "target/test-repository" );
FileUtils.forceMkdir( testRepoDir );
- repoConfig.setUrl( PathUtil.toUrl( testRepoDir ) );
- config.getConfiguration().addRepository( repoConfig );
+ repoConfig.setLocation( testRepoDir.getAbsolutePath() );
+ config.getConfiguration().addManagedRepository( repoConfig );
}
public ArchivaArtifact createArtifact( String artifactId, String version )
{
- ArchivaArtifact artifact = artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version,
- "", "jar" );
+ ArchivaArtifact artifact =
+ artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version, "", "jar" );
artifact.getModel().setLastModified( new Date() );
artifact.getModel().setRepositoryId( TESTABLE_REPO );
return artifact;
@@ -120,8 +119,8 @@
List allArtifacts = artifactDao.queryArtifacts( null );
assertEquals( "Total Artifact Count", 7, allArtifacts.size() );
- DuplicateArtifactReport report = (DuplicateArtifactReport) lookup( DynamicReportSource.class.getName(),
- "duplicate-artifacts" );
+ DuplicateArtifactReport report =
+ (DuplicateArtifactReport) lookup( DynamicReportSource.class.getName(), "duplicate-artifacts" );
List results = report.getData();
@@ -137,10 +136,9 @@
int hash1Count = 4;
int hash2Count = 2;
int hash3Count = 1;
-
- int totals = ( ( hash1Count * hash1Count ) - hash1Count ) +
- ( ( hash2Count * hash2Count ) - hash2Count ) +
- ( ( hash3Count * hash3Count ) - hash3Count );
+
+ int totals = ( ( hash1Count * hash1Count ) - hash1Count ) + ( ( hash2Count * hash2Count ) - hash2Count ) +
+ ( ( hash3Count * hash3Count ) - hash3Count );
assertEquals( "Total report hits.", totals, results.size() );
}
@@ -148,8 +146,8 @@
throws Exception
{
List artifacts = dao.getArtifactDAO().queryArtifacts( null );
- ArchivaArtifactConsumer consumer = (ArchivaArtifactConsumer) lookup( ArchivaArtifactConsumer.class.getName(),
- "duplicate-artifacts" );
+ ArchivaArtifactConsumer consumer =
+ (ArchivaArtifactConsumer) lookup( ArchivaArtifactConsumer.class.getName(), "duplicate-artifacts" );
consumer.beginScan();
try
{
Modified: maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java?rev=574859&r1=574858&r2=574859&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java (original)
+++ maven/archiva/trunk/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/ArchivaTaskScheduler.java Wed Sep 12 02:33:41 2007
@@ -52,12 +52,7 @@
public void queueRepositoryTask( RepositoryTask task )
throws TaskQueueException;
- public void scheduleAllRepositoryTasks()
- throws TaskExecutionException;
-
public void scheduleDatabaseTasks()
throws TaskExecutionException;
-
- public void scheduleRepositoryTask( String repositoryId )
- throws TaskExecutionException;
+
}