[MRM-462] support both types of file URL in old configuration

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@568957 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index 345a1dfead391500ad384dd6b2a38cca73ce8a3c..2eed899b602c084b9161455c84f9c69c73a889a0 100644 (file)
--- a/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/MRM-462/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -129,6 +129,11 @@ public class DefaultArchivaConfiguration
                     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();

diff --git a/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml b/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml
index 5f35f5d3761ec4146ab1f4a05dea64d90d4fc023..43097220873144cc5edea1d1f478ea8923f42a33 100644 (file)
--- a/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml
+++ b/MRM-462/archiva-base/archiva-configuration/src/test/conf/autodetect-v1.xml
@@ -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>