cells: Move dCache's cell interfaces into cells

These interfaces were originally placed outside of cells
as cells was a closed product. Now that cells is part of
dcache, there is no reason not to move those interfaces
to the proper place.

This allows the LoginBrokerHandler utility class to be
moved to the same package on the LoginManager it is coupled
to. A future patch will update LoginManager to use that
utility class and thus avoid the code duplication with an
internal class.

This patch only moves classes. Besides deleting the unused
ThreadFactoryAware, there are no code changes.

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/6285/

modules/dcache/src/main/java/org/dcache/cells/AbstractCellComponent.java → modules/cells/src/main/java/dmg/cells/nucleus/AbstractCellComponent.java

@@ -1,23 +1,15 @@
-package org.dcache.cells;
+package dmg.cells.nucleus;
 
 import java.io.PrintWriter;
 import java.util.Map;
 
-import dmg.cells.nucleus.CellAddressCore;
-import dmg.cells.nucleus.CellEndpoint;
-import dmg.cells.nucleus.CellInfo;
-import dmg.cells.nucleus.CellInfoProvider;
-import dmg.cells.nucleus.CellMessage;
-import dmg.cells.nucleus.CellMessageAnswerable;
-import dmg.cells.nucleus.NoRouteToCellException;
-import dmg.cells.nucleus.SerializationException;
 import dmg.util.Args;
 
 public class AbstractCellComponent
     implements CellInfoProvider,
