From 87dab3100a0bd35c407efbc933e779e7aceb7a21 Mon Sep 17 00:00:00 2001 From: Gerd Behrmann Date: Wed, 27 Nov 2013 13:54:19 +0100 Subject: [PATCH] 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 Patch: http://rb.dcache.org/r/6285/ --- .../cells/nucleus}/AbstractCellComponent.java | 16 ++++----------- .../cells/nucleus}/CellCommandListener.java | 2 +- .../cells/nucleus}/CellLifeCycleAware.java | 2 +- .../cells/nucleus}/CellMessageReceiver.java | 2 +- .../dmg/cells/nucleus}/CellMessageSender.java | 4 +--- .../dmg/cells/nucleus}/CellSetupProvider.java | 2 +- .../services/login}/LoginBrokerHandler.java | 14 ++++++------- .../dcache/auth/Gplazma2LoginStrategy.java | 2 +- .../org/dcache/cells/CellNameService.java | 2 ++ .../services/topology/JmsCellsTopology.java | 2 +- .../dcache/webdav/DcacheResourceFactory.java | 7 +++---- .../java/org/dcache/webdav/MiltonHandler.java | 2 +- .../resources/org/dcache/webdav/webdav.xml | 2 +- .../dcache/xrootd/door/ConnectionTracker.java | 2 +- .../org/dcache/xrootd/door/XrootdDoor.java | 6 +++--- .../xrootd/pool/XrootdTransferService.java | 2 +- .../org/dcache/xrootd/door/xrootd.xml | 2 +- .../namespace/PnfsManagerV3.java | 6 +++--- .../poolManager/CostModuleV1.java | 6 +++--- .../poolManager/PoolManagerV5.java | 6 +++--- .../poolManager/PoolSelectionUnitV2.java | 4 ++-- .../poolManager/RequestContainerV5.java | 6 +++--- .../diskCacheV111/services/space/Manager.java | 6 +++--- .../diskCacheV111/srm/dcache/Storage.java | 8 ++++---- .../main/java/diskCacheV111/util/HsmSet.java | 4 ++-- .../java/diskCacheV111/util/PnfsHandler.java | 2 +- .../main/java/org/dcache/acl/AclAdmin.java | 2 +- .../java/org/dcache/cells/AbstractCell.java | 1 + .../dcache/cells/CellMessageDispatcher.java | 1 + .../main/java/org/dcache/cells/CellStub.java | 1 + .../cells/MessageProcessingMonitor.java | 2 ++ .../org/dcache/cells/ThreadFactoryAware.java | 13 ------------ .../org/dcache/cells/UniversalSpringCell.java | 20 +++++-------------- .../chimera/nfsv41/door/NFSv41Door.java | 8 ++++---- .../nfsv41/mover/NfsTransferService.java | 4 ++-- .../org/dcache/http/HttpTransferService.java | 2 +- .../missingfiles/MissingFileHandler.java | 2 +- .../pinmanager/MovePinRequestProcessor.java | 2 +- .../org/dcache/pinmanager/PinManager.java | 2 +- .../org/dcache/pinmanager/PinManagerCLI.java | 4 ++-- .../pinmanager/PinRequestProcessor.java | 2 +- .../pinmanager/UnpinRequestProcessor.java | 2 +- .../dcache/pool/classic/ChecksumModuleV1.java | 4 ++-- .../dcache/pool/classic/ChecksumScanner.java | 4 ++-- .../classic/DefaultPostTransferService.java | 2 +- .../pool/classic/HsmFlushController.java | 6 +++--- .../pool/classic/HsmStorageHandler2.java | 4 ++-- .../pool/classic/JobTimeoutManager.java | 4 ++-- .../classic/MoverProtocolTransferService.java | 4 ++-- .../java/org/dcache/pool/classic/PoolV4.java | 6 +++--- .../dcache/pool/classic/SpaceSweeper2.java | 2 +- .../pool/classic/StorageClassContainer.java | 4 ++-- .../pool/migration/MigrationModule.java | 6 +++--- .../pool/migration/MigrationModuleServer.java | 4 ++-- .../java/org/dcache/pool/p2p/P2PClient.java | 6 +++--- .../repository/RepositoryInterpreter.java | 2 +- .../pool/repository/v5/CacheRepositoryV5.java | 4 ++-- .../dcache/poolmanager/PartitionManager.java | 4 ++-- .../org/dcache/poolmanager/Rebalancer.java | 2 +- .../services/billing/cells/BillingCell.java | 4 ++-- .../receivers/BillingInfoMessageReceiver.java | 4 ++-- .../receivers/HistogramRequestReceiver.java | 2 +- .../NOPHistogramRequestReceiver.java | 2 +- .../hsmcleaner/PoolInformationBase.java | 2 +- .../services/hsmcleaner/RequestTracker.java | 2 +- .../services/httpd/HttpServiceCell.java | 6 +++--- .../dcache/services/info/InfoProvider.java | 4 ++-- .../services/info/base/StateMaintainer.java | 2 +- .../info/gathers/MessageHandlerChain.java | 2 +- .../services/login/CachingLoginStrategy.java | 2 +- .../org/dcache/services/login/LoginCLI.java | 2 +- .../dcache/services/login/MessageHandler.java | 2 +- .../services/ssh2/ConsoleReaderFactory.java | 2 +- .../services/ssh2/PcellsSubsystemFactory.java | 2 +- .../org/dcache/services/ssh2/Ssh2Admin.java | 4 ++-- .../topology/AbstractCellsTopology.java | 2 +- .../topology/CellsTopologyInterpreter.java | 2 +- .../topology/ClassicCellsTopology.java | 2 +- .../util/list/ListDirectoryHandler.java | 2 +- .../main/resources/diskCacheV111/srm/srm.xml | 2 +- .../chimera/nfsv41/door/nfsv41-common.xml | 2 +- .../dcache/pinmanager/PinManagerTests.java | 2 +- .../tests/util/CellMessageDispatcherTest.java | 2 +- 83 files changed, 143 insertions(+), 172 deletions(-) rename modules/{dcache/src/main/java/org/dcache/cells => cells/src/main/java/dmg/cells/nucleus}/AbstractCellComponent.java (92%) rename modules/{dcache/src/main/java/org/dcache/cells => cells/src/main/java/dmg/cells/nucleus}/CellCommandListener.java (90%) rename modules/{dcache/src/main/java/org/dcache/cells => cells/src/main/java/dmg/cells/nucleus}/CellLifeCycleAware.java (91%) rename modules/{dcache/src/main/java/org/dcache/cells => cells/src/main/java/dmg/cells/nucleus}/CellMessageReceiver.java (92%) rename modules/{dcache/src/main/java/org/dcache/cells => cells/src/main/java/dmg/cells/nucleus}/CellMessageSender.java (78%) rename modules/{dcache/src/main/java/org/dcache/cells => cells/src/main/java/dmg/cells/nucleus}/CellSetupProvider.java (96%) rename modules/{dcache/src/main/java/org/dcache/util => cells/src/main/java/dmg/cells/services/login}/LoginBrokerHandler.java (96%) delete mode 100644 modules/dcache/src/main/java/org/dcache/cells/ThreadFactoryAware.java diff --git a/modules/dcache/src/main/java/org/dcache/cells/AbstractCellComponent.java b/modules/cells/src/main/java/dmg/cells/nucleus/AbstractCellComponent.java similarity index 92% rename from modules/dcache/src/main/java/org/dcache/cells/AbstractCellComponent.java rename to modules/cells/src/main/java/dmg/cells/nucleus/AbstractCellComponent.java index 77a4bab4e56..46e3e29670b 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/AbstractCellComponent.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellCommandListener.java b/modules/cells/src/main/java/dmg/cells/nucleus/CellCommandListener.java similarity index 90% rename from modules/dcache/src/main/java/org/dcache/cells/CellCommandListener.java rename to modules/cells/src/main/java/dmg/cells/nucleus/CellCommandListener.java index a43b72932ad..43dfeeb44b7 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellCommandListener.java +++ b/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 diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellLifeCycleAware.java b/modules/cells/src/main/java/dmg/cells/nucleus/CellLifeCycleAware.java similarity index 91% rename from modules/dcache/src/main/java/org/dcache/cells/CellLifeCycleAware.java rename to modules/cells/src/main/java/dmg/cells/nucleus/CellLifeCycleAware.java index f7919b3a78b..58e0ac8d00d 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellLifeCycleAware.java +++ b/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 diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellMessageReceiver.java b/modules/cells/src/main/java/dmg/cells/nucleus/CellMessageReceiver.java similarity index 92% rename from modules/dcache/src/main/java/org/dcache/cells/CellMessageReceiver.java rename to modules/cells/src/main/java/dmg/cells/nucleus/CellMessageReceiver.java index ba22375d510..7556c8100a2 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellMessageReceiver.java +++ b/modules/cells/src/main/java/dmg/cells/nucleus/CellMessageReceiver.java @@ -1,4 +1,4 @@ -package org.dcache.cells; +package dmg.cells.nucleus; /** diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellMessageSender.java b/modules/cells/src/main/java/dmg/cells/nucleus/CellMessageSender.java similarity index 78% rename from modules/dcache/src/main/java/org/dcache/cells/CellMessageSender.java rename to modules/cells/src/main/java/dmg/cells/nucleus/CellMessageSender.java index d0b5a97779d..d19373edb0f 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellMessageSender.java +++ b/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 diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellSetupProvider.java b/modules/cells/src/main/java/dmg/cells/nucleus/CellSetupProvider.java similarity index 96% rename from modules/dcache/src/main/java/org/dcache/cells/CellSetupProvider.java rename to modules/cells/src/main/java/dmg/cells/nucleus/CellSetupProvider.java index ba793c6244d..bb75f03691b 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellSetupProvider.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/util/LoginBrokerHandler.java b/modules/cells/src/main/java/dmg/cells/services/login/LoginBrokerHandler.java similarity index 96% rename from modules/dcache/src/main/java/org/dcache/util/LoginBrokerHandler.java rename to modules/cells/src/main/java/dmg/cells/services/login/LoginBrokerHandler.java index a03d175dfaf..24a43e2dc98 100644 --- a/modules/dcache/src/main/java/org/dcache/util/LoginBrokerHandler.java +++ b/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. diff --git a/modules/dcache-gplazma/src/main/java/org/dcache/auth/Gplazma2LoginStrategy.java b/modules/dcache-gplazma/src/main/java/org/dcache/auth/Gplazma2LoginStrategy.java index 0e708fad536..2d90ef383df 100644 --- a/modules/dcache-gplazma/src/main/java/org/dcache/auth/Gplazma2LoginStrategy.java +++ b/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; diff --git a/modules/dcache-jms/src/main/java/org/dcache/cells/CellNameService.java b/modules/dcache-jms/src/main/java/org/dcache/cells/CellNameService.java index 33520eff840..be0335f5182 100644 --- a/modules/dcache-jms/src/main/java/org/dcache/cells/CellNameService.java +++ b/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. * diff --git a/modules/dcache-jms/src/main/java/org/dcache/services/topology/JmsCellsTopology.java b/modules/dcache-jms/src/main/java/org/dcache/services/topology/JmsCellsTopology.java index 14382e10565..678c3371130 100644 --- a/modules/dcache-jms/src/main/java/org/dcache/services/topology/JmsCellsTopology.java +++ b/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; diff --git a/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java b/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java index b2211540ca2..cf78fadd69a 100644 --- a/modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java +++ b/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; diff --git a/modules/dcache-webdav/src/main/java/org/dcache/webdav/MiltonHandler.java b/modules/dcache-webdav/src/main/java/org/dcache/webdav/MiltonHandler.java index a9729bd6ff0..5781a0ffb3d 100644 --- a/modules/dcache-webdav/src/main/java/org/dcache/webdav/MiltonHandler.java +++ b/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; /** diff --git a/modules/dcache-webdav/src/main/resources/org/dcache/webdav/webdav.xml b/modules/dcache-webdav/src/main/resources/org/dcache/webdav/webdav.xml index e37f12cecd0..ee5a8c5d325 100644 --- a/modules/dcache-webdav/src/main/resources/org/dcache/webdav/webdav.xml +++ b/modules/dcache-webdav/src/main/resources/org/dcache/webdav/webdav.xml @@ -192,7 +192,7 @@ - Registers the door with a LoginBroker diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/ConnectionTracker.java b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/ConnectionTracker.java index e6a5c960c9e..c80063babd2 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/ConnectionTracker.java +++ b/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; diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdDoor.java b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdDoor.java index 7e0fefb94a8..9bbd0b1d0a9 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdDoor.java +++ b/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; diff --git a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/pool/XrootdTransferService.java b/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/pool/XrootdTransferService.java index 1aab7955b70..fdce2a79371 100644 --- a/modules/dcache-xrootd/src/main/java/org/dcache/xrootd/pool/XrootdTransferService.java +++ b/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; diff --git a/modules/dcache-xrootd/src/main/resources/org/dcache/xrootd/door/xrootd.xml b/modules/dcache-xrootd/src/main/resources/org/dcache/xrootd/door/xrootd.xml index ff5a827b604..45e243d1e0c 100644 --- a/modules/dcache-xrootd/src/main/resources/org/dcache/xrootd/door/xrootd.xml +++ b/modules/dcache-xrootd/src/main/resources/org/dcache/xrootd/door/xrootd.xml @@ -164,7 +164,7 @@ - Notifies LoginBroker diff --git a/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java b/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java index fbfe44a79ff..dea527febda 100644 --- a/modules/dcache/src/main/java/diskCacheV111/namespace/PnfsManagerV3.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/CostModuleV1.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/CostModuleV1.java index 303b45f208b..20b913cb3d9 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/CostModuleV1.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolManagerV5.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolManagerV5.java index 82d6ee67c42..348dec6b88c 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolManagerV5.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnitV2.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnitV2.java index e5b9331e546..281bea76c2a 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolSelectionUnitV2.java +++ b/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 diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java index b008fd59574..dc78750db73 100644 --- a/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/services/space/Manager.java b/modules/dcache/src/main/java/diskCacheV111/services/space/Manager.java index cfea2efd5fa..813138c527f 100644 --- a/modules/dcache/src/main/java/diskCacheV111/services/space/Manager.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/srm/dcache/Storage.java b/modules/dcache/src/main/java/diskCacheV111/srm/dcache/Storage.java index 742786052b5..fcd7c8f97f0 100644 --- a/modules/dcache/src/main/java/diskCacheV111/srm/dcache/Storage.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/util/HsmSet.java b/modules/dcache/src/main/java/diskCacheV111/util/HsmSet.java index c5cd118b85c..8314f127a21 100644 --- a/modules/dcache/src/main/java/diskCacheV111/util/HsmSet.java +++ b/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; diff --git a/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java b/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java index 6dcdde4baa3..04df30f61f2 100644 --- a/modules/dcache/src/main/java/diskCacheV111/util/PnfsHandler.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/acl/AclAdmin.java b/modules/dcache/src/main/java/org/dcache/acl/AclAdmin.java index feda91768d6..a1521238d22 100644 --- a/modules/dcache/src/main/java/org/dcache/acl/AclAdmin.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/cells/AbstractCell.java b/modules/dcache/src/main/java/org/dcache/cells/AbstractCell.java index 327be107da3..6ae0de28b09 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/AbstractCell.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellMessageDispatcher.java b/modules/dcache/src/main/java/org/dcache/cells/CellMessageDispatcher.java index b7f461b8db6..379492572cb 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellMessageDispatcher.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/cells/CellStub.java b/modules/dcache/src/main/java/org/dcache/cells/CellStub.java index 6f7a0a4c95e..d92e9d75637 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/CellStub.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/cells/MessageProcessingMonitor.java b/modules/dcache/src/main/java/org/dcache/cells/MessageProcessingMonitor.java index 0d12a744057..4342126e808 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/MessageProcessingMonitor.java +++ b/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; diff --git a/modules/dcache/src/main/java/org/dcache/cells/ThreadFactoryAware.java b/modules/dcache/src/main/java/org/dcache/cells/ThreadFactoryAware.java deleted file mode 100644 index 507e4f3781c..00000000000 --- a/modules/dcache/src/main/java/org/dcache/cells/ThreadFactoryAware.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dcache.cells; - -import java.util.concurrent.ThreadFactory; - -/** - * Classes implementing this interface can be provided with a thread - * factory. The intention is that internal threads are created through - * this factory. - */ -public interface ThreadFactoryAware -{ - void setThreadFactory(ThreadFactory factory); -} diff --git a/modules/dcache/src/main/java/org/dcache/cells/UniversalSpringCell.java b/modules/dcache/src/main/java/org/dcache/cells/UniversalSpringCell.java index 7b7d9a37e87..0430c99f19d 100644 --- a/modules/dcache/src/main/java/org/dcache/cells/UniversalSpringCell.java +++ b/modules/dcache/src/main/java/org/dcache/cells/UniversalSpringCell.java @@ -58,10 +58,15 @@ import diskCacheV111.util.CacheException; +import dmg.cells.nucleus.CellCommandListener; import dmg.cells.nucleus.CellInfo; import dmg.cells.nucleus.CellInfoProvider; +import dmg.cells.nucleus.CellLifeCycleAware; import dmg.cells.nucleus.CellMessage; +import dmg.cells.nucleus.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageSender; import dmg.cells.nucleus.CellPath; +import dmg.cells.nucleus.CellSetupProvider; import dmg.cells.nucleus.DomainContextAware; import dmg.cells.nucleus.EnvironmentAware; import dmg.cells.nucleus.NoRouteToCellException; @@ -950,17 +955,6 @@ public void addLifeCycleAwareBean(CellLifeCycleAware bean) _lifeCycleAware.add(bean); } - /** - * Registers a thread factory aware bean. Thread factory aware - * bean provide hooks for registering thread factories. This - * method registers the Cell nulceus thread factory on the bean. - */ - public void addThreadFactoryAwareBean(ThreadFactoryAware bean) - { - bean.setThreadFactory(getNucleus()); - } - - /** * Part of the BeanPostProcessor implementation. Recognizes beans * implementing CellCommandListener, CellInfoProvider, @@ -996,10 +990,6 @@ public Object postProcessBeforeInitialization(Object bean, addLifeCycleAwareBean((CellLifeCycleAware) bean); } - if (bean instanceof ThreadFactoryAware) { - addThreadFactoryAwareBean((ThreadFactoryAware) bean); - } - if (bean instanceof EnvironmentAware) { ((EnvironmentAware) bean).setEnvironment(_environment); } diff --git a/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java b/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java index 1d8e0792c82..62e6ed733e9 100644 --- a/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java +++ b/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/door/NFSv41Door.java @@ -45,9 +45,9 @@ import java.util.Set; 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.chimera.FsInode; import org.dcache.chimera.FsInodeType; @@ -85,7 +85,7 @@ import org.dcache.chimera.nfsv41.mover.NFS4ProtocolInfo; import org.dcache.commons.stats.RequestExecutionTimeGauges; import org.dcache.commons.util.NDC; -import org.dcache.util.LoginBrokerHandler; +import dmg.cells.services.login.LoginBrokerHandler; import org.dcache.util.RedirectedTransfer; import org.dcache.util.Transfer; import org.dcache.util.TransferRetryPolicy; diff --git a/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/mover/NfsTransferService.java b/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/mover/NfsTransferService.java index d3ae38ec510..035949bcc0e 100644 --- a/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/mover/NfsTransferService.java +++ b/modules/dcache/src/main/java/org/dcache/chimera/nfsv41/mover/NfsTransferService.java @@ -20,8 +20,8 @@ import dmg.cells.nucleus.NoRouteToCellException; import dmg.util.Args; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.cells.CellStub; import org.dcache.chimera.ChimeraFsException; import org.dcache.nfs.v4.NFS4Client; diff --git a/modules/dcache/src/main/java/org/dcache/http/HttpTransferService.java b/modules/dcache/src/main/java/org/dcache/http/HttpTransferService.java index 4241108fa5e..696803d7390 100644 --- a/modules/dcache/src/main/java/org/dcache/http/HttpTransferService.java +++ b/modules/dcache/src/main/java/org/dcache/http/HttpTransferService.java @@ -47,7 +47,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; diff --git a/modules/dcache/src/main/java/org/dcache/missingfiles/MissingFileHandler.java b/modules/dcache/src/main/java/org/dcache/missingfiles/MissingFileHandler.java index e7171de29c7..d2d093e7415 100644 --- a/modules/dcache/src/main/java/org/dcache/missingfiles/MissingFileHandler.java +++ b/modules/dcache/src/main/java/org/dcache/missingfiles/MissingFileHandler.java @@ -12,7 +12,7 @@ import dmg.cells.nucleus.Reply; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.cells.MessageReply; import org.dcache.missingfiles.plugins.Plugin; import org.dcache.missingfiles.plugins.PluginChain; diff --git a/modules/dcache/src/main/java/org/dcache/pinmanager/MovePinRequestProcessor.java b/modules/dcache/src/main/java/org/dcache/pinmanager/MovePinRequestProcessor.java index 297bfe0c0cd..500bdbdd7f0 100644 --- a/modules/dcache/src/main/java/org/dcache/pinmanager/MovePinRequestProcessor.java +++ b/modules/dcache/src/main/java/org/dcache/pinmanager/MovePinRequestProcessor.java @@ -21,7 +21,7 @@ import dmg.cells.nucleus.CellPath; import org.dcache.auth.Subjects; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.cells.CellStub; import org.dcache.pinmanager.model.Pin; import org.dcache.pool.repository.StickyRecord; diff --git a/modules/dcache/src/main/java/org/dcache/pinmanager/PinManager.java b/modules/dcache/src/main/java/org/dcache/pinmanager/PinManager.java index 69b29f3bc91..7174f822815 100644 --- a/modules/dcache/src/main/java/org/dcache/pinmanager/PinManager.java +++ b/modules/dcache/src/main/java/org/dcache/pinmanager/PinManager.java @@ -12,7 +12,7 @@ import diskCacheV111.vehicles.PoolRemoveFilesMessage; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.cells.CellStub; import org.dcache.poolmanager.PoolMonitor; import org.dcache.util.FireAndForgetTask; diff --git a/modules/dcache/src/main/java/org/dcache/pinmanager/PinManagerCLI.java b/modules/dcache/src/main/java/org/dcache/pinmanager/PinManagerCLI.java index 49bcc519099..22b65130fb6 100644 --- a/modules/dcache/src/main/java/org/dcache/pinmanager/PinManagerCLI.java +++ b/modules/dcache/src/main/java/org/dcache/pinmanager/PinManagerCLI.java @@ -30,8 +30,8 @@ import dmg.util.command.Argument; import dmg.util.command.Command; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.cells.CellStub; import org.dcache.namespace.FileAttribute; import org.dcache.pinmanager.model.Pin; diff --git a/modules/dcache/src/main/java/org/dcache/pinmanager/PinRequestProcessor.java b/modules/dcache/src/main/java/org/dcache/pinmanager/PinRequestProcessor.java index 807898253b6..eb91c139518 100644 --- a/modules/dcache/src/main/java/org/dcache/pinmanager/PinRequestProcessor.java +++ b/modules/dcache/src/main/java/org/dcache/pinmanager/PinRequestProcessor.java @@ -30,7 +30,7 @@ import dmg.cells.nucleus.CellPath; import org.dcache.cells.AbstractMessageCallback; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.cells.CellStub; import org.dcache.cells.MessageReply; import org.dcache.namespace.FileAttribute; diff --git a/modules/dcache/src/main/java/org/dcache/pinmanager/UnpinRequestProcessor.java b/modules/dcache/src/main/java/org/dcache/pinmanager/UnpinRequestProcessor.java index 2ecf2d2c4a3..7b618f50a6a 100644 --- a/modules/dcache/src/main/java/org/dcache/pinmanager/UnpinRequestProcessor.java +++ b/modules/dcache/src/main/java/org/dcache/pinmanager/UnpinRequestProcessor.java @@ -9,7 +9,7 @@ import diskCacheV111.util.PermissionDeniedCacheException; import diskCacheV111.util.PnfsId; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.pinmanager.model.Pin; /** diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumModuleV1.java b/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumModuleV1.java index 6f896c4c8bd..1dcb522ac64 100755 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumModuleV1.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumModuleV1.java @@ -41,8 +41,8 @@ import dmg.util.command.Command; import dmg.util.command.Option; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.pool.repository.ReplicaDescriptor; import org.dcache.util.Checksum; import org.dcache.util.ChecksumType; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumScanner.java b/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumScanner.java index 09bf8b00d0c..a7eda8529ea 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumScanner.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/ChecksumScanner.java @@ -28,8 +28,8 @@ import dmg.util.Args; -import org.dcache.cells.CellCommandListener; -import org.dcache.cells.CellLifeCycleAware; +import dmg.cells.nucleus.CellCommandListener; +import dmg.cells.nucleus.CellLifeCycleAware; import org.dcache.pool.repository.EntryState; import org.dcache.pool.repository.IllegalTransitionException; import org.dcache.pool.repository.ReplicaDescriptor; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java b/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java index de45df41f17..c3c53890722 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java @@ -35,7 +35,7 @@ import dmg.cells.nucleus.NoRouteToCellException; -import org.dcache.cells.AbstractCellComponent; +import dmg.cells.nucleus.AbstractCellComponent; import org.dcache.cells.CellStub; import org.dcache.pool.FaultAction; import org.dcache.pool.FaultEvent; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/HsmFlushController.java b/modules/dcache/src/main/java/org/dcache/pool/classic/HsmFlushController.java index 09827ab6c60..096cb12ad03 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/HsmFlushController.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/HsmFlushController.java @@ -30,9 +30,9 @@ import dmg.util.command.Command; import dmg.util.command.Option; -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.util.FireAndForgetTask; import static com.google.common.base.Preconditions.checkArgument; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/HsmStorageHandler2.java b/modules/dcache/src/main/java/org/dcache/pool/classic/HsmStorageHandler2.java index c13cc6a90d1..f27d48825c9 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/HsmStorageHandler2.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/HsmStorageHandler2.java @@ -64,9 +64,9 @@ import dmg.util.command.Command; import dmg.util.command.Option; -import org.dcache.cells.AbstractCellComponent; +import dmg.cells.nucleus.AbstractCellComponent; import org.dcache.cells.CellStub; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.namespace.FileAttribute; import org.dcache.pool.repository.EntryState; import org.dcache.pool.repository.IllegalTransitionException; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/JobTimeoutManager.java b/modules/dcache/src/main/java/org/dcache/pool/classic/JobTimeoutManager.java index cb67ee265fa..f4383a287da 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/JobTimeoutManager.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/JobTimeoutManager.java @@ -12,8 +12,8 @@ import dmg.util.Args; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; class SchedulerEntry { diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/MoverProtocolTransferService.java b/modules/dcache/src/main/java/org/dcache/pool/classic/MoverProtocolTransferService.java index c25d6c114e6..2ed772d4744 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/MoverProtocolTransferService.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/MoverProtocolTransferService.java @@ -26,8 +26,8 @@ import dmg.util.command.Argument; import dmg.util.command.Command; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.pool.FaultAction; import org.dcache.pool.FaultEvent; import org.dcache.pool.FaultListener; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/PoolV4.java b/modules/dcache/src/main/java/org/dcache/pool/classic/PoolV4.java index 4272e669ec3..e814fe90784 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/PoolV4.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/PoolV4.java @@ -76,9 +76,9 @@ import dmg.util.Args; import dmg.util.CommandSyntaxException; -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.pool.FaultEvent; import org.dcache.pool.FaultListener; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/SpaceSweeper2.java b/modules/dcache/src/main/java/org/dcache/pool/classic/SpaceSweeper2.java index f8030921e21..a53b2164319 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/SpaceSweeper2.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/SpaceSweeper2.java @@ -21,7 +21,7 @@ import dmg.util.Args; import dmg.util.Formats; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.namespace.FileAttribute; import org.dcache.pool.repository.Account; import org.dcache.pool.repository.CacheEntry; diff --git a/modules/dcache/src/main/java/org/dcache/pool/classic/StorageClassContainer.java b/modules/dcache/src/main/java/org/dcache/pool/classic/StorageClassContainer.java index 870d9841589..c6bb584dafa 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/classic/StorageClassContainer.java +++ b/modules/dcache/src/main/java/org/dcache/pool/classic/StorageClassContainer.java @@ -22,8 +22,8 @@ import dmg.util.command.Command; import dmg.util.command.Option; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.pool.repository.CacheEntry; import org.dcache.pool.repository.Repository; diff --git a/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java b/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java index bf78ad19b39..f3a6c31dcb0 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java +++ b/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModule.java @@ -35,9 +35,9 @@ import dmg.util.command.CommandLine; import dmg.util.command.Option; -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.pool.repository.CacheEntry; import org.dcache.pool.repository.EntryState; diff --git a/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModuleServer.java b/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModuleServer.java index 3774d29b17f..22e9d03475e 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModuleServer.java +++ b/modules/dcache/src/main/java/org/dcache/pool/migration/MigrationModuleServer.java @@ -25,8 +25,8 @@ import dmg.cells.nucleus.CellPath; import dmg.cells.nucleus.NoRouteToCellException; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.pool.classic.ChecksumModule; import org.dcache.pool.p2p.P2PClient; import org.dcache.pool.repository.EntryState; diff --git a/modules/dcache/src/main/java/org/dcache/pool/p2p/P2PClient.java b/modules/dcache/src/main/java/org/dcache/pool/p2p/P2PClient.java index c32d4bec262..c8fc669e944 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/p2p/P2PClient.java +++ b/modules/dcache/src/main/java/org/dcache/pool/p2p/P2PClient.java @@ -25,9 +25,9 @@ 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.pool.classic.ChecksumModule; import org.dcache.pool.repository.EntryState; diff --git a/modules/dcache/src/main/java/org/dcache/pool/repository/RepositoryInterpreter.java b/modules/dcache/src/main/java/org/dcache/pool/repository/RepositoryInterpreter.java index 9f539a28817..9098b557c67 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/repository/RepositoryInterpreter.java +++ b/modules/dcache/src/main/java/org/dcache/pool/repository/RepositoryInterpreter.java @@ -17,7 +17,7 @@ import dmg.util.Args; import dmg.util.Formats; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; import static com.google.common.base.Preconditions.checkArgument; diff --git a/modules/dcache/src/main/java/org/dcache/pool/repository/v5/CacheRepositoryV5.java b/modules/dcache/src/main/java/org/dcache/pool/repository/v5/CacheRepositoryV5.java index 7a21cf41aa4..46463ed4fc9 100644 --- a/modules/dcache/src/main/java/org/dcache/pool/repository/v5/CacheRepositoryV5.java +++ b/modules/dcache/src/main/java/org/dcache/pool/repository/v5/CacheRepositoryV5.java @@ -27,8 +27,8 @@ import dmg.util.Args; -import org.dcache.cells.AbstractCellComponent; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.AbstractCellComponent; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.pool.FaultAction; import org.dcache.pool.FaultEvent; import org.dcache.pool.FaultListener; diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/PartitionManager.java b/modules/dcache/src/main/java/org/dcache/poolmanager/PartitionManager.java index ca74b16d449..5673a82a27b 100644 --- a/modules/dcache/src/main/java/org/dcache/poolmanager/PartitionManager.java +++ b/modules/dcache/src/main/java/org/dcache/poolmanager/PartitionManager.java @@ -15,8 +15,8 @@ import dmg.util.Args; import dmg.util.CommandException; -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.base.Predicates.*; import static com.google.common.collect.Iterables.find; diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/Rebalancer.java b/modules/dcache/src/main/java/org/dcache/poolmanager/Rebalancer.java index 4c3b374a9ae..d4f1c0e32e9 100644 --- a/modules/dcache/src/main/java/org/dcache/poolmanager/Rebalancer.java +++ b/modules/dcache/src/main/java/org/dcache/poolmanager/Rebalancer.java @@ -16,7 +16,7 @@ import dmg.cells.nucleus.CellPath; import dmg.util.Args; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; import org.dcache.cells.CellStub; import org.dcache.pool.migration.PoolMigrationJobCancelMessage; diff --git a/modules/dcache/src/main/java/org/dcache/services/billing/cells/BillingCell.java b/modules/dcache/src/main/java/org/dcache/services/billing/cells/BillingCell.java index 98cb8297475..9a232eefd50 100644 --- a/modules/dcache/src/main/java/org/dcache/services/billing/cells/BillingCell.java +++ b/modules/dcache/src/main/java/org/dcache/services/billing/cells/BillingCell.java @@ -36,8 +36,8 @@ import dmg.util.Formats; import dmg.util.Replaceable; -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.util.Slf4jSTErrorListener; diff --git a/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/BillingInfoMessageReceiver.java b/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/BillingInfoMessageReceiver.java index 9b5f6ccc726..2a84b5206fa 100644 --- a/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/BillingInfoMessageReceiver.java +++ b/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/BillingInfoMessageReceiver.java @@ -74,8 +74,8 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import dmg.util.command.Argument; import dmg.util.command.Command; -import org.dcache.cells.CellCommandListener; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellCommandListener; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.services.billing.db.IBillingInfoAccess; import org.dcache.services.billing.db.data.DoorRequestData; import org.dcache.services.billing.db.data.MoverData; diff --git a/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/HistogramRequestReceiver.java b/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/HistogramRequestReceiver.java index 01e08ef1a2f..8ca4f3cd66b 100644 --- a/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/HistogramRequestReceiver.java +++ b/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/HistogramRequestReceiver.java @@ -120,7 +120,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import java.lang.reflect.Method; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.services.billing.histograms.data.ITimeFrameHistogramDataService; import org.dcache.services.billing.histograms.data.TimeFrameHistogramData; import org.dcache.vehicles.billing.HistogramRequestMessage; diff --git a/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/NOPHistogramRequestReceiver.java b/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/NOPHistogramRequestReceiver.java index 0e78fc6886e..07f1446cd86 100644 --- a/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/NOPHistogramRequestReceiver.java +++ b/modules/dcache/src/main/java/org/dcache/services/billing/cells/receivers/NOPHistogramRequestReceiver.java @@ -120,7 +120,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING import diskCacheV111.util.ServiceUnavailableException; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.vehicles.billing.HistogramRequestMessage; /** diff --git a/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/PoolInformationBase.java b/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/PoolInformationBase.java index 2bc52f9e8cc..445f90ed478 100644 --- a/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/PoolInformationBase.java +++ b/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/PoolInformationBase.java @@ -10,7 +10,7 @@ import dmg.util.Args; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; /** * Maintains an index of available pools. diff --git a/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/RequestTracker.java b/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/RequestTracker.java index dea8b95ebf3..59634cf61a8 100644 --- a/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/RequestTracker.java +++ b/modules/dcache/src/main/java/org/dcache/services/hsmcleaner/RequestTracker.java @@ -20,7 +20,7 @@ import dmg.cells.nucleus.NoRouteToCellException; import dmg.util.Args; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.cells.CellStub; /** diff --git a/modules/dcache/src/main/java/org/dcache/services/httpd/HttpServiceCell.java b/modules/dcache/src/main/java/org/dcache/services/httpd/HttpServiceCell.java index 7f7d7a05779..a93cf67d88d 100644 --- a/modules/dcache/src/main/java/org/dcache/services/httpd/HttpServiceCell.java +++ b/modules/dcache/src/main/java/org/dcache/services/httpd/HttpServiceCell.java @@ -33,9 +33,9 @@ import dmg.util.Args; import dmg.util.CommandInterpreter; -import org.dcache.cells.CellCommandListener; -import org.dcache.cells.CellMessageReceiver; -import org.dcache.cells.CellMessageSender; +import dmg.cells.nucleus.CellCommandListener; +import dmg.cells.nucleus.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageSender; import org.dcache.services.httpd.handlers.HandlerDelegator; import org.dcache.services.httpd.util.AliasEntry; import org.dcache.util.Crypto; diff --git a/modules/dcache/src/main/java/org/dcache/services/info/InfoProvider.java b/modules/dcache/src/main/java/org/dcache/services/info/InfoProvider.java index a26ec85c3c8..4a6ac17d236 100644 --- a/modules/dcache/src/main/java/org/dcache/services/info/InfoProvider.java +++ b/modules/dcache/src/main/java/org/dcache/services/info/InfoProvider.java @@ -14,8 +14,8 @@ import dmg.cells.nucleus.CellInfoProvider; import dmg.util.Args; -import org.dcache.cells.CellCommandListener; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellCommandListener; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.services.info.base.BadStatePathException; import org.dcache.services.info.base.State; import org.dcache.services.info.base.StateObservatory; diff --git a/modules/dcache/src/main/java/org/dcache/services/info/base/StateMaintainer.java b/modules/dcache/src/main/java/org/dcache/services/info/base/StateMaintainer.java index 4eb6febbb03..bbbf203f08e 100644 --- a/modules/dcache/src/main/java/org/dcache/services/info/base/StateMaintainer.java +++ b/modules/dcache/src/main/java/org/dcache/services/info/base/StateMaintainer.java @@ -16,7 +16,7 @@ import dmg.cells.nucleus.CellEndpoint; import dmg.cells.nucleus.CellInfo; -import org.dcache.cells.CellMessageSender; +import dmg.cells.nucleus.CellMessageSender; import org.dcache.commons.util.NDC; import org.dcache.util.FireAndForgetTask; diff --git a/modules/dcache/src/main/java/org/dcache/services/info/gathers/MessageHandlerChain.java b/modules/dcache/src/main/java/org/dcache/services/info/gathers/MessageHandlerChain.java index 09c5cd4f99d..5a9029c8aab 100644 --- a/modules/dcache/src/main/java/org/dcache/services/info/gathers/MessageHandlerChain.java +++ b/modules/dcache/src/main/java/org/dcache/services/info/gathers/MessageHandlerChain.java @@ -20,7 +20,7 @@ import dmg.cells.nucleus.SerializationException; import dmg.cells.nucleus.UOID; -import org.dcache.cells.CellMessageSender; +import dmg.cells.nucleus.CellMessageSender; /** diff --git a/modules/dcache/src/main/java/org/dcache/services/login/CachingLoginStrategy.java b/modules/dcache/src/main/java/org/dcache/services/login/CachingLoginStrategy.java index a03eb3257c4..e9e04a9b8e1 100644 --- a/modules/dcache/src/main/java/org/dcache/services/login/CachingLoginStrategy.java +++ b/modules/dcache/src/main/java/org/dcache/services/login/CachingLoginStrategy.java @@ -17,7 +17,7 @@ import org.dcache.auth.LoginReply; import org.dcache.auth.LoginStrategy; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; /** * Caching implementation of {@link LoginStrategy}. diff --git a/modules/dcache/src/main/java/org/dcache/services/login/LoginCLI.java b/modules/dcache/src/main/java/org/dcache/services/login/LoginCLI.java index e6e2072cd45..cc283de27d6 100644 --- a/modules/dcache/src/main/java/org/dcache/services/login/LoginCLI.java +++ b/modules/dcache/src/main/java/org/dcache/services/login/LoginCLI.java @@ -14,7 +14,7 @@ import org.dcache.auth.LoginStrategy; import org.dcache.auth.Subjects; import org.dcache.auth.UidPrincipal; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; public class LoginCLI implements CellCommandListener diff --git a/modules/dcache/src/main/java/org/dcache/services/login/MessageHandler.java b/modules/dcache/src/main/java/org/dcache/services/login/MessageHandler.java index 4a3f079fd49..432de186b2b 100644 --- a/modules/dcache/src/main/java/org/dcache/services/login/MessageHandler.java +++ b/modules/dcache/src/main/java/org/dcache/services/login/MessageHandler.java @@ -18,7 +18,7 @@ import org.dcache.auth.LoginReply; import org.dcache.auth.LoginStrategy; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; public class MessageHandler implements CellMessageReceiver diff --git a/modules/dcache/src/main/java/org/dcache/services/ssh2/ConsoleReaderFactory.java b/modules/dcache/src/main/java/org/dcache/services/ssh2/ConsoleReaderFactory.java index cdff2f28063..ebc5225d228 100644 --- a/modules/dcache/src/main/java/org/dcache/services/ssh2/ConsoleReaderFactory.java +++ b/modules/dcache/src/main/java/org/dcache/services/ssh2/ConsoleReaderFactory.java @@ -8,7 +8,7 @@ import dmg.cells.nucleus.CellEndpoint; -import org.dcache.cells.CellMessageSender; +import dmg.cells.nucleus.CellMessageSender; public class ConsoleReaderFactory implements Factory, CellMessageSender { diff --git a/modules/dcache/src/main/java/org/dcache/services/ssh2/PcellsSubsystemFactory.java b/modules/dcache/src/main/java/org/dcache/services/ssh2/PcellsSubsystemFactory.java index 347f348d468..fb8e5471d86 100644 --- a/modules/dcache/src/main/java/org/dcache/services/ssh2/PcellsSubsystemFactory.java +++ b/modules/dcache/src/main/java/org/dcache/services/ssh2/PcellsSubsystemFactory.java @@ -5,7 +5,7 @@ import dmg.cells.nucleus.CellEndpoint; -import org.dcache.cells.CellMessageSender; +import dmg.cells.nucleus.CellMessageSender; public class PcellsSubsystemFactory implements NamedFactory, CellMessageSender { diff --git a/modules/dcache/src/main/java/org/dcache/services/ssh2/Ssh2Admin.java b/modules/dcache/src/main/java/org/dcache/services/ssh2/Ssh2Admin.java index 665b6b77d1a..523613e46d0 100644 --- a/modules/dcache/src/main/java/org/dcache/services/ssh2/Ssh2Admin.java +++ b/modules/dcache/src/main/java/org/dcache/services/ssh2/Ssh2Admin.java @@ -35,8 +35,8 @@ import org.dcache.auth.PasswordCredential; import org.dcache.auth.Subjects; import org.dcache.auth.UnionLoginStrategy; -import org.dcache.cells.CellCommandListener; -import org.dcache.cells.CellLifeCycleAware; +import dmg.cells.nucleus.CellCommandListener; +import dmg.cells.nucleus.CellLifeCycleAware; import static org.dcache.util.Files.checkFile; diff --git a/modules/dcache/src/main/java/org/dcache/services/topology/AbstractCellsTopology.java b/modules/dcache/src/main/java/org/dcache/services/topology/AbstractCellsTopology.java index 2704a37596c..e426b245418 100644 --- a/modules/dcache/src/main/java/org/dcache/services/topology/AbstractCellsTopology.java +++ b/modules/dcache/src/main/java/org/dcache/services/topology/AbstractCellsTopology.java @@ -16,7 +16,7 @@ import dmg.cells.nucleus.CellPath; import dmg.cells.nucleus.CellTunnelInfo; -import org.dcache.cells.AbstractCellComponent; +import dmg.cells.nucleus.AbstractCellComponent; import org.dcache.cells.CellStub; /** diff --git a/modules/dcache/src/main/java/org/dcache/services/topology/CellsTopologyInterpreter.java b/modules/dcache/src/main/java/org/dcache/services/topology/CellsTopologyInterpreter.java index 08a93060ebb..7c0631d3ac1 100644 --- a/modules/dcache/src/main/java/org/dcache/services/topology/CellsTopologyInterpreter.java +++ b/modules/dcache/src/main/java/org/dcache/services/topology/CellsTopologyInterpreter.java @@ -3,7 +3,7 @@ import dmg.cells.network.CellDomainNode; import dmg.util.Args; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; public class CellsTopologyInterpreter implements CellCommandListener diff --git a/modules/dcache/src/main/java/org/dcache/services/topology/ClassicCellsTopology.java b/modules/dcache/src/main/java/org/dcache/services/topology/ClassicCellsTopology.java index bfa6c08753e..cbd5b6688a1 100644 --- a/modules/dcache/src/main/java/org/dcache/services/topology/ClassicCellsTopology.java +++ b/modules/dcache/src/main/java/org/dcache/services/topology/ClassicCellsTopology.java @@ -5,7 +5,7 @@ import dmg.cells.network.CellDomainNode; import dmg.util.Args; -import org.dcache.cells.CellCommandListener; +import dmg.cells.nucleus.CellCommandListener; /** * CellsTopology for dCache installation with classic (non-JMS) cells diff --git a/modules/dcache/src/main/java/org/dcache/util/list/ListDirectoryHandler.java b/modules/dcache/src/main/java/org/dcache/util/list/ListDirectoryHandler.java index c892e7c33c8..7af1e46ea2d 100644 --- a/modules/dcache/src/main/java/org/dcache/util/list/ListDirectoryHandler.java +++ b/modules/dcache/src/main/java/org/dcache/util/list/ListDirectoryHandler.java @@ -23,7 +23,7 @@ import dmg.cells.nucleus.NoRouteToCellException; import dmg.util.CollectionFactory; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.namespace.FileAttribute; import org.dcache.util.CacheExceptionFactory; import org.dcache.util.Glob; diff --git a/modules/dcache/src/main/resources/diskCacheV111/srm/srm.xml b/modules/dcache/src/main/resources/diskCacheV111/srm/srm.xml index 8d024637f78..9383810ccb5 100644 --- a/modules/dcache/src/main/resources/diskCacheV111/srm/srm.xml +++ b/modules/dcache/src/main/resources/diskCacheV111/srm/srm.xml @@ -127,7 +127,7 @@ - Registers the door with a LoginBroker diff --git a/modules/dcache/src/main/resources/org/dcache/chimera/nfsv41/door/nfsv41-common.xml b/modules/dcache/src/main/resources/org/dcache/chimera/nfsv41/door/nfsv41-common.xml index 905d65867e5..747742236bd 100644 --- a/modules/dcache/src/main/resources/org/dcache/chimera/nfsv41/door/nfsv41-common.xml +++ b/modules/dcache/src/main/resources/org/dcache/chimera/nfsv41/door/nfsv41-common.xml @@ -115,7 +115,7 @@ - + Notifies LoginBroker diff --git a/modules/dcache/src/test/java/org/dcache/pinmanager/PinManagerTests.java b/modules/dcache/src/test/java/org/dcache/pinmanager/PinManagerTests.java index 69f16b7d988..99ddec78af4 100644 --- a/modules/dcache/src/test/java/org/dcache/pinmanager/PinManagerTests.java +++ b/modules/dcache/src/test/java/org/dcache/pinmanager/PinManagerTests.java @@ -50,7 +50,7 @@ import dmg.util.Args; import org.dcache.cells.CellMessageDispatcher; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import org.dcache.cells.CellStub; import org.dcache.pinmanager.model.Pin; import org.dcache.poolmanager.PoolInfo; diff --git a/modules/dcache/src/test/java/org/dcache/tests/util/CellMessageDispatcherTest.java b/modules/dcache/src/test/java/org/dcache/tests/util/CellMessageDispatcherTest.java index d09f4ae6e11..b10f4aa4522 100644 --- a/modules/dcache/src/test/java/org/dcache/tests/util/CellMessageDispatcherTest.java +++ b/modules/dcache/src/test/java/org/dcache/tests/util/CellMessageDispatcherTest.java @@ -11,7 +11,7 @@ import dmg.cells.nucleus.CellPath; import org.dcache.cells.CellMessageDispatcher; -import org.dcache.cells.CellMessageReceiver; +import dmg.cells.nucleus.CellMessageReceiver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue;