Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileContentInfoFactory.java Sat Nov 13 05:50:50 2010 @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.mime; +package org.apache.commons.vfs2.provider.mime; -import org.apache.commons.vfs.FileContent; -import org.apache.commons.vfs.FileContentInfo; -import org.apache.commons.vfs.FileContentInfoFactory; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.impl.DefaultFileContentInfo; +import org.apache.commons.vfs2.FileContent; +import org.apache.commons.vfs2.FileContentInfo; +import org.apache.commons.vfs2.FileContentInfoFactory; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.impl.DefaultFileContentInfo; import javax.mail.MessagingException; import javax.mail.Part;
Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileObject.java Sat Nov 13 05:50:50 2010 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.mime; +package org.apache.commons.vfs2.provider.mime; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -31,16 +31,16 @@ import javax.mail.Multipart; import javax.mail.Part; import javax.mail.internet.MimeMultipart; -import org.apache.commons.vfs.FileContentInfoFactory; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileType; -import org.apache.commons.vfs.NameScope; -import org.apache.commons.vfs.provider.AbstractFileObject; -import org.apache.commons.vfs.provider.AbstractFileSystem; -import org.apache.commons.vfs.provider.UriParser; -import org.apache.commons.vfs.util.FileObjectUtils; +import org.apache.commons.vfs2.FileContentInfoFactory; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.NameScope; +import org.apache.commons.vfs2.provider.AbstractFileObject; +import org.apache.commons.vfs2.provider.AbstractFileSystem; +import org.apache.commons.vfs2.provider.UriParser; +import org.apache.commons.vfs2.util.FileObjectUtils; /** * A part of a MIME message. @@ -151,7 +151,7 @@ public class MimeFileObject /** * Lists the children of the file. Is only called if {...@link #doGetType} - * returns {...@link org.apache.commons.vfs.FileType#FOLDER}. + * returns {...@link org.apache.commons.vfs2.FileType#FOLDER}. */ @Override protected FileObject[] doListChildrenResolved() throws Exception @@ -310,4 +310,4 @@ public class MimeFileObject { return part.getAllHeaders(); } -} \ No newline at end of file +} Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileProvider.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileProvider.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileProvider.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileProvider.java Sat Nov 13 05:50:50 2010 @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.mime; +package org.apache.commons.vfs2.provider.mime; -import org.apache.commons.vfs.Capability; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystem; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemOptions; -import org.apache.commons.vfs.FileType; -import org.apache.commons.vfs.provider.AbstractLayeredFileProvider; -import org.apache.commons.vfs.provider.FileProvider; -import org.apache.commons.vfs.provider.LayeredFileName; +import org.apache.commons.vfs2.Capability; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystem; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemOptions; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.provider.AbstractLayeredFileProvider; +import org.apache.commons.vfs2.provider.FileProvider; +import org.apache.commons.vfs2.provider.LayeredFileName; import java.util.Arrays; import java.util.Collection; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/mime/MimeFileSystem.java Sat Nov 13 05:50:50 2010 @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.mime; +package org.apache.commons.vfs2.provider.mime; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.vfs.Capability; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystem; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemOptions; -import org.apache.commons.vfs.provider.AbstractFileSystem; -import org.apache.commons.vfs.util.SharedRandomContentInputStream; +import org.apache.commons.vfs2.Capability; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystem; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemOptions; +import org.apache.commons.vfs2.provider.AbstractFileSystem; +import org.apache.commons.vfs2.util.SharedRandomContentInputStream; import javax.mail.MessagingException; import javax.mail.Part; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileName.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileName.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileName.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileName.java Sat Nov 13 05:50:50 2010 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb; +package org.apache.commons.vfs2.provider.smb; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileType; -import org.apache.commons.vfs.provider.GenericFileName; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.provider.GenericFileName; /** * An SMB URI. Adds a share name to the generic URI. Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileNameParser.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileNameParser.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileNameParser.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileNameParser.java Sat Nov 13 05:50:50 2010 @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb; +package org.apache.commons.vfs2.provider.smb; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileType; -import org.apache.commons.vfs.provider.FileNameParser; -import org.apache.commons.vfs.provider.URLFileNameParser; -import org.apache.commons.vfs.provider.UriParser; -import org.apache.commons.vfs.provider.VfsComponentContext; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileType; +import org.apache.commons.vfs2.provider.FileNameParser; +import org.apache.commons.vfs2.provider.URLFileNameParser; +import org.apache.commons.vfs2.provider.UriParser; +import org.apache.commons.vfs2.provider.VfsComponentContext; /** * Implementation for sftp. set default port to 139 Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileObject.java Sat Nov 13 05:50:50 2010 @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb; +package org.apache.commons.vfs2.provider.smb; import jcifs.smb.NtlmPasswordAuthentication; import jcifs.smb.SmbException; import jcifs.smb.SmbFile; import jcifs.smb.SmbFileInputStream; import jcifs.smb.SmbFileOutputStream; -import org.apache.commons.vfs.*; -import org.apache.commons.vfs.provider.AbstractFileObject; -import org.apache.commons.vfs.provider.UriParser; -import org.apache.commons.vfs.util.RandomAccessMode; -import org.apache.commons.vfs.util.UserAuthenticatorUtils; +import org.apache.commons.vfs2.*; +import org.apache.commons.vfs2.provider.AbstractFileObject; +import org.apache.commons.vfs2.provider.UriParser; +import org.apache.commons.vfs2.util.RandomAccessMode; +import org.apache.commons.vfs2.util.UserAuthenticatorUtils; import java.io.InputStream; import java.io.OutputStream; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileProvider.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileProvider.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileProvider.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileProvider.java Sat Nov 13 05:50:50 2010 @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb; +package org.apache.commons.vfs2.provider.smb; -import org.apache.commons.vfs.Capability; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileSystem; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemOptions; -import org.apache.commons.vfs.UserAuthenticationData; -import org.apache.commons.vfs.provider.AbstractOriginatingFileProvider; -import org.apache.commons.vfs.provider.FileProvider; +import org.apache.commons.vfs2.Capability; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileSystem; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemOptions; +import org.apache.commons.vfs2.UserAuthenticationData; +import org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider; +import org.apache.commons.vfs2.provider.FileProvider; import java.util.Arrays; import java.util.Collection; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileRandomAccessContent.java Sat Nov 13 05:50:50 2010 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb; +package org.apache.commons.vfs2.provider.smb; import jcifs.smb.SmbException; import jcifs.smb.SmbFile; import jcifs.smb.SmbRandomAccessFile; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.provider.AbstractRandomAccessContent; -import org.apache.commons.vfs.util.RandomAccessMode; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.provider.AbstractRandomAccessContent; +import org.apache.commons.vfs2.util.RandomAccessMode; import java.io.IOException; import java.io.InputStream; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileSystem.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileSystem.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileSystem.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/SmbFileSystem.java Sat Nov 13 05:50:50 2010 @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb; +package org.apache.commons.vfs2.provider.smb; -import org.apache.commons.vfs.Capability; -import org.apache.commons.vfs.FileName; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystem; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemOptions; -import org.apache.commons.vfs.provider.AbstractFileSystem; +import org.apache.commons.vfs2.Capability; +import org.apache.commons.vfs2.FileName; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystem; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemOptions; +import org.apache.commons.vfs2.provider.AbstractFileSystem; import java.util.Collection; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/package.html URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/package.html?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/package.html (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/provider/smb/package.html Sat Nov 13 05:50:50 2010 @@ -16,4 +16,4 @@ --> <body> <p>The SMB/CIFS File Provider.</p> -</body> \ No newline at end of file +</body> Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/FileObjectDataSource.java Sat Nov 13 05:50:50 2010 @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.util; +package org.apache.commons.vfs2.util; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; import javax.activation.DataSource; import java.io.InputStream; Modified: commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java (original) +++ commons/proper/vfs/trunk/sandbox/src/main/java/org/apache/commons/vfs2/util/SharedRandomContentInputStream.java Sat Nov 13 05:50:50 2010 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.util; +package org.apache.commons.vfs2.util; -import org.apache.commons.vfs.Capability; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.RandomAccessContent; +import org.apache.commons.vfs2.Capability; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.RandomAccessContent; import javax.mail.internet.SharedInputStream; import java.io.BufferedInputStream; @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.Set; /** - * A wrapper to an FileObject to get a {...@link javax.mail.internet.SharedInputStream} + * A wrapper to an FileObject to get a {...@link javax.mail.internet.SharedInputStream} * * @author <a href="mailto:ima...@apache.org">ima...@apache.org</a> * @version $Revision$ $Date$ @@ -52,7 +52,7 @@ public class SharedRandomContentInputStr { throw new FileSystemException("vfs.util/missing-capability.error", Capability.RANDOM_ACCESS_READ); } - + this.fo = fo; this.fileStart = fileStart; this.fileEnd = fileEnd; Modified: commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml (original) +++ commons/proper/vfs/trunk/sandbox/src/main/resources/META-INF/vfs-providers.xml Sat Nov 13 05:50:50 2010 @@ -1,11 +1,11 @@ <providers> - <provider class-name="org.apache.commons.vfs.provider.smb.SmbFileProvider"> + <provider class-name="org.apache.commons.vfs2.provider.smb.SmbFileProvider"> <scheme name="smb"/> <if-available class-name="jcifs.smb.SmbFile"/> </provider> - - <provider class-name="org.apache.commons.vfs.provider.mime.MimeFileProvider"> + + <provider class-name="org.apache.commons.vfs2.provider.mime.MimeFileProvider"> <scheme name="mime"/> <if-available class-name="javax.mail.internet.MimeMultipart"/> </provider> Modified: commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java (original) +++ commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/FileNameTestCase.java Sat Nov 13 05:50:50 2010 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb.test; +package org.apache.commons.vfs2.provider.smb.test; import org.apache.commons.AbstractVfsTestCase; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.provider.smb.SmbFileName; -import org.apache.commons.vfs.provider.smb.SmbFileNameParser; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.provider.smb.SmbFileName; +import org.apache.commons.vfs2.provider.smb.SmbFileNameParser; /** * Some additional SMB file name test cases. Modified: commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java?rev=1034665&r1=1034656&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java (original) +++ commons/proper/vfs/trunk/sandbox/src/test/java/org/apache/commons/vfs2/provider/smb/test/SmbProviderTestCase.java Sat Nov 13 05:50:50 2010 @@ -5,25 +5,25 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.vfs.provider.smb.test; +package org.apache.commons.vfs2.provider.smb.test; import junit.framework.Test; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemManager; -import org.apache.commons.vfs.impl.DefaultFileSystemManager; -import org.apache.commons.vfs.provider.smb.SmbFileProvider; -import org.apache.commons.vfs.test.AbstractProviderTestConfig; -import org.apache.commons.vfs.test.ProviderTestConfig; -import org.apache.commons.vfs.test.ProviderTestSuite; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemManager; +import org.apache.commons.vfs2.impl.DefaultFileSystemManager; +import org.apache.commons.vfs2.provider.smb.SmbFileProvider; +import org.apache.commons.vfs2.test.AbstractProviderTestConfig; +import org.apache.commons.vfs2.test.ProviderTestConfig; +import org.apache.commons.vfs2.test.ProviderTestSuite; /** * Tests for the SMB file system. Modified: commons/proper/vfs/trunk/src/site/resources/images/vfs-logo-white.png URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/resources/images/vfs-logo-white.png?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== Binary files - no diff available. Modified: commons/proper/vfs/trunk/src/site/resources/images/vfs-logo-white.xcf URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/resources/images/vfs-logo-white.xcf?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== Binary files - no diff available. Modified: commons/proper/vfs/trunk/src/site/xdoc/anttasks.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/anttasks.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/site/xdoc/anttasks.xml (original) +++ commons/proper/vfs/trunk/src/site/xdoc/anttasks.xml Sat Nov 13 05:50:50 2010 @@ -86,7 +86,7 @@ </p> <source><![CDATA[ -<taskdef resource="org/apache/commons/vfs/tasks/tasks.properties"/> +<taskdef resource="org/apache/commons/vfs2/tasks/tasks.properties"/> ]]></source> <p> @@ -95,7 +95,7 @@ </p> <source><![CDATA[ -<taskdef resource="org/apache/commons/vfs/tasks/tasks.properties"> +<taskdef resource="org/apache/commons/vfs2/tasks/tasks.properties"> <classpath> ... </classpath> </taskdef> ]]></source> @@ -109,7 +109,7 @@ </p> <source><![CDATA[ -<project ... xmlns:vfs="antlib:org.apache.commons.vfs.tasks"> +<project ... xmlns:vfs="antlib:org.apache.commons.vfs2.tasks"> <target name="dosomething"> <vfs:copy .../> </target> @@ -289,4 +289,4 @@ </section> </body> -</document> \ No newline at end of file +</document> Modified: commons/proper/vfs/trunk/src/site/xdoc/api.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/api.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/site/xdoc/api.xml (original) +++ commons/proper/vfs/trunk/src/site/xdoc/api.xml Sat Nov 13 05:50:50 2010 @@ -24,7 +24,7 @@ <section name="Using The API"> <p> The - <a href="apidocs/org/apache/commons/vfs/FileSystemManager.html">FileSystemManager</a> + <a href="apidocs/org/apache/commons/vfs2/FileSystemManager.html">FileSystemManager</a> interface provides access to Commons VFS. Using this interface you can locate files and create file systems. There are a @@ -32,7 +32,7 @@ to obtain a <code>FileSystemManager</code> instance. The simplest is to use the static - <a href="apidocs/org/apache/commons/vfs/VFS.html#getManager()">VFS.getManager()</a> + <a href="apidocs/org/apache/commons/vfs2/VFS.html#getManager()">VFS.getManager()</a> method, which returns the default Commons VFS implementation. </p> @@ -50,7 +50,7 @@ FileObject jarFile = fsManager.resolveFi <p> Each file is represented by a - <a href="apidocs/org/apache/commons/vfs/FileObject.html">FileObject</a> + <a href="apidocs/org/apache/commons/vfs2/FileObject.html">FileObject</a> instance. Using this interface you can create or delete the file, list its children, read or write its content, and so on. For example: @@ -73,7 +73,7 @@ for ( int i = 0; i < children.length; i+ <p> In some cases you might want to explicitely free resources allocated by the filesystem. You can do this by calling - <a href="apidocs/org/apache/commons/vfs/FileSystemManager.html#closeFileSystem">VFS.getManager().closeFileSystem(fs)</a>. + <a href="apidocs/org/apache/commons/vfs2/FileSystemManager.html#closeFileSystem">VFS.getManager().closeFileSystem(fs)</a>. If you use VFS as singleton (as described above) you should take care that this will close the filesystem for all threads.<br /> In other words, do not close any globally used filesystem like the one for local files. @@ -81,13 +81,13 @@ for ( int i = 0; i < children.length; i+ <p> See the - <a href="apidocs/org/apache/commons/vfs/FileObject.html">FileObject</a> + <a href="apidocs/org/apache/commons/vfs2/FileObject.html">FileObject</a> Javadocs for more detail. </p> <subsection name="Cache"> <p> - Commons VFS uses a <a href="apidocs/org/apache/commons/vfs/cache/SoftRefFilesCache.html">SoftRefFilesCache</a> to release memory if a file is no longer used by the application. + Commons VFS uses a <a href="apidocs/org/apache/commons/vfs2/cache/SoftRefFilesCache.html">SoftRefFilesCache</a> to release memory if a file is no longer used by the application. </p> <p> This cache will return the same instance for a file as long as it is "strongly reachable" e.g. you @@ -96,7 +96,7 @@ for ( int i = 0; i < children.length; i+ </p> <p> There is also a internal cache of each file object avoid the need to access the network layer. Now its possible - to configure this behviour through the use of <a href="apidocs/org/apache/commons/vfs/CacheStrategy.html">CacheStrategy</a>. + to configure this behviour through the use of <a href="apidocs/org/apache/commons/vfs2/CacheStrategy.html">CacheStrategy</a>. <br /> Do this on the DefaultFileSystemManager. For example: <code> @@ -112,7 +112,7 @@ for ( int i = 0; i < children.length; i+ </p> <p> To solve you can use the - <a href="apidocs/org/apache/commons/vfs/UserAuthenticator.html">UserAuthenticator</a> + <a href="apidocs/org/apache/commons/vfs2/UserAuthenticator.html">UserAuthenticator</a> </p> <p> For example: @@ -143,7 +143,7 @@ for ( int i = 0; i < children.length; i+ <p> For an example of using the API, take a look at the classes in the - <a href="apidocs/org/apache/commons/vfs/example/package-summary.html">example</a> + <a href="apidocs/org/apache/commons/vfs2/example/package-summary.html">example</a> package. </p> </subsection> @@ -153,13 +153,13 @@ for ( int i = 0; i < children.length; i+ <section name="Configuring Commons VFS"> <p> Commons VFS is represented using the - <a href="apidocs/org/apache/commons/vfs/FileSystemManager.html">FileSystemManager</a> + <a href="apidocs/org/apache/commons/vfs2/FileSystemManager.html">FileSystemManager</a> interface. There are a number of ways to create and configure a <code>FileSystemManager</code> instance. </p> <p> The simplest method is to use the static - <a href="apidocs/org/apache/commons/vfs/VFS.html#getManager()">VFS.getManager()</a> + <a href="apidocs/org/apache/commons/vfs2/VFS.html#getManager()">VFS.getManager()</a> method, which returns the default Commons VFS implementation. </p> <p> @@ -175,7 +175,7 @@ for ( int i = 0; i < children.length; i+ <p> To configure Commons VFS programatically, you can create an instance of - <a href="apidocs/org/apache/commons/vfs/impl/DefaultFileSystemManager.html">DefaultFileSystemManager</a> + <a href="apidocs/org/apache/commons/vfs2/impl/DefaultFileSystemManager.html">DefaultFileSystemManager</a> and configure it manually. The default constructor <code>DefaultFileSystemManager</code> creates a manager that is completely empty. You will have to add file providers to it @@ -202,7 +202,7 @@ for ( int i = 0; i < children.length; i+ Set the default provider, using <code>setDefaultProvider()</code>. This step is optional. See - <a href="apidocs/org/apache/commons/vfs/provider/url/UrlFileProvider.html">UrlFileProvider</a> + <a href="apidocs/org/apache/commons/vfs2/provider/url/UrlFileProvider.html">UrlFileProvider</a> for a useful default provider. </li> <li> @@ -235,7 +235,7 @@ for ( int i = 0; i < children.length; i+ <p> The third method for configuring Commons VFS, is to configure it from a file. Create an instance of - <a href="apidocs/org/apache/commons/vfs/impl/StandardFileSystemManager.html">StandardFileSystemManager</a>, + <a href="apidocs/org/apache/commons/vfs2/impl/StandardFileSystemManager.html">StandardFileSystemManager</a>, and use its <code>setConfiguration()</code> method to set the location of the configuration file to use. The configuration @@ -361,19 +361,19 @@ for ( int i = 0; i < children.length; i+ </p> <source><![CDATA[ <providers> - <provider class-name="org.apache.commons.vfs.provider.zip.ZipFileProvider"> + <provider class-name="org.apache.commons.vfs2.provider.zip.ZipFileProvider"> <scheme name="zip"/> </provider> <extension-map extension="zip" scheme="zip"/> <mime-type-map mime-type="application/zip" scheme="zip"/> - <provider class-name="org.apache.commons.vfs.provider.ftp.FtpFileProvider"> + <provider class-name="org.apache.commons.vfs2.provider.ftp.FtpFileProvider"> <scheme name="ftp"/> <if-available class-name="org.apache.commons.net.ftp.FTPFile"/> </provider> - <default-provider class-name="org.apache.commons.vfs.provider.url.UrlFileProvider"/> + <default-provider class-name="org.apache.commons.vfs2.provider.url.UrlFileProvider"/> </providers> ]]></source> </subsection> </section> </body> -</document> \ No newline at end of file +</document> Modified: commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml (original) +++ commons/proper/vfs/trunk/src/site/xdoc/filesystems.xml Sat Nov 13 05:50:50 2010 @@ -100,14 +100,14 @@ <p> To create an encrypted password do: </p> - <code> java -cp commons-vfs-2.0.jar org.apache.commons.vfs.util.EncryptUtil encrypt mypassword + <code> java -cp commons-vfs-2.0.jar org.apache.commons.vfs2.util.EncryptUtil encrypt mypassword </code> <p> where <i>mypassword</i> is the password you want to encrypt. The result of this will be a single line of output containing uppercase hex characters. For example, </p> <code> - java -cp commons-vfs-2.0.jar org.apache.commons.vfs.util.EncryptUtil encrypt WontUBee9 + java -cp commons-vfs-2.0.jar org.apache.commons.vfs2.util.EncryptUtil encrypt WontUBee9 D7B82198B272F5C93790FEB38A73C7B8 </code> <p> Modified: commons/proper/vfs/trunk/src/site/xdoc/testing.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/testing.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/site/xdoc/testing.xml (original) +++ commons/proper/vfs/trunk/src/site/xdoc/testing.xml Sat Nov 13 05:50:50 2010 @@ -286,4 +286,4 @@ local_enable=YES]]></source> </subsection> </section> </body> -</document> \ No newline at end of file +</document> Modified: commons/proper/vfs/trunk/src/site/xdoc/testserver.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/testserver.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/site/xdoc/testserver.xml (original) +++ commons/proper/vfs/trunk/src/site/xdoc/testserver.xml Sat Nov 13 05:50:50 2010 @@ -5,9 +5,9 @@ The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -236,7 +236,7 @@ local_enable=YES </exclude> --> ]]></source> - <li>or use the class org.apache.commons.vfs.RunTest where you have + <li>or use the class org.apache.commons.vfs2.RunTest where you have to adapt some properties at the top of the file and choose which test you would like to run by comment the others.<br /> This is the way how I debug a failed testcase. @@ -245,4 +245,4 @@ local_enable=YES </subsection> </section> </body> -</document> \ No newline at end of file +</document> Modified: commons/proper/vfs/trunk/src/site/xdoc/todo.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/site/xdoc/todo.xml?rev=1034665&r1=1034664&r2=1034665&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/site/xdoc/todo.xml (original) +++ commons/proper/vfs/trunk/src/site/xdoc/todo.xml Sat Nov 13 05:50:50 2010 @@ -153,4 +153,4 @@ </section> </body> -</document> \ No newline at end of file +</document>