-               CellSetupProvider,
-               CellMessageSender,
-               CellLifeCycleAware
+        CellSetupProvider,
+        CellMessageSender,
+        CellLifeCycleAware
 {
     private CellEndpoint _endpoint;
     private CellAddressCore _cellAddress;

modules/dcache/src/main/java/org/dcache/cells/CellCommandListener.java → modules/cells/src/main/java/dmg/cells/nucleus/CellCommandListener.java

@@ -1,4 +1,4 @@
-package org.dcache.cells;
+package dmg.cells.nucleus;
 
 /**
  * Classes implementing this object are registered as Cell command

modules/dcache/src/main/java/org/dcache/cells/CellLifeCycleAware.java → modules/cells/src/main/java/dmg/cells/nucleus/CellLifeCycleAware.java

@@ -1,4 +1,4 @@
-package org.dcache.cells;
+package dmg.cells.nucleus;
 
 /**
  * Classes implementing this method receive Cell life cycle

modules/dcache/src/main/java/org/dcache/cells/CellMessageReceiver.java → modules/cells/src/main/java/dmg/cells/nucleus/CellMessageReceiver.java

@@ -1,4 +1,4 @@
-package org.dcache.cells;
+package dmg.cells.nucleus;
 
 
 /**

modules/dcache/src/main/java/org/dcache/cells/CellMessageSender.java → modules/cells/src/main/java/dmg/cells/nucleus/CellMessageSender.java

@@ -1,6 +1,4 @@
-package org.dcache.cells;
-
-import dmg.cells.nucleus.CellEndpoint;
+package dmg.cells.nucleus;
 
 /**
  * Classes implementing this interface can send Cell messages through

modules/dcache/src/main/java/org/dcache/cells/CellSetupProvider.java → modules/cells/src/main/java/dmg/cells/nucleus/CellSetupProvider.java

@@ -1,4 +1,4 @@
-package org.dcache.cells;
+package dmg.cells.nucleus;
 
 import java.io.PrintWriter;
 

modules/dcache/src/main/java/org/dcache/util/LoginBrokerHandler.java → modules/cells/src/main/java/dmg/cells/services/login/LoginBrokerHandler.java

@@ -1,10 +1,9 @@
-package org.dcache.util;
+package dmg.cells.services.login;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.PrintWriter;
-import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -15,18 +14,17 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import dmg.cells.nucleus.CellCommandListener;
 import dmg.cells.nucleus.CellMessage;
 import dmg.cells.nucleus.CellPath;
 import dmg.cells.nucleus.NoRouteToCellException;
-import dmg.cells.services.login.LoginBrokerInfo;
 import dmg.util.Args;
 
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
+import dmg.cells.nucleus.AbstractCellComponent;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import org.dcache.util.NetworkUtils;
+
+import static java.util.concurrent.TimeUnit.*;
 
 /**
  * Utility class to periodically register a door in a login broker.

modules/dcache-gplazma/src/main/java/org/dcache/auth/Gplazma2LoginStrategy.java

@@ -23,7 +23,7 @@
 import dmg.util.Replaceable;
 
 import org.dcache.auth.attributes.LoginAttribute;
-import org.dcache.cells.CellCommandListener;
+import dmg.cells.nucleus.CellCommandListener;
 import org.dcache.gplazma.AuthenticationException;
 import org.dcache.gplazma.GPlazma;
 import org.dcache.gplazma.NoSuchPrincipalException;

modules/dcache-jms/src/main/java/org/dcache/cells/CellNameService.java

@@ -15,6 +15,8 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
+import dmg.cells.nucleus.AbstractCellComponent;
+
 /**
  * A central lookup service for well known cell names.
  *

modules/dcache-jms/src/main/java/org/dcache/services/topology/JmsCellsTopology.java

@@ -17,7 +17,7 @@
 import dmg.cells.network.CellDomainNode;
 import dmg.util.Args;
 
-import org.dcache.cells.CellCommandListener;
+import dmg.cells.nucleus.CellCommandListener;
 import org.dcache.cells.CellNameService;
 import org.dcache.cells.CellNameServiceRegistry;
 

modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java

@@ -12,7 +12,6 @@
 import io.milton.http.Request;
 import io.milton.http.ResourceFactory;
 import io.milton.resource.Resource;
-import io.milton.servlet.ServletRequest;
 import org.jboss.netty.handler.codec.http.HttpHeaders;
 import org.jboss.netty.handler.codec.http.HttpResponseStatus;
 import org.slf4j.Logger;
@@ -71,9 +70,9 @@
 
 import org.dcache.auth.SubjectWrapper;
 import org.dcache.auth.Subjects;
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.AbstractCellComponent;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.cells.CellStub;
 import org.dcache.missingfiles.AlwaysFailMissingFileStrategy;
 import org.dcache.missingfiles.MissingFileStrategy;

modules/dcache-webdav/src/main/java/org/dcache/webdav/MiltonHandler.java

@@ -19,7 +19,7 @@
 import dmg.cells.nucleus.CellEndpoint;
 import dmg.cells.nucleus.CellInfo;
 
-import org.dcache.cells.CellMessageSender;
+import dmg.cells.nucleus.CellMessageSender;
 import org.dcache.util.Transfer;
 
 /**

modules/dcache-webdav/src/main/resources/org/dcache/webdav/webdav.xml

@@ -192,7 +192,7 @@
   </bean>
 
 
-  <bean id="lb" class="org.dcache.util.LoginBrokerHandler"
+  <bean id="lb" class="dmg.cells.services.login.LoginBrokerHandler"
 	init-method="start" destroy-method="stop">
       <description>Registers the door with a LoginBroker</description>
 

modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/ConnectionTracker.java

@@ -15,7 +15,7 @@
 import dmg.cells.nucleus.CellInfoProvider;
 import dmg.util.Args;
 
-import org.dcache.cells.CellCommandListener;
+import dmg.cells.nucleus.CellCommandListener;
 
 import static org.jboss.netty.channel.Channels.close;
 

modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdDoor.java

@@ -45,9 +45,9 @@
 import dmg.util.Args;
 
 import org.dcache.acl.enums.AccessType;
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.AbstractCellComponent;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.cells.CellStub;
 import org.dcache.cells.MessageCallback;
 import org.dcache.namespace.ACLPermissionHandler;

modules/dcache-xrootd/src/main/java/org/dcache/xrootd/pool/XrootdTransferService.java

@@ -42,7 +42,7 @@
 import dmg.cells.nucleus.CellPath;
 import dmg.cells.nucleus.NoRouteToCellException;
 
-import org.dcache.cells.AbstractCellComponent;
+import dmg.cells.nucleus.AbstractCellComponent;
 import org.dcache.pool.FaultAction;
 import org.dcache.pool.FaultEvent;
 import org.dcache.pool.FaultListener;

modules/dcache-xrootd/src/main/resources/org/dcache/xrootd/door/xrootd.xml

@@ -164,7 +164,7 @@
     <property name="cellStub" ref="gPlazma-stub" />
   </bean>
 
-  <bean id="lb" class="org.dcache.util.LoginBrokerHandler"
+  <bean id="lb" class="dmg.cells.services.login.LoginBrokerHandler"
         init-method="start"
         destroy-method="stop">
     <description>Notifies LoginBroker </description>

modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java

@@ -62,9 +62,9 @@
 import org.dcache.acl.enums.AccessMask;
 import org.dcache.acl.enums.AccessType;
 import org.dcache.auth.Subjects;
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.AbstractCellComponent;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.chimera.UnixPermission;
 import org.dcache.commons.stats.RequestCounters;
 import org.dcache.commons.stats.RequestExecutionTimeGauges;

modules/dcache/src/main/java/diskCacheV111/poolManager/CostModuleV1.java

@@ -40,10 +40,10 @@
 import dmg.cells.nucleus.CellMessage;
 import dmg.util.Args;
 
-import org.dcache.cells.CellCommandListener;
+import dmg.cells.nucleus.CellCommandListener;
 import org.dcache.cells.CellMessageDispatcher;
-import org.dcache.cells.CellMessageReceiver;
-import org.dcache.cells.CellSetupProvider;
+import dmg.cells.nucleus.CellMessageReceiver;
+import dmg.cells.nucleus.CellSetupProvider;
 import org.dcache.namespace.FileAttribute;
 import org.dcache.poolmanager.PoolInfo;
 import org.dcache.vehicles.FileAttributes;

modules/dcache/src/main/java/diskCacheV111/poolManager/PoolManagerV5.java

@@ -54,9 +54,9 @@
 import dmg.cells.nucleus.DelayedReply;
 import dmg.util.Args;
 
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.AbstractCellComponent;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.cells.CellStub;
 import org.dcache.poolmanager.Partition;
 import org.dcache.poolmanager.PoolInfo;

modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnitV2.java

@@ -31,8 +31,8 @@
 import dmg.util.Args;
 import dmg.util.CommandSyntaxException;
 
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellSetupProvider;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellSetupProvider;
 import org.dcache.util.Glob;
 
 public class PoolSelectionUnitV2

modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java

@@ -57,9 +57,9 @@
 import dmg.cells.nucleus.UOID;
 import dmg.util.Args;
 
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.AbstractCellComponent;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.cells.CellStub;
 import org.dcache.poolmanager.Partition;
 import org.dcache.poolmanager.PartitionManager;

modules/dcache/src/main/java/diskCacheV111/services/space/Manager.java

@@ -103,9 +103,9 @@
 
 import org.dcache.auth.FQAN;
 import org.dcache.auth.Subjects;
-import org.dcache.cells.AbstractCellComponent;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.AbstractCellComponent;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.cells.CellStub;
 import org.dcache.namespace.FileAttribute;
 import org.dcache.util.JdbcConnectionPool;

modules/dcache/src/main/java/diskCacheV111/srm/dcache/Storage.java

@@ -161,10 +161,10 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import org.dcache.acl.enums.AccessMask;
 import org.dcache.acl.enums.AccessType;
 import org.dcache.auth.Subjects;
-import org.dcache.cells.AbstractCellComponent;
+import dmg.cells.nucleus.AbstractCellComponent;
 import org.dcache.cells.AbstractMessageCallback;
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellMessageReceiver;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellMessageReceiver;
 import org.dcache.cells.CellStub;
 import org.dcache.commons.util.Strings;
 import org.dcache.namespace.ACLPermissionHandler;
@@ -209,7 +209,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 import org.dcache.srm.v2_2.TRetentionPolicyInfo;
 import org.dcache.srm.v2_2.TReturnStatus;
 import org.dcache.srm.v2_2.TStatusCode;
-import org.dcache.util.LoginBrokerHandler;
+import dmg.cells.services.login.LoginBrokerHandler;
 import org.dcache.util.Version;
 import org.dcache.util.list.DirectoryEntry;
 import org.dcache.util.list.DirectoryListPrinter;

modules/dcache/src/main/java/diskCacheV111/util/HsmSet.java

@@ -13,8 +13,8 @@
 import dmg.util.Args;
 import dmg.util.Formats;
 
-import org.dcache.cells.CellCommandListener;
-import org.dcache.cells.CellSetupProvider;
+import dmg.cells.nucleus.CellCommandListener;
+import dmg.cells.nucleus.CellSetupProvider;
 
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.unmodifiableIterable;

modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java

@@ -32,7 +32,7 @@
 import dmg.cells.nucleus.NoRouteToCellException;
 
 import org.dcache.acl.enums.AccessMask;
-import org.dcache.cells.CellMessageSender;
+import dmg.cells.nucleus.CellMessageSender;
 import org.dcache.cells.CellStub;
 import org.dcache.namespace.FileAttribute;
 import org.dcache.namespace.FileType;

modules/dcache/src/main/java/org/dcache/acl/AclAdmin.java

@@ -16,7 +16,7 @@
 import org.dcache.acl.enums.RsType;
 import org.dcache.acl.parser.ACEParser;
 import org.dcache.auth.Subjects;
-import org.dcache.cells.CellCommandListener;
+import dmg.cells.nucleus.CellCommandListener;
 import org.dcache.namespace.FileAttribute;
 import org.dcache.vehicles.FileAttributes;
 

modules/dcache/src/main/java/org/dcache/cells/AbstractCell.java

@@ -24,6 +24,7 @@
 import dmg.cells.nucleus.CellAddressCore;
 import dmg.cells.nucleus.CellEndpoint;
 import dmg.cells.nucleus.CellMessage;
+import dmg.cells.nucleus.CellMessageReceiver;
 import dmg.cells.nucleus.NoRouteToCellException;
 import dmg.cells.nucleus.Reply;
 import dmg.cells.nucleus.UOID;

modules/dcache/src/main/java/org/dcache/cells/CellMessageDispatcher.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import dmg.cells.nucleus.CellMessage;
+import dmg.cells.nucleus.CellMessageReceiver;
 
 import org.dcache.util.ReflectionUtils;
 

modules/dcache/src/main/java/org/dcache/cells/CellStub.java

@@ -13,6 +13,7 @@
 import dmg.cells.nucleus.CellEndpoint;
 import dmg.cells.nucleus.CellMessage;
 import dmg.cells.nucleus.CellMessageAnswerable;
+import dmg.cells.nucleus.CellMessageSender;
 import dmg.cells.nucleus.CellPath;
 import dmg.cells.nucleus.NoRouteToCellException;
 

modules/dcache/src/main/java/org/dcache/cells/MessageProcessingMonitor.java

@@ -5,10 +5,12 @@
 
 import diskCacheV111.vehicles.Message;
 
+import dmg.cells.nucleus.CellCommandListener;
 import dmg.cells.nucleus.CellEndpoint;
 import dmg.cells.nucleus.CellInfo;
 import dmg.cells.nucleus.CellMessage;
 import dmg.cells.nucleus.CellMessageAnswerable;
+import dmg.cells.nucleus.CellMessageSender;
 import dmg.cells.nucleus.NoRouteToCellException;
 import dmg.cells.nucleus.SerializationException;
 import dmg.util.Args;