ftp: Reorganize ftp classes

Moves FTP related classes to org.dcache.ftp, with appropriate subpackages. Target: trunk Require-notes: no Require-book: no Acked-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Patch: http://rb.dcache.org/r/6299/
dCache · Dec 5, 2013 · 70974a3 · 70974a3
1 parent 465a782
commit 70974a3
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 53 deletions.
diff --git a/...ache/ftp/AbstractMultiplexerListener.java → ...ftp/data/AbstractMultiplexerListener.java b/...ache/ftp/AbstractMultiplexerListener.java → ...ftp/data/AbstractMultiplexerListener.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.nio.channels.SelectionKey;
 

diff --git a/...rc/main/java/org/dcache/ftp/BlockLog.java → ...in/java/org/dcache/ftp/data/BlockLog.java b/...rc/main/java/org/dcache/ftp/BlockLog.java → ...in/java/org/dcache/ftp/data/BlockLog.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.text.MessageFormat;
 import java.util.SortedMap;

diff --git a/...ava/org/dcache/ftp/ConnectionMonitor.java → ...rg/dcache/ftp/data/ConnectionMonitor.java b/...ava/org/dcache/ftp/ConnectionMonitor.java → ...rg/dcache/ftp/data/ConnectionMonitor.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 public interface ConnectionMonitor
 {

diff --git a/...ain/java/org/dcache/ftp/DigestThread.java → ...ava/org/dcache/ftp/data/DigestThread.java b/...ain/java/org/dcache/ftp/DigestThread.java → ...ava/org/dcache/ftp/data/DigestThread.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.security.MessageDigest;
 

diff --git a/...va/org/dcache/ftp/DirectDigestThread.java → ...g/dcache/ftp/data/DirectDigestThread.java b/...va/org/dcache/ftp/DirectDigestThread.java → ...g/dcache/ftp/data/DirectDigestThread.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;

diff --git a/...c/main/java/org/dcache/ftp/Direction.java → ...n/java/org/dcache/ftp/data/Direction.java b/...c/main/java/org/dcache/ftp/Direction.java → ...n/java/org/dcache/ftp/data/Direction.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 /** Indicates the direction of connection establishment. */
 public enum Direction

diff --git a/...in/java/org/dcache/ftp/ErrorListener.java → ...va/org/dcache/ftp/data/ErrorListener.java b/...in/java/org/dcache/ftp/ErrorListener.java → ...va/org/dcache/ftp/data/ErrorListener.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 /* Interface for reporting errors.
  */

diff --git a/...ain/java/org/dcache/ftp/FTPException.java → ...ava/org/dcache/ftp/data/FTPException.java b/...ain/java/org/dcache/ftp/FTPException.java → ...ava/org/dcache/ftp/data/FTPException.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 public class FTPException extends Exception
 {

diff --git a/...tp/src/main/java/org/dcache/ftp/Mode.java → ...c/main/java/org/dcache/ftp/data/Mode.java b/...tp/src/main/java/org/dcache/ftp/Mode.java → ...c/main/java/org/dcache/ftp/data/Mode.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...p/src/main/java/org/dcache/ftp/ModeE.java → .../main/java/org/dcache/ftp/data/ModeE.java b/...p/src/main/java/org/dcache/ftp/ModeE.java → .../main/java/org/dcache/ftp/data/ModeE.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/...p/src/main/java/org/dcache/ftp/ModeS.java → .../main/java/org/dcache/ftp/data/ModeS.java b/...p/src/main/java/org/dcache/ftp/ModeS.java → .../main/java/org/dcache/ftp/data/ModeS.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;

diff --git a/...p/src/main/java/org/dcache/ftp/ModeX.java → .../main/java/org/dcache/ftp/data/ModeX.java b/...p/src/main/java/org/dcache/ftp/ModeX.java → .../main/java/org/dcache/ftp/data/ModeX.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/...main/java/org/dcache/ftp/Multiplexer.java → ...java/org/dcache/ftp/data/Multiplexer.java b/...main/java/org/dcache/ftp/Multiplexer.java → ...java/org/dcache/ftp/data/Multiplexer.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.io.IOException;
 import java.nio.channels.SelectableChannel;

diff --git a/...a/org/dcache/ftp/MultiplexerListener.java → .../dcache/ftp/data/MultiplexerListener.java b/...a/org/dcache/ftp/MultiplexerListener.java → .../dcache/ftp/data/MultiplexerListener.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 import java.nio.channels.SelectionKey;
 

diff --git a/...tp/src/main/java/org/dcache/ftp/Role.java → ...c/main/java/org/dcache/ftp/data/Role.java b/...tp/src/main/java/org/dcache/ftp/Role.java → ...c/main/java/org/dcache/ftp/data/Role.java
@@ -1,4 +1,4 @@
-package org.dcache.ftp;
+package org.dcache.ftp.data;
 
 /** Indicates the role as a sender or receiver of a transfer. */
 public enum Role

diff --git a/...iskCacheV111/doors/AbstractFtpDoorV1.java → ...rg/dcache/ftp/door/AbstractFtpDoorV1.java b/...iskCacheV111/doors/AbstractFtpDoorV1.java → ...rg/dcache/ftp/door/AbstractFtpDoorV1.java
@@ -64,7 +64,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
   documents or software obtained from this server.
  */
 
-package diskCacheV111.doors;
+package org.dcache.ftp.door;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
@@ -117,9 +117,8 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import diskCacheV111.movers.GFtpPerfMarker;
-import diskCacheV111.movers.GFtpPerfMarkersBlock;
-import diskCacheV111.util.ActiveAdapter;
+import diskCacheV111.doors.AbstractInterruptibleLineBasedInterpreter;
+import diskCacheV111.doors.FTPTransactionLog;
 import diskCacheV111.util.CacheException;
 import diskCacheV111.util.CheckStagePermission;
 import diskCacheV111.util.ChecksumFactory;
@@ -130,8 +129,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import diskCacheV111.util.NotFileCacheException;
 import diskCacheV111.util.PermissionDeniedCacheException;
 import diskCacheV111.util.PnfsHandler;
-import diskCacheV111.util.ProxyAdapter;
-import diskCacheV111.util.SocketAdapter;
 import diskCacheV111.util.TimeoutCacheException;
 import diskCacheV111.vehicles.DoorRequestInfoMessage;
 import diskCacheV111.vehicles.DoorTransferFinishedMessage;
@@ -168,6 +165,9 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import org.dcache.auth.attributes.RootDirectory;
 import org.dcache.cells.CellStub;
 import org.dcache.cells.Option;
+import org.dcache.ftp.proxy.ActiveAdapter;
+import org.dcache.ftp.proxy.ProxyAdapter;
+import org.dcache.ftp.proxy.SocketAdapter;
 import org.dcache.namespace.ACLPermissionHandler;
 import org.dcache.namespace.ChainedPermissionHandler;
 import org.dcache.namespace.FileAttribute;

diff --git a/.../diskCacheV111/movers/GFtpPerfMarker.java → ...a/org/dcache/ftp/door/GFtpPerfMarker.java b/.../diskCacheV111/movers/GFtpPerfMarker.java → ...a/org/dcache/ftp/door/GFtpPerfMarker.java
@@ -64,7 +64,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
   documents or software obtained from this server.
 */
 
-package diskCacheV111.movers;
+package org.dcache.ftp.door;
 
 /**
  * <p>Title: GFtpPerfMarker.java</p>

diff --git a/...acheV111/movers/GFtpPerfMarkersBlock.java → ...dcache/ftp/door/GFtpPerfMarkersBlock.java b/...acheV111/movers/GFtpPerfMarkersBlock.java → ...dcache/ftp/door/GFtpPerfMarkersBlock.java
@@ -66,7 +66,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 
 // $Id: GFtpPerfMarkersBlock.java,v 1.2 2005-10-26 17:56:41 aik Exp $
 
-package diskCacheV111.movers ;
+package org.dcache.ftp.door;
 
 /**
  * <p>Title: GFtpPerfMarkersBlock</p>

diff --git a/...ava/diskCacheV111/doors/GsiFtpDoorV1.java → ...ava/org/dcache/ftp/door/GsiFtpDoorV1.java b/...ava/diskCacheV111/doors/GsiFtpDoorV1.java → ...ava/org/dcache/ftp/door/GsiFtpDoorV1.java
@@ -1,4 +1,4 @@
-package diskCacheV111.doors;
+package org.dcache.ftp.door;
 
 import org.globus.gsi.CredentialException;
 import org.globus.gsi.GSIConstants;
@@ -21,6 +21,7 @@
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
+import diskCacheV111.doors.FTPTransactionLog;
 import diskCacheV111.util.CacheException;
 import diskCacheV111.util.PermissionDeniedCacheException;
 

diff --git a/...ava/diskCacheV111/doors/GssFtpDoorV1.java → ...ava/org/dcache/ftp/door/GssFtpDoorV1.java b/...ava/diskCacheV111/doors/GssFtpDoorV1.java → ...ava/org/dcache/ftp/door/GssFtpDoorV1.java
@@ -1,4 +1,4 @@
-package diskCacheV111.doors;
+package org.dcache.ftp.door;
 
 import com.google.common.base.Throwables;
 import org.ietf.jgss.ChannelBinding;

diff --git a/...iskCacheV111/doors/KerberosFtpDoorV1.java → ...rg/dcache/ftp/door/KerberosFtpDoorV1.java b/...iskCacheV111/doors/KerberosFtpDoorV1.java → ...rg/dcache/ftp/door/KerberosFtpDoorV1.java
@@ -1,4 +1,4 @@
-package diskCacheV111.doors;
+package org.dcache.ftp.door;
 
 import org.ietf.jgss.ChannelBinding;
 import org.ietf.jgss.GSSContext;
@@ -17,6 +17,7 @@
 import java.net.UnknownHostException;
 import java.util.Properties;
 
+import diskCacheV111.doors.FTPTransactionLog;
 import diskCacheV111.util.CacheException;
 import diskCacheV111.util.PermissionDeniedCacheException;
 
@@ -28,7 +29,8 @@
  *
  * @author  timur
  */
-public class KerberosFtpDoorV1 extends GssFtpDoorV1 {
+public class KerberosFtpDoorV1 extends GssFtpDoorV1
+{
 
     private static final Logger LOGGER = LoggerFactory.getLogger(KerberosFtpDoorV1.class);
 

diff --git a/...va/diskCacheV111/doors/WeakFtpDoorV1.java → ...va/org/dcache/ftp/door/WeakFtpDoorV1.java b/...va/diskCacheV111/doors/WeakFtpDoorV1.java → ...va/org/dcache/ftp/door/WeakFtpDoorV1.java
@@ -1,10 +1,11 @@
-package diskCacheV111.doors;
+package org.dcache.ftp.door;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.security.auth.Subject;
 
+import diskCacheV111.doors.FTPTransactionLog;
 import diskCacheV111.util.CacheException;
 import diskCacheV111.util.PermissionDeniedCacheException;
 
@@ -17,7 +18,8 @@
  *
  * @author  timur
  */
-public class WeakFtpDoorV1 extends AbstractFtpDoorV1 {
+public class WeakFtpDoorV1 extends AbstractFtpDoorV1
+{
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WeakFtpDoorV1.class);
 

diff --git a/...ava/diskCacheV111/util/ActiveAdapter.java → ...a/org/dcache/ftp/proxy/ActiveAdapter.java b/...ava/diskCacheV111/util/ActiveAdapter.java → ...a/org/dcache/ftp/proxy/ActiveAdapter.java
@@ -64,7 +64,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  documents or software obtained from this server.
  */
 
-package diskCacheV111.util;
+package org.dcache.ftp.proxy;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../java/diskCacheV111/doors/EDataBlock.java → ...java/org/dcache/ftp/proxy/EDataBlock.java b/.../java/diskCacheV111/doors/EDataBlock.java → ...java/org/dcache/ftp/proxy/EDataBlock.java
@@ -65,7 +65,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 */
 
 
-package diskCacheV111.doors;
+package org.dcache.ftp.proxy;
 
 import java.io.InputStream;
 

diff --git a/...va/diskCacheV111/doors/EDataBlockNio.java → ...a/org/dcache/ftp/proxy/EDataBlockNio.java b/...va/diskCacheV111/doors/EDataBlockNio.java → ...a/org/dcache/ftp/proxy/EDataBlockNio.java
@@ -64,7 +64,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  documents or software obtained from this server.
  */
 
-package diskCacheV111.doors;
+package org.dcache.ftp.proxy;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;

diff --git a/...java/diskCacheV111/util/ProxyAdapter.java → ...va/org/dcache/ftp/proxy/ProxyAdapter.java b/...java/diskCacheV111/util/ProxyAdapter.java → ...va/org/dcache/ftp/proxy/ProxyAdapter.java
@@ -1,4 +1,4 @@
-package diskCacheV111.util;
+package org.dcache.ftp.proxy;
 
 public interface ProxyAdapter {
 

diff --git a/...ava/diskCacheV111/util/SocketAdapter.java → ...a/org/dcache/ftp/proxy/SocketAdapter.java b/...ava/diskCacheV111/util/SocketAdapter.java → ...a/org/dcache/ftp/proxy/SocketAdapter.java
@@ -64,7 +64,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
   documents or software obtained from this server.
 */
 
-package diskCacheV111.util;
+package org.dcache.ftp.proxy;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79,8 +79,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import java.util.List;
 import java.util.Random;
 
-import diskCacheV111.doors.EDataBlockNio;
-
 import org.dcache.cells.AbstractCell;
 
 /**

diff --git a/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java b/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java
@@ -25,18 +25,18 @@
 import dmg.cells.nucleus.CellPath;
 import dmg.util.Args;
 
-import org.dcache.ftp.BlockLog;
-import org.dcache.ftp.ConnectionMonitor;
-import org.dcache.ftp.DigestThread;
-import org.dcache.ftp.DirectDigestThread;
-import org.dcache.ftp.ErrorListener;
-import org.dcache.ftp.FTPException;
-import org.dcache.ftp.Mode;
-import org.dcache.ftp.ModeE;
-import org.dcache.ftp.ModeS;
-import org.dcache.ftp.ModeX;
-import org.dcache.ftp.Multiplexer;
-import org.dcache.ftp.Role;
+import org.dcache.ftp.data.BlockLog;
+import org.dcache.ftp.data.ConnectionMonitor;
+import org.dcache.ftp.data.DigestThread;
+import org.dcache.ftp.data.DirectDigestThread;
+import org.dcache.ftp.data.ErrorListener;
+import org.dcache.ftp.data.FTPException;
+import org.dcache.ftp.data.Mode;
+import org.dcache.ftp.data.ModeE;
+import org.dcache.ftp.data.ModeS;
+import org.dcache.ftp.data.ModeX;
+import org.dcache.ftp.data.Multiplexer;
+import org.dcache.ftp.data.Role;
 import org.dcache.pool.repository.Allocator;
 import org.dcache.pool.repository.FileRepositoryChannel;
 import org.dcache.pool.repository.RepositoryChannel;

diff --git a/...acheV111/doors/AbstractFtpDoorV1Test.java → ...cache/ftp/door/AbstractFtpDoorV1Test.java b/...acheV111/doors/AbstractFtpDoorV1Test.java → ...cache/ftp/door/AbstractFtpDoorV1Test.java
@@ -1,4 +1,4 @@
-package diskCacheV111.doors;
+package org.dcache.ftp.door;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/modules/dcache-ftp/src/test/java/org/dcache/tests/ftp/ActiveAdapterTest.java b/modules/dcache-ftp/src/test/java/org/dcache/tests/ftp/ActiveAdapterTest.java
@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 
-import diskCacheV111.util.ActiveAdapter;
+import org.dcache.ftp.proxy.ActiveAdapter;
 
 import org.dcache.util.PortRange;
 

diff --git a/skel/share/defaults/ftp.properties b/skel/share/defaults/ftp.properties
@@ -253,9 +253,9 @@ ftp.service.billing=${dcache.service.billing}
 
 #  Implementation class
 (immutable)ftp.implementation=${ftp.implementation.${ftp.authn.protocol}}
-(immutable)ftp.implementation.plain=diskCacheV111.doors.WeakFtpDoorV1
-(immutable)ftp.implementation.gsi=diskCacheV111.doors.GsiFtpDoorV1
-(immutable)ftp.implementation.kerberos=diskCacheV111.doors.KerberosFtpDoorV1
+(immutable)ftp.implementation.plain=org.dcache.ftp.door.WeakFtpDoorV1
+(immutable)ftp.implementation.gsi=org.dcache.ftp.door.GsiFtpDoorV1
+(immutable)ftp.implementation.kerberos=org.dcache.ftp.door.KerberosFtpDoorV1
 
 #  Document which TCP ports are opened
 (immutable)ftp.net.ports.tcp=${ftp.net.port} ${ftp.net.port-range}