Author: epunzalan
Date: Tue Feb 7 19:30:58 2006
New Revision: 375838
URL: http://svn.apache.org/viewcvs?rev=375838&view=rev
Log:
PR: MRM-43
Removed URL format requirement on cache path
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java?rev=375838&r1=375837&r2=375838&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
Tue Feb 7 19:30:58 2006
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.io.File;
/**
* Class to represent the configuration file for the proxy
@@ -70,9 +71,9 @@
/**
* Used to set the location where the proxy should cache the configured
repositories
*
- * @param repoCacheURL
+ * @param path
*/
- public void setRepositoryCachePath( String repoCacheURL )
+ public void setRepositoryCachePath( String path )
{
ArtifactRepositoryPolicy standardPolicy;
standardPolicy = new ArtifactRepositoryPolicy( true,
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
@@ -80,7 +81,8 @@
ArtifactRepositoryLayout layout = new DefaultRepositoryLayout();
- repoCache = artifactRepositoryFactory.createArtifactRepository(
"localCache", repoCacheURL, layout,
+ repoCache = artifactRepositoryFactory.createArtifactRepository(
"localCache", "file://" +
+ new
File( path ).getAbsolutePath(), layout,
standardPolicy, standardPolicy );
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java?rev=375838&r1=375837&r2=375838&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
Tue Feb 7 19:30:58 2006
@@ -50,7 +50,7 @@
public void testRepositoryCache()
{
File cacheFile = new File( "target/proxy-cache" );
- config.setRepositoryCachePath( "file://" + cacheFile.getAbsolutePath()
);
+ config.setRepositoryCachePath( cacheFile.getAbsolutePath() );
ArtifactRepository cache = config.getRepositoryCache();
assertEquals( cacheFile.getAbsolutePath(), cache.getBasedir() );
assertEquals( config.getRepositoryCachePath(), cache.getBasedir() );