You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2006/02/16 04:01:23 UTC
svn commit: r378149 - in
/maven/repository-manager/trunk/maven-repository-proxy/src/test: conf/
java/org/apache/maven/repository/proxy/
java/org/apache/maven/repository/proxy/configuration/
Author: epunzalan
Date: Wed Feb 15 19:01:23 2006
New Revision: 378149
URL: http://svn.apache.org/viewcvs?rev=378149&view=rev
Log:
Fixed error when proxy is built from parent
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/test/conf/maven-proxy-complete.conf
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.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/test/conf/maven-proxy-complete.conf
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/test/conf/maven-proxy-complete.conf?rev=378149&r1=378148&r2=378149&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/src/test/conf/maven-proxy-complete.conf (original)
+++ maven/repository-manager/trunk/maven-repository-proxy/src/test/conf/maven-proxy-complete.conf Wed Feb 15 19:01:23 2006
@@ -108,7 +108,7 @@
#local-store
# The local store represents a location that local jars you host can be located.
# This could also be achieved by having a local http repository, but this is less cumbersome
-repo.local-repo.url=file:///./src/test/remote-repo1
+repo.local-repo.url=file:///./target/remote-repo1
repo.local-repo.description=Super Secret Custom Repository
#If copy is true, jars are copied from the store to the proxy-repo. Only configurable for file:/// repos
repo.local-repo.copy=false
Modified: maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java?rev=378149&r1=378148&r2=378149&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java (original)
+++ maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/DefaultProxyManagerTest.java Wed Feb 15 19:01:23 2006
@@ -139,7 +139,7 @@
ArtifactRepositoryLayout defLayout = new DefaultRepositoryLayout();
- File repo1File = new File( "src/test/remote-repo1" );
+ File repo1File = getTestFile( "src/test/remote-repo1" );
ProxyRepository repo1 = new ProxyRepository( "test-repo", "file://" + repo1File.getAbsolutePath(), defLayout );
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=378149&r1=378148&r2=378149&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 Wed Feb 15 19:01:23 2006
@@ -22,6 +22,7 @@
import org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout;
import org.apache.maven.repository.proxy.repository.ProxyRepository;
import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -97,34 +98,45 @@
public void testLoadValidMavenProxyConfiguration()
throws ValidationException, IOException
{
- File confFile = new File( "src/test/conf/maven-proxy-complete.conf" );
+ //must create the test directory bec configuration is using relative path which varies
+ FileUtils.mkdir( "target/remote-repo1" );
- config.loadMavenProxyConfiguration( confFile );
+ try
+ {
+ File confFile = getTestFile( "src/test/conf/maven-proxy-complete.conf" );
- assertTrue( config.getRepositoryCachePath().endsWith( "target" ) );
+ config.loadMavenProxyConfiguration( confFile );
- assertEquals( "Count repositories", 4, config.getRepositories().size() );
+ assertTrue( config.getRepositoryCachePath().endsWith( "target" ) );
- for ( Iterator repos = config.getRepositories().iterator(); repos.hasNext(); )
- {
- ProxyRepository repo = (ProxyRepository) repos.next();
+ assertEquals( "Count repositories", 4, config.getRepositories().size() );
- if ( "local-repo".equals( repo.getKey() ) )
- {
- assertEquals( "file:///./src/test/remote-repo1", repo.getUrl() );
- }
- else if ( "www-ibiblio-org".equals( repo.getKey() ) )
- {
- assertEquals( "http://www.ibiblio.org/maven2", repo.getUrl() );
- }
- else if ( "dist-codehaus-org".equals( repo.getKey() ) )
- {
- assertEquals( "http://dist.codehaus.org", repo.getUrl() );
- }
- else if ( "private-example-com".equals( repo.getKey() ) )
+ for ( Iterator repos = config.getRepositories().iterator(); repos.hasNext(); )
{
- assertEquals( "http://private.example.com/internal", repo.getUrl() );
+ ProxyRepository repo = (ProxyRepository) repos.next();
+
+ if ( "local-repo".equals( repo.getKey() ) )
+ {
+ assertEquals( "file:///./target/remote-repo1", repo.getUrl() );
+ }
+ else if ( "www-ibiblio-org".equals( repo.getKey() ) )
+ {
+ assertEquals( "http://www.ibiblio.org/maven2", repo.getUrl() );
+ }
+ else if ( "dist-codehaus-org".equals( repo.getKey() ) )
+ {
+ assertEquals( "http://dist.codehaus.org", repo.getUrl() );
+ }
+ else if ( "private-example-com".equals( repo.getKey() ) )
+ {
+ assertEquals( "http://private.example.com/internal", repo.getUrl() );
+ }
}
+ }
+ //make sure to delete the test directory after tests
+ finally
+ {
+ FileUtils.deleteDirectory( "target/remote-repo1" );
}
}