commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test AbstractFileSystemTestCase.java
Date Thu, 22 Aug 2002 02:42:46 GMT
adammurdoch    2002/08/21 19:42:46

  Modified:    vfs/src/java/org/apache/commons/vfs FileObject.java
               vfs/src/java/org/apache/commons/vfs/impl VFSClassLoader.java
               vfs/src/java/org/apache/commons/vfs/provider
                        AbstractFileObject.java AbstractFileSystem.java
                        AbstractFileSystemProvider.java VfsComponent.java
               vfs/src/java/org/apache/commons/vfs/provider/ftp
                        FtpFileSystemProvider.java
               vfs/src/java/org/apache/commons/vfs/provider/jar
                        JarFileSystemProvider.java
                        JarURLConnectionImpl.java
               vfs/src/java/org/apache/commons/vfs/provider/local
                        DefaultLocalFileSystemProvider.java
                        LocalFileSystem.java
               vfs/src/java/org/apache/commons/vfs/provider/smb
                        SmbFileSystem.java SmbFileSystemProvider.java
               vfs/src/java/org/apache/commons/vfs/provider/url
                        UrlFileProvider.java UrlFileSystem.java
               vfs/src/java/org/apache/commons/vfs/provider/zip
                        ZipFileSystem.java ZipFileSystemProvider.java
               vfs/src/test/org/apache/commons/vfs/test
                        AbstractFileSystemTestCase.java
  Added:       vfs/src/java/org/apache/commons/vfs FileSystem.java
  Removed:     vfs/src/java/org/apache/commons/vfs/provider FileSystem.java
  Log:
  - Moved FileSystem from vfs.provider to vfs package.
  - Replaced FileObject.getRoot() and getParentLayer() with getFileSystem().
  
  Revision  Changes    Path
  1.4       +4 -21     jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileObject.java
  
  Index: FileObject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileObject.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileObject.java	21 Aug 2002 13:10:56 -0000	1.3
  +++ FileObject.java	22 Aug 2002 02:42:45 -0000	1.4
  @@ -49,7 +49,7 @@
    * <li>{@link #resolveFile} to find another file relative to this file.
    * <li>{@link #getChildren} to find the children of this file.
    * <li>{@link #getParent} to find the folder containing this file.
  - * <li>{@link #getRoot} to find the root folder of the file system.
  + * <li>{@link #getFileSystem} to find another ifle in the same file system.
    * </ul>
    *
    * <p>To find files in another file system, use a {@link FileSystemManager}.
  @@ -95,19 +95,6 @@
        *      If the file does not exist, or on error determining the file's type.
        */
       FileType getType() throws FileSystemException;
  -    
  -    /**
  -     * Returns the parent layer if this file resides in a layered file
  -     * system.
  -     *
  -     * @return
  -     *      The file object that this file is layered on top. Returns null
  -     *      if this file is not from a layered file system.
  -     *
  -     * @throws FileSystemException
  -     *      In case of errors finding the parent layer.
  -     */
  -    FileObject getParentLayer() throws FileSystemException;
   
       /**
        * Returns the folder that contains this file.
  @@ -122,15 +109,11 @@
       FileObject getParent() throws FileSystemException;
   
       /**
  -     * Returns the root of the file system containing this file.
  -     *
  -     * @return
  -     *      The root of the file system.
  +     * Returns the file system that contains this file.
        *
  -     * @throws FileSystemException
  -     *      On error finding the root of the file system.
  +     * @return The file system.
        */
  -    FileObject getRoot() throws FileSystemException;
  +    FileSystem getFileSystem() throws FileSystemException;
   
       /**
        * Lists the children of this file.
  
  
  
  1.1                  jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/FileSystem.java
  
  Index: FileSystem.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.commons.vfs;
  
  import org.apache.commons.vfs.FileName;
  import org.apache.commons.vfs.FileObject;
  import org.apache.commons.vfs.FileSystemException;
  
  /**
   * A file system.
   *
   * <p>A file system can also implement {@link org.apache.commons.vfs.provider.VfsComponent}.
   *
   * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
   * @version $Revision: 1.1 $ $Date: 2002/08/22 02:42:45 $
   */
  public interface FileSystem
  {
      /**
       * Returns the root file of this file system.
       */
      FileObject getRoot() throws FileSystemException;
  
      /**
       * Returns the parent layerer if this is a layered file system.
       * This returns null if this is not a layered file system.
       */
      FileObject getParentLayer() throws FileSystemException;
  
      /**
       * Gets the value of an attribute of the file system.
       *
       * <p>TODO - change to <code>Map getAttributes()</code> instead?
       *
       * <p>TODO - define the standard attribute names, and define which attrs
       * are guaranteed to be present.
       *
       * @see org.apache.commons.vfs.FileContent#getAttribute
       *
       * @param attrName
       *      The name of the attribute.
       *
       * @return
       *      The value of the attribute.
       *
       * @throws org.apache.commons.vfs.FileSystemException
       *      If the file does not exist, or is being written, or if the
       *      attribute is unknown.
       */
      Object getAttribute( String attrName ) throws FileSystemException;
  
      /**
       * Sets the value of an attribute of the file's content.  Creates the
       * file if it does not exist.
       *
       * @see org.apache.commons.vfs.FileContent#setAttribute
       *
       * @param attrName
       *      The name of the attribute.
       *
       * @param value
       *      The value of the attribute.
       *
       * @throws org.apache.commons.vfs.FileSystemException
       *      If the file is read-only, or is being read, or if the attribute
       *      is not supported, or on error setting the attribute.
       */
      void setAttribute( String attrName, Object value )
          throws FileSystemException;
  
      /**
       * Finds a file in this file system.
       *
       * @param name
       *          The name of the file.
       */
      FileObject findFile( FileName name ) throws FileSystemException;
  
      /**
       * Finds a file in this file system.
       *
       * @param name
       *          The name of the file.  This must be an absolute path.
       */
      FileObject findFile( String name ) throws FileSystemException;
  }
  
  
  
  1.2       +5 -5      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/VFSClassLoader.java
  
  Index: VFSClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/impl/VFSClassLoader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VFSClassLoader.java	21 Aug 2002 13:10:57 -0000	1.1
  +++ VFSClassLoader.java	22 Aug 2002 02:42:45 -0000	1.2
  @@ -184,7 +184,7 @@
        * Reads attributes for the package and defines it.
        */
       private Package definePackage( String name, Resource res, URL url )
  -        throws IOException, FileSystemException
  +        throws FileSystemException
       {
           URL sealBase = null;
           final FileContent content =
  @@ -216,7 +216,7 @@
        * Returns true if the we should seal the package where res resides.
        */
       private boolean isSealed( Resource res )
  -        throws IOException, FileSystemException
  +        throws FileSystemException
       {
           final FileContent content =
               res.getFileObject().getParent().getContent();
  @@ -241,7 +241,7 @@
                   return super.getPermissions( cs );
               }
   
  -            FileObject parentLayer = file.getParentLayer();
  +            FileObject parentLayer = file.getFileSystem().getParentLayer();
               if ( parentLayer == null )
               {
                   return super.getPermissions( cs );
  @@ -253,7 +253,7 @@
   
               for ( FileObject parent = parentLayer;
                     parent != null;
  -                  parent = parent.getParentLayer() )
  +                  parent = parent.getFileSystem().getParentLayer() )
               {
                   cs = new CodeSource( parent.getURL(),
                                        parent.getContent().getCertificates() );
  
  
  
  1.7       +4 -16     jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileObject.java
  
  Index: AbstractFileObject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileObject.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractFileObject.java	22 Aug 2002 01:32:48 -0000	1.6
  +++ AbstractFileObject.java	22 Aug 2002 02:42:45 -0000	1.7
  @@ -29,6 +29,7 @@
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.FileType;
   import org.apache.commons.vfs.NameScope;
  +import org.apache.commons.vfs.FileSystem;
   
   /**
    * A partial file object implementation.
  @@ -64,6 +65,9 @@
           this.fs = fs;
       }
   
  +    /**
  +     * Returns the file system this file belongs to.
  +     */
       public FileSystem getFileSystem()
       {
           return fs;
  @@ -345,22 +349,6 @@
               parent = (AbstractFileObject)fs.findFile( name.getParent() );
           }
           return parent;
  -    }
  -
  -    /**
  -     * Returns the parent layer of the file system containing the file.
  -     */
  -    public FileObject getParentLayer() throws FileSystemException
  -    {
  -        return fs.getParentLayer();
  -    }
  -
  -    /**
  -     * Returns the root of the file system containing the file.
  -     */
  -    public FileObject getRoot() throws FileSystemException
  -    {
  -        return fs.getRoot();
       }
   
       /**
  
  
  
  1.6       +2 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystem.java
  
  Index: AbstractFileSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystem.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractFileSystem.java	21 Aug 2002 14:28:07 -0000	1.5
  +++ AbstractFileSystem.java	22 Aug 2002 02:42:45 -0000	1.6
  @@ -14,9 +14,10 @@
   import org.apache.commons.vfs.FileName;
   import org.apache.commons.vfs.FileObject;
   import org.apache.commons.vfs.FileSystemException;
  +import org.apache.commons.vfs.FileSystem;
   
   /**
  - * A partial {@link FileSystem} implementation.
  + * A partial {@link org.apache.commons.vfs.FileSystem} implementation.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
    * @version $Revision$ $Date$
  
  
  
  1.6       +1 -0      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystemProvider.java
  
  Index: AbstractFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/AbstractFileSystemProvider.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractFileSystemProvider.java	22 Aug 2002 02:24:37 -0000	1.5
  +++ AbstractFileSystemProvider.java	22 Aug 2002 02:42:45 -0000	1.6
  @@ -14,6 +14,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.commons.vfs.FileObject;
   import org.apache.commons.vfs.FileSystemException;
  +import org.apache.commons.vfs.FileSystem;
   
   /**
    * A partial file system provider implementation.
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/VfsComponent.java
  
  Index: VfsComponent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/VfsComponent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VfsComponent.java	21 Aug 2002 14:28:08 -0000	1.1
  +++ VfsComponent.java	22 Aug 2002 02:42:45 -0000	1.2
  @@ -15,7 +15,7 @@
    * This includes all implementations of the following interfaces:
    * <ul>
    * <li>{@link FileProvider}
  - * <li>{@link FileSystem}
  + * <li>{@link org.apache.commons.vfs.FileSystem}
    * <li>{@link FileReplicator}
    * </ul>
    *
  
  
  
  1.4       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/ftp/FtpFileSystemProvider.java
  
  Index: FtpFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/ftp/FtpFileSystemProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FtpFileSystemProvider.java	21 Aug 2002 14:28:08 -0000	1.3
  +++ FtpFileSystemProvider.java	22 Aug 2002 02:42:46 -0000	1.4
  @@ -12,7 +12,7 @@
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystemProvider;
   import org.apache.commons.vfs.provider.DefaultFileName;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.ParsedUri;
   
   /**
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarFileSystemProvider.java
  
  Index: JarFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarFileSystemProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JarFileSystemProvider.java	22 Aug 2002 01:32:49 -0000	1.1
  +++ JarFileSystemProvider.java	22 Aug 2002 02:42:46 -0000	1.2
  @@ -10,7 +10,7 @@
   import org.apache.commons.vfs.FileObject;
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.DefaultFileName;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.ParsedUri;
   import org.apache.commons.vfs.provider.zip.ParsedZipUri;
   import org.apache.commons.vfs.provider.zip.ZipFileSystemProvider;
  
  
  
  1.2       +2 -3      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarURLConnectionImpl.java
  
  Index: JarURLConnectionImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/jar/JarURLConnectionImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JarURLConnectionImpl.java	22 Aug 2002 01:32:49 -0000	1.1
  +++ JarURLConnectionImpl.java	22 Aug 2002 02:42:46 -0000	1.2
  @@ -53,8 +53,7 @@
           this.url = file.getURL();
           this.content = content;
           this.parentURL = file.getURL();
  -        this.entryName =
  -            file.getRoot().getName().getRelativeName( file.getName() );
  +        this.entryName = file.getName().getPath();
           this.file = file;
       }
   
  
  
  
  1.6       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/local/DefaultLocalFileSystemProvider.java
  
  Index: DefaultLocalFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/local/DefaultLocalFileSystemProvider.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultLocalFileSystemProvider.java	21 Aug 2002 14:28:08 -0000	1.5
  +++ DefaultLocalFileSystemProvider.java	22 Aug 2002 02:42:46 -0000	1.6
  @@ -12,7 +12,7 @@
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystemProvider;
   import org.apache.commons.vfs.provider.DefaultFileName;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.LocalFileProvider;
   import org.apache.commons.vfs.provider.ParsedUri;
   import org.apache.commons.vfs.util.Os;
  
  
  
  1.5       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java
  
  Index: LocalFileSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/local/LocalFileSystem.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LocalFileSystem.java	21 Aug 2002 14:28:08 -0000	1.4
  +++ LocalFileSystem.java	22 Aug 2002 02:42:46 -0000	1.5
  @@ -12,7 +12,7 @@
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystem;
   import org.apache.commons.vfs.provider.DefaultFileName;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.FileSystemProviderContext;
   
   /**
  
  
  
  1.5       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java
  
  Index: SmbFileSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/smb/SmbFileSystem.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SmbFileSystem.java	21 Aug 2002 14:28:08 -0000	1.4
  +++ SmbFileSystem.java	22 Aug 2002 02:42:46 -0000	1.5
  @@ -11,7 +11,7 @@
   import org.apache.commons.vfs.FileObject;
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystem;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.FileSystemProviderContext;
   
   /**
  
  
  
  1.4       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/smb/SmbFileSystemProvider.java
  
  Index: SmbFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/smb/SmbFileSystemProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SmbFileSystemProvider.java	21 Aug 2002 14:28:08 -0000	1.3
  +++ SmbFileSystemProvider.java	22 Aug 2002 02:42:46 -0000	1.4
  @@ -13,7 +13,7 @@
   import org.apache.commons.vfs.provider.AbstractFileSystemProvider;
   import org.apache.commons.vfs.provider.DefaultFileName;
   import org.apache.commons.vfs.provider.FileProvider;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.ParsedUri;
   
   /**
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/url/UrlFileProvider.java
  
  Index: UrlFileProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/url/UrlFileProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UrlFileProvider.java	21 Aug 2002 14:28:08 -0000	1.2
  +++ UrlFileProvider.java	22 Aug 2002 02:42:46 -0000	1.3
  @@ -11,7 +11,7 @@
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystemProvider;
   import org.apache.commons.vfs.provider.DefaultFileName;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.ParsedUri;
   import org.apache.commons.vfs.provider.UriParser;
   
  
  
  
  1.6       +2 -2      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java
  
  Index: UrlFileSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/url/UrlFileSystem.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- UrlFileSystem.java	21 Aug 2002 14:28:08 -0000	1.5
  +++ UrlFileSystem.java	22 Aug 2002 02:42:46 -0000	1.6
  @@ -13,7 +13,7 @@
   import org.apache.commons.vfs.FileObject;
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystem;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   
   /**
    * A File system backed by Java's URL API.
  
  
  
  1.8       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java
  
  Index: ZipFileSystem.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/zip/ZipFileSystem.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ZipFileSystem.java	22 Aug 2002 01:32:49 -0000	1.7
  +++ ZipFileSystem.java	22 Aug 2002 02:42:46 -0000	1.8
  @@ -20,7 +20,7 @@
   import org.apache.commons.vfs.FileSystemException;
   import org.apache.commons.vfs.provider.AbstractFileSystem;
   import org.apache.commons.vfs.provider.DefaultFileName;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   
   /**
    * A read-only file system for Zip/Jar files.
  
  
  
  1.7       +1 -1      jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/zip/ZipFileSystemProvider.java
  
  Index: ZipFileSystemProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/provider/zip/ZipFileSystemProvider.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ZipFileSystemProvider.java	22 Aug 2002 01:32:49 -0000	1.6
  +++ ZipFileSystemProvider.java	22 Aug 2002 02:42:46 -0000	1.7
  @@ -15,7 +15,7 @@
   import org.apache.commons.vfs.provider.AbstractFileSystemProvider;
   import org.apache.commons.vfs.provider.DefaultFileName;
   import org.apache.commons.vfs.provider.FileProvider;
  -import org.apache.commons.vfs.provider.FileSystem;
  +import org.apache.commons.vfs.FileSystem;
   import org.apache.commons.vfs.provider.ParsedUri;
   
   /**
  
  
  
  1.9       +4 -4      jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/AbstractFileSystemTestCase.java
  
  Index: AbstractFileSystemTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/test/org/apache/commons/vfs/test/AbstractFileSystemTestCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractFileSystemTestCase.java	22 Aug 2002 01:32:49 -0000	1.8
  +++ AbstractFileSystemTestCase.java	22 Aug 2002 02:42:46 -0000	1.9
  @@ -245,7 +245,7 @@
       public void testRootFileName() throws Exception
       {
           // Locate the root file
  -        final FileName rootName = m_baseFolder.getRoot().getName();
  +        final FileName rootName = m_baseFolder.getFileSystem().getRoot().getName();
   
           // Test that the root path is "/"
           assertEquals( "root path", "/", rootName.getPath() );
  @@ -455,7 +455,7 @@
           checkAbsoluteNames( name );
   
           // Test against the root
  -        name = m_baseFolder.getRoot().getName();
  +        name = m_baseFolder.getFileSystem().getRoot().getName();
           checkAbsoluteNames( name );
   
           // Test against some unknown file
  @@ -704,7 +704,7 @@
           assertSame( folder, child.getParent() );
   
           // Test root of the file system has no parent
  -        FileObject root = m_baseFolder.getRoot();
  +        FileObject root = m_baseFolder.getFileSystem().getRoot();
           assertNull( "root has null parent", root.getParent() );
       }
   
  @@ -801,7 +801,7 @@
           assertEquals( m_baseFolder.getURL(), parentURL );
   
           URL rootURL = new URL( url, "/" );
  -        assertEquals( file.getRoot().getURL(), rootURL );
  +        assertEquals( file.getFileSystem().getRoot().getURL(), rootURL );
       }
   
       /**
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message