You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ec...@apache.org on 2014/05/01 02:33:44 UTC

svn commit: r1591516 [2/2] - in /commons/proper/vfs/trunk: core/src/main/java/org/apache/commons/vfs2/ core/src/main/java/org/apache/commons/vfs2/impl/ core/src/main/java/org/apache/commons/vfs2/provider/ core/src/main/java/org/apache/commons/vfs2/prov...

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilder.java Thu May  1 00:33:43 2014
@@ -27,12 +27,10 @@ import org.apache.commons.vfs2.FileSyste
 import com.jcraft.jsch.UserInfo;
 
 /**
- * The config BUILDER for various SFTP configuration options.
+ * The config builder for various SFTP configuration options.
  */
 public final class SftpFileSystemConfigBuilder extends FileSystemConfigBuilder
 {
-
-
     /**
      * Proxy type.
      */
@@ -110,17 +108,17 @@ public final class SftpFileSystemConfigB
 
     /**
      * Connects to the SFTP server through a remote host reached by SSH.
+     * <p>
      * On this proxy host, a command
      * (e.g. {@linkplain SftpStreamProxy#NETCAT_COMMAND}
      * or {@linkplain SftpStreamProxy#NETCAT_COMMAND}) is run to forward
-     * input/output streams between the target host and the VFS host.</p>
+     * input/output streams between the target host and the VFS host.
      * <p>
      * When used, the proxy username ({@linkplain #setProxyUser}) and
      * hostname ({@linkplain #setProxyHost}) <b>must</b> be set.
      * Optionnaly, the command ({@linkplain #setProxyCommand}),
      * password ({@linkplain #setProxyPassword}) and connection options
      * ({@linkplain #setProxyOptions}) can be set.
-     * </p>
      */
     public static final ProxyType PROXY_STREAM = new ProxyType("stream");
 
@@ -136,7 +134,7 @@ public final class SftpFileSystemConfigB
     private static final String TIMEOUT = _PREFIX + ".TIMEOUT";
     private static final String USER_DIR_IS_ROOT = _PREFIX + ".USER_DIR_IS_ROOT";
     private static final String ENCODING = _PREFIX + ".ENCODING";
-    
+
     /**
      * Gets the singleton builder.
      *
@@ -171,12 +169,12 @@ public final class SftpFileSystemConfigB
 
     /**
      * Gets the file name encoding.
-     * 
+     *
      * @param opts
      *            The FileSystem options.
      * @return the file name encoding
      */
-    public String getFileNameEncoding(final FileSystemOptions opts) 
+    public String getFileNameEncoding(final FileSystemOptions opts)
     {
         return this.getString(opts, ENCODING);
     }
@@ -185,8 +183,7 @@ public final class SftpFileSystemConfigB
      * Gets the identity files (your private key files).
      * <p>
      * We use java.io.File because JSch cannot deal with VFS FileObjects.
-     * </p>
-     * 
+     *
      * @param opts The FileSystem options.
      * @return the array of identity Files.
      * @see #setIdentities
@@ -276,13 +273,13 @@ public final class SftpFileSystemConfigB
     }
 
     /**
-     * Gets the proxy to use for the SFTP connection. You have to set the ProxyPort too if you would like to have the
-     * proxy really used.
-     * 
+     * Gets the proxy to use for the SFTP connection.
+     *
      * @param opts
      *            The FileSystem options.
      * @return proxyHost
-     * @see #setProxyPort
+     * @see #getProxyPort
+     * @see #setProxyHost
      */
     public String getProxyHost(final FileSystemOptions opts)
     {
@@ -322,13 +319,13 @@ public final class SftpFileSystemConfigB
     }
 
     /**
-     * Gets the proxy-port to use for the SFTP the connection You have to set the ProxyHost too if you would like to
-     * have the proxy really used.
-     * 
+     * Gets the proxy-port to use for the SFTP the connection.
+     *
      * @param opts
      *            The FileSystem options.
      * @return proxyPort: the port number or 0 if it is not set
-     * @see #setProxyHost
+     * @see #setProxyPort
+     * @see #getProxyHost
      */
     public int getProxyPort(final FileSystemOptions opts)
     {
@@ -387,7 +384,7 @@ public final class SftpFileSystemConfigB
      * Returns {@link Boolean#TRUE} if VFS should treat the user directory as the root directory. Defaults to
      * <code>Boolean.TRUE</code> if the method {@link #setUserDirIsRoot(FileSystemOptions, boolean)} has not been
      * invoked.
-     * 
+     *
      * @param opts
      *            The FileSystemOptions.
      * @return <code>Boolean.TRUE</code> if VFS treats the user directory as the root directory.
@@ -413,10 +410,8 @@ public final class SftpFileSystemConfigB
      * Configures the compression to use.
      * <p>
      * For example, use {@code "zlib,none"} to enable compression.
-     * </p>
      * <p>
      * See the Jsch documentation for details.
-     * </p>
      *
      * @param opts
      *            The FileSystem options.
@@ -432,12 +427,12 @@ public final class SftpFileSystemConfigB
 
     /**
      * Sets the file name encoding.
-     * 
+     *
      * @param opts
      *            The FileSystem options.
      * @param fileNameEncoding
      */
-    public void setFileNameEncoding(final FileSystemOptions opts, final String fileNameEncoding) 
+    public void setFileNameEncoding(final FileSystemOptions opts, final String fileNameEncoding)
     {
         this.setParam(opts, ENCODING, fileNameEncoding);
     }
@@ -445,9 +440,8 @@ public final class SftpFileSystemConfigB
     /**
      * Sets the identity files (your private key files).
      * <p>
-     * We use java.io.File because JSch cannot deal with VFS FileObjects.
-     * </p>
-     * 
+     * We use {@link java.io.File} because JSch cannot deal with VFS FileObjects.
+     *
      * @param opts The FileSystem options.
      * @param identityFiles An array of identity Files.
      * @throws FileSystemException if an error occurs.
@@ -477,7 +471,7 @@ public final class SftpFileSystemConfigB
      *            An array of identity info.
      * @throws FileSystemException
      *             if an error occurs.
-     * @since 2.1             
+     * @since 2.1
      */
     public void setIdentityInfo(final FileSystemOptions opts, final IdentityInfo... identites) throws FileSystemException
     {
@@ -485,7 +479,9 @@ public final class SftpFileSystemConfigB
     }
 
     /**
-     * Set the identity repository. This is useful when you want to use e.g. an SSH agent as provided See for example
+     * Set the identity repository.
+     * <p>
+     * This is useful when you want to use e.g. an SSH agent as provided.
      *
      * @param opts
      *            The FileSystem options.
@@ -502,10 +498,9 @@ public final class SftpFileSystemConfigB
     }
 
     /**
-     * Sets the known_hosts file. e.g. /home/user/.ssh/known_hosts2.
+     * Sets the known_hosts file. e.g. {@code /home/user/.ssh/known_hosts2}.
      * <p>
-     * We use java.io.File because JSch cannot deal with VFS FileObjects.
-     * </p>
+     * We use {@link java.io.File} because JSch cannot deal with VFS FileObjects.
      *
      * @param opts
      *            The FileSystem options.
@@ -551,7 +546,7 @@ public final class SftpFileSystemConfigB
     /**
      * Sets the proxy to use for the SFTP connection.
      *
-     * You MUST also set the ProxyPort to use the proxy.
+     * You MUST also set the proxy port to use the proxy.
      *
      * @param opts
      *            The FileSystem options.
@@ -599,8 +594,8 @@ public final class SftpFileSystemConfigB
 
     /**
      * Sets the proxy port to use for the SFTP connection.
-     *
-     * You MUST also set the ProxyHost to use the proxy.
+     * <p>
+     * You MUST also set the proxy host to use the proxy.
      *
      * @param opts
      *            The FileSystem options.
@@ -689,8 +684,8 @@ public final class SftpFileSystemConfigB
     {
         this.setParam(opts, TIMEOUT, timeout);
     }
-    
-    
+
+
     /**
      * Sets the whether to use the user directory as root (do not change to file system root).
      *

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/SftpStreamProxy.java Thu May  1 00:33:43 2014
@@ -54,17 +54,12 @@ public class SftpStreamProxy implements 
 
     /**
      * Command pattern to execute on the proxy host.
-     *
      * <p>
      * When run, the command output should be forwarded to the target host and port, and its input should be forwarded
      * from the target host and port.
-     * </p>
-     *
      * <p>
      * The command will be created for each host/port pair by using {@linkplain String#format(String, Object...)} with
      * two objects: the target host name ({@linkplain String}) and the target port ({@linkplain Integer}).
-     * </p>
-     * <p/>
      * <p>
      * Here are two examples (that can be easily used by using the static members of this class):
      * <ul>
@@ -72,7 +67,6 @@ public class SftpStreamProxy implements 
      * <li><code>/bin/bash -c 'exec 3<>/dev/tcp/%s/%d; cat <&3 & cat >&3; kill $!</code> will use bash built-in TCP
      * stream, which can be useful when there is no netcat available. ({@linkplain #BASH_TCP_COMMAND})</li>
      * </ul>
-     * </p>
      */
     private final String commandFormat;
 

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileNameParser.java Thu May  1 00:33:43 2014
@@ -25,7 +25,8 @@ import org.apache.commons.vfs2.provider.
 import org.apache.commons.vfs2.provider.local.GenericFileNameParser;
 
 /**
- * Implementation for any java.net.url based filesystem.<br />
+ * Implementation for any java.net.url based filesystem.
+ * <p>
  * Composite of URLFilenameParser and GenericFilenameParser
  */
 public class UrlFileNameParser extends AbstractFileNameParser
@@ -65,10 +66,11 @@ public class UrlFileNameParser extends A
     }
 
     /**
-     * Guess is the given filename is a url with host or not. VFS treats such urls differently.<br />
+     * Guess is the given filename is a url with host or not. VFS treats such urls differently.
+     * <p>
      * A filename is url-based if the base is a {@code URLFileName} or there are only 2 slashes
-     * after the scheme.<br/>
-     * e.g: http://host/path, file:/path/to/file, file:///path/to/file
+     * after the scheme.
+     * e.g: {@code http://host/path}, {@code file:/path/to/file}, {@code file:///path/to/file}.
      */
     protected boolean isUrlBased(final FileName base, final String filename)
     {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/url/UrlFileObject.java Thu May  1 00:33:43 2014
@@ -34,9 +34,10 @@ import org.apache.commons.vfs2.provider.
 
 /**
  * A {@link FileObject} implementation backed by a {@link URL}.
- *
- * @todo Implement set lastModified and get/set attribute
- * @todo Implement getOutputStream()
+ * <p>
+ * TODO - Implement set lastModified and get/set attribute
+ * <p>
+ * TODO - Implement getOutputStream().
  */
 public class UrlFileObject extends AbstractFileObject<UrlFileSystem>
 {

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavFileObject.java Thu May  1 00:33:43 2014
@@ -81,8 +81,8 @@ public class WebdavFileObject extends Ht
 {
     /**
      * An OutputStream that writes to a Webdav resource.
-     *
-     * @todo Use piped stream to avoid temporary file
+     * <p>
+     * TODO - Use piped stream to avoid temporary file.
      */
     private class WebdavOutputStream extends MonitorOutputStream
     {
@@ -418,8 +418,9 @@ public class WebdavFileObject extends Ht
     /**
      * Determines if this file can be written to.  Is only called if
      * {@link #doGetType} does not return {@link FileType#IMAGINARY}.
-     * <p/>
+     * <p>
      * This implementation always returns true.
+     *
      * @return true if the file is writable.
      * @throws Exception if an error occurs.
      */
@@ -523,8 +524,6 @@ public class WebdavFileObject extends Ht
     /**
      * Sets an attribute of this file.  Is only called if {@link #doGetType}
      * does not return {@link FileType#IMAGINARY}.
-     * <p/>
-     * This implementation throws an exception.
      */
     @Override
     protected void doSetAttribute(final String attrName, final Object value)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/webdav/WebdavMethodRetryHandler.java Thu May  1 00:33:43 2014
@@ -23,7 +23,8 @@ import org.apache.commons.httpclient.Htt
 
 
 /**
- * A retry handler which will retry a failed webdav method one time.<br />
+ * A retry handler which will retry a failed webdav method one time.
+ * <p>
  * Now that webdavlib didnt support adding a MethodRetryHandler only a few operations are restartable yet.
  *
  * @since 2.0

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java Thu May  1 00:33:43 2014
@@ -75,10 +75,10 @@ public class ZipFileObject extends Abstr
 
     /**
      * Attaches a child.
-     * <p/>
-     * TODO: Shouldn't this method have package-only visibility? 
-     * Cannot change this without breaking binary compatibility.  
-     * 
+     * <p>
+     * TODO: Shouldn't this method have package-only visibility?
+     * Cannot change this without breaking binary compatibility.
+     *
      * @param childName The name of the child.
      */
     public void attachChild(final FileName childName)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/AbstractSyncTask.java Thu May  1 00:33:43 2014
@@ -40,13 +40,13 @@ import org.apache.tools.ant.Project;
  * <li>Up-to-date destination file.
  * </ul>
  *
- * @todo Deal with case where dest file maps to a child of one of the source files
- * @todo Deal with case where dest file already exists and is incorrect type (not file, not a folder)
- * @todo Use visitors
- * @todo Add default excludes
- * @todo Allow selector, mapper, filters, etc to be specified.
- * @todo Handle source/dest directories as well
- * @todo Allow selector to be specified for choosing which dest files to sync
+ * TODO - Deal with case where dest file maps to a child of one of the source files.<br>
+ * TODO - Deal with case where dest file already exists and is incorrect type (not file, not a folder).<br>
+ * TODO - Use visitors.<br>
+ * TODO - Add default excludes.<br>
+ * TOOD - Allow selector, mapper, filters, etc to be specified.<br>
+ * TODO - Handle source/dest directories as well.<br>
+ * TODO - Allow selector to be specified for choosing which dest files to sync.
  */
 public abstract class AbstractSyncTask
     extends VfsTask

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/CopyTask.java Thu May  1 00:33:43 2014
@@ -23,8 +23,8 @@ import org.apache.commons.vfs2.Selectors
 
 /**
  * An Ant task that copies matching files.
- *
- * @todo Copy folders that do not contain files
+ * <p>
+ * TODO - Copy folders that do not contain files.
  */
 public class CopyTask
     extends AbstractSyncTask

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/DeleteTask.java Thu May  1 00:33:43 2014
@@ -24,8 +24,8 @@ import org.apache.tools.ant.BuildExcepti
 
 /**
  * An Ant task that deletes matching files.
- *
- * @todo Allow selector to be specified.
+ * <p>
+ * TOOD - Allow selector to be specified.
  */
 public class DeleteTask
     extends VfsTask

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/MoveTask.java Thu May  1 00:33:43 2014
@@ -23,8 +23,8 @@ import org.apache.commons.vfs2.Selectors
 
 /**
  * An Ant task that moves matching files.
- *
- * @todo Delete matching folders
+ * <p>
+ * TODO - Delete matching folders.
  */
 public class MoveTask
     extends CopyTask

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/MonitorOutputStream.java Thu May  1 00:33:43 2014
@@ -127,9 +127,11 @@ public class MonitorOutputStream
     }
 
     /**
-     * check if file is still open. <br />
+     * Check if file is still open.
+     * <p>
      * This is a workaround for an oddity with Java's BufferedOutputStream where you can write to
-     * even if the stream has been closed
+     * even if the stream has been closed.
+     *
      * @throws FileSystemException if an error occurs.
      * @since 2.0
      */
@@ -142,7 +144,10 @@ public class MonitorOutputStream
     }
 
     /**
-     * Called after this stream is closed.  This implementation does nothing.
+     * Called after this stream is closed.
+     * <p>
+     * This implementation does nothing.
+     *
      * @throws IOException if an error occurs.
      */
     // IOException is needed because subclasses may need to throw it

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/WeakRefFileListener.java Thu May  1 00:33:43 2014
@@ -105,8 +105,9 @@ public class WeakRefFileListener impleme
 
     /**
      * Called when a file is changed.
-     * <p/>
+     * <p>
      * This will only happen if you monitor the file using {@link org.apache.commons.vfs2.FileMonitor}.
+     *
      * @param event The FileChangeEvent.
      * @throws Exception if an error occurs.
      */

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/ConversionTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/ConversionTestCase.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/ConversionTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/local/test/ConversionTestCase.java Thu May  1 00:33:43 2014
@@ -33,10 +33,8 @@ import org.junit.Test;
 
 /**
  * Tests conversion from VFS to File.
- * <p/>
+ * <p>
  * VFS-443 Need an easy way to convert from a FileObject to a File.
- *
- * @version $Id$
  */
 public class ConversionTestCase
 {

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/AbstractProviderTestCase.java Thu May  1 00:33:43 2014
@@ -41,7 +41,7 @@ import org.apache.commons.vfs2.provider.
 /**
  * File system test cases, which verifies the structure and naming
  * functionality.
- * <p/>
+ * <p>
  * Works from a base folder, and assumes a particular structure under
  * that base folder.
  */
@@ -171,8 +171,8 @@ public abstract class AbstractProviderTe
      * tests are not run if the provider being tested does not support all
      * the required capabilities.  Return null or an empty array to always
      * run the tests.
-     * <p/>
-     * <p>This implementation returns null.
+     * <p>
+     * This implementation returns null.
      */
     protected Capability[] getRequiredCaps()
     {
@@ -183,9 +183,9 @@ public abstract class AbstractProviderTe
      * Runs the test.  This implementation short-circuits the test if the
      * provider being tested does not have the capabilities required by this
      * test.
-     *
-     * @todo Handle negative caps as well - ie, only run a test if the provider does not have certain caps.
-     * @todo Figure out how to remove the test from the TestResult if the test is skipped.
+     * <p>
+     * TODO - Handle negative caps as well - ie, only run a test if the provider does not have certain caps.<br>
+     * TODO - Figure out how to remove the test from the TestResult if the test is skipped.
      */
     @Override
     protected void runTest() throws Throwable

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/NamingTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/NamingTests.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/NamingTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/NamingTests.java Thu May  1 00:33:43 2014
@@ -23,8 +23,8 @@ import org.apache.commons.vfs2.NameScope
 
 /**
  * Test cases for file naming.
- *
- * @todo Add tests for all FileName methods
+ * <p>
+ * TODO - Add tests for all FileName methods.
  */
 public class NamingTests
     extends AbstractProviderTestCase

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/ProviderReadTests.java Thu May  1 00:33:43 2014
@@ -33,8 +33,8 @@ import org.junit.Assert;
 
 /**
  * Read-only test cases for file providers.
- *
- * @todo Test getLastModified(), getAttribute()
+ * <p>
+ * TODO - Test getLastModified(), getAttribute().
  */
 public class ProviderReadTests extends AbstractProviderTestCase
 {

Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java?rev=1591516&r1=1591515&r2=1591516&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java (original)
+++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/test/UrlTests.java Thu May  1 00:33:43 2014
@@ -35,8 +35,6 @@ public class UrlTests
      * tests are not run if the provider being tested does not support all
      * the required capabilities.  Return null or an empty array to always
      * run the tests.
-     * <p/>
-     * <p>This implementation returns null.
      */
     @Override
     protected Capability[] getRequiredCaps()

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=1591516&r1=1591515&r2=1591516&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 Thu May  1 00:33:43 2014
@@ -275,12 +275,12 @@ public class MimeFileObject
     }
 
     /**
-     * Returns all headers of this part.<br />
-     * The map key is a java.lang.String and the value is a:<br />
+     * Returns all headers of this part.
+     * <p>
+     * The map key is a java.lang.String and the value is a:
      * <ul>
-     * <li>java.lang.Strings for single entries</li>
-     * or a
-     * <li>java.utils.List of java.lang.Strings for entries with multiple values</li>
+     * <li>{@code java.lang.Strings} for single entries or a</li>
+     * <li>{@code java.utils.List<java.lang.Strings>} for entries with multiple values</li>
      * </ul>
      */
     @Override