Move DefaultFileSystemManager to impl package, to get rid of circular package dependency.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271094 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileSystemManager.java → proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.aut.vfs.provider;
+package org.apache.aut.vfs.impl;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -15,6 +15,10 @@ import org.apache.aut.vfs.FileObject;
 import org.apache.aut.vfs.FileSystemException;
 import org.apache.aut.vfs.FileSystemManager;
 import org.apache.aut.vfs.provider.local.LocalFileSystemProvider;
+import org.apache.aut.vfs.provider.FileSystemProvider;
+import org.apache.aut.vfs.provider.UriParser;
+import org.apache.aut.vfs.provider.FileSystemProviderContext;
+import org.apache.aut.vfs.provider.FileSystem;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 
@@ -190,13 +194,13 @@ public class DefaultFileSystemManager implements FileSystemManager
         public FileSystem getFileSystem( String rootURI )
         {
             // TODO - need to have a per-fs uri comparator
-            return (org.apache.aut.vfs.provider.FileSystem)m_fileSystems.get( rootURI );
+            return (FileSystem)m_fileSystems.get( rootURI );
         }
 
         /**
          * Registers a file system for caching.
          */
-        public void putFileSystem( String rootURI, org.apache.aut.vfs.provider.FileSystem fs ) throws FileSystemException
+        public void putFileSystem( String rootURI, FileSystem fs ) throws FileSystemException
         {
             // TODO - should really check that there's not one already cached
             m_fileSystems.put( rootURI, fs );

proposal/myrmidon/src/java/org/apache/aut/vfs/impl/Resources.properties

@@ -0,0 +1,3 @@
+# DefaultFileSystemManager
+unknown-scheme.error=Unknown scheme "{0}" in URI "{0}".
+find-rel-file.error=Could not find file with URI "{0}" because it is a relative path, and no base URI was provided.

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/Resources.properties

@@ -31,10 +31,6 @@ close-outstr.error=Could not close file output stream.
 # AbstractFileSystemProvider
 invalid-absolute-uri.error=Invalid absolute URI "{0}".
 
-# DefaultFileSystemManager
-unknown-scheme.error=Unknown scheme "{0}" in URI "{0}".
-find-rel-file.error=Could not find file with URI "{0}" because it is a relative path, and no base URI was provided.
-
 # UriParser
 missing-double-slashes.error=Expecting // to follow the scheme in URI "{0}".
 missing-hostname.error=Hostname missing from URI "{0}".

proposal/myrmidon/src/test/org/apache/aut/vfs/BasicFileSystemTestBase.java

@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import junit.framework.TestCase;
-import org.apache.aut.vfs.provider.DefaultFileSystemManager;
+import org.apache.aut.vfs.impl.DefaultFileSystemManager;
 
 /**
  * File system test cases, which verifies the structure and naming

proposal/myrmidon/src/testcases/org/apache/aut/vfs/BasicFileSystemTestBase.java

@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import junit.framework.TestCase;
-import org.apache.aut.vfs.provider.DefaultFileSystemManager;
+import org.apache.aut.vfs.impl.DefaultFileSystemManager;
 
 /**
  * File system test cases, which verifies the structure and naming