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/23 14:33:43 UTC
svn commit: r568957 - in
/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src:
main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
test/conf/autodetect-v1.xml
Author: brett
Date: Thu Aug 23 05:33:42 2007
New Revision: 568957
URL: http://svn.apache.org/viewvc?rev=568957&view=rev
Log:
[MRM-462] support both types of file URL in old configuration
Modified:
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/test/conf/autodetect-v1.xml
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?rev=568957&r1=568956&r2=568957&view=diff
==============================================================================
--- 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 Thu Aug 23 05:33:42 2007
@@ -129,6 +129,11 @@
r.setLocation( r.getUrl().substring( 7 ) );
config.addManagedRepository( r );
}
+ else if ( r.getUrl().startsWith( "file:" ) )
+ {
+ r.setLocation( r.getUrl().substring( 5 ) );
+ config.addManagedRepository( r );
+ }
else
{
RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
Modified: maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml?rev=568957&r1=568956&r2=568957&view=diff
==============================================================================
--- maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml (original)
+++ maven/archiva/branches/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml Thu Aug 23 05:33:42 2007
@@ -33,7 +33,7 @@
<repository>
<id>snapshots</id>
<name>Archiva Managed Snapshot Repository</name>
- <url>file://${appserver.base}/repositories/internal</url>
+ <url>file:${appserver.base}/repositories/snapshots</url>
<layout>default</layout>
<releases>false</releases>
<snapshots>true</snapshots>