Author: ecki
Date: Mon Mar 2 01:57:58 2015
New Revision: 1663192
URL: http://svn.apache.org/r1663192
Log:
[VFS-564] make some loggers static.
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java
Mon Mar 2 01:57:58 2015
@@ -45,7 +45,7 @@ public class LRUFilesCache extends Abstr
private static final int DEFAULT_LRU_SIZE = 100;
/** The logger to use. */
- private final Log log = LogFactory.getLog(LRUFilesCache.class);
+ private static final Log log = LogFactory.getLog(LRUFilesCache.class);
/** The FileSystem cache */
private final ConcurrentMap<FileSystem, Map<FileName, FileObject>>
filesystemCache =
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/cache/SoftRefFilesCache.java
Mon Mar 2 01:57:58 2015
@@ -47,7 +47,7 @@ public class SoftRefFilesCache extends A
{
private static final int TIMEOUT = 1000;
- private final Log log = LogFactory.getLog(SoftRefFilesCache.class);
+ private static final Log log = LogFactory.getLog(SoftRefFilesCache.class);
private final ConcurrentMap<FileSystem, Map<FileName,
Reference<FileObject>>> fileSystemCache =
new ConcurrentHashMap<FileSystem, Map<FileName,
Reference<FileObject>>>();
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java
Mon Mar 2 01:57:58 2015
@@ -63,7 +63,8 @@ public final class FtpClientFactory
return factory.createConnection(hostname, port, username, password,
workingDirectory, fileSystemOptions);
}
- public static class FtpConnectionFactory extends
ConnectionFactory<FTPClient, FtpFileSystemConfigBuilder>
+ /** Connection Factory, used to configure the FTPClient. */
+ public static final class FtpConnectionFactory extends
ConnectionFactory<FTPClient, FtpFileSystemConfigBuilder>
{
private FtpConnectionFactory(final FtpFileSystemConfigBuilder builder)
{
@@ -83,12 +84,13 @@ public final class FtpClientFactory
}
}
+ /** Abstract Factory, used to configure different FTPClients. */
public abstract static class ConnectionFactory<C extends FTPClient, B
extends FtpFileSystemConfigBuilder>
{
private static final char[] ANON_CHAR_ARRAY =
"anonymous".toCharArray();
private static final int BUFSZ = 40;
+ private final Log log = LogFactory.getLog(getClass());
- protected Log log = LogFactory.getLog(getClass());
protected B builder;
protected ConnectionFactory(final B builder)
@@ -211,10 +213,6 @@ public final class FtpClientFactory
client.setSoTimeout(socketTimeout.intValue());
}
- // Change to root by default
- // All file operations a relative to the filesystem-root
- // String root = getRoot().getName().getPath();
-
final Boolean userDirIsRoot =
builder.getUserDirIsRoot(fileSystemOptions);
if (workingDirectory != null && (userDirIsRoot == null ||
!userDirIsRoot.booleanValue()))
{
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
Mon Mar 2 01:57:58 2015
@@ -52,8 +52,8 @@ public class FtpFileObject extends Abstr
private static final Map<String, FTPFile> EMPTY_FTP_FILE_MAP =
Collections.unmodifiableMap(new TreeMap<String, FTPFile>());
private static final FTPFile UNKNOWN = new FTPFile();
+ private static final Log log = LogFactory.getLog(FtpFileObject.class);
- private final Log log = LogFactory.getLog(FtpFileObject.class);
private final String relPath;
// Cached info
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/sftp/TrustEveryoneUserInfo.java
Mon Mar 2 01:57:58 2015
@@ -26,7 +26,7 @@ import com.jcraft.jsch.UserInfo;
*/
public class TrustEveryoneUserInfo implements UserInfo
{
- private final Log log = LogFactory.getLog(TrustEveryoneUserInfo.class);
+ private static final Log log =
LogFactory.getLog(TrustEveryoneUserInfo.class);
@Override
public String getPassphrase()
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilder.java
Mon Mar 2 01:57:58 2015
@@ -50,13 +50,10 @@ public class DelegatingFileSystemOptions
{
@SuppressWarnings("unchecked") // OK, it is a String
private static final Class<String>[] STRING_PARAM = new
Class[]{String.class};
-
private static final Map<String, Class<?>> PRIMATIVE_TO_OBJECT = new
TreeMap<String, Class<?>>();
-
- private final Log log =
LogFactory.getLog(DelegatingFileSystemOptionsBuilder.class);
+ private static final Log log =
LogFactory.getLog(DelegatingFileSystemOptionsBuilder.class);
private final FileSystemManager manager;
-
private final Map<String, Map<String, List<Method>>> beanMethods = new
TreeMap<String, Map<String, List<Method>>>();
static
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1663192&r1=1663191&r2=1663192&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Mon Mar 2 01:57:58 2015
@@ -26,6 +26,9 @@
<!-- <action issue="VFS-443" dev="ggregory" type="update"
due-to="nickallen"> -->
<!-- [Local] Need an easy way to convert from a FileObject to a File.
-->
<!-- </action> -->
+ <action issue="VFS-564" dev="ecki" type="fix" due-to="Dmitry
Konstantinov">
+ Make some loggers static.
+ </action>
<action issue="VFS-555" dev="rwhitcomb" type="add">
[hdfs] Add the ability to specify an HDFS configuration file with
HdfsFileSystemConfigBuilder.
</action>
