SSDM-3617 : Maintenance task to find orphan datasets in archivers, fixing dependencies

SVN: 36632

datastore_server/resource/dependency-structure.ddf

@@ -23,7 +23,7 @@ check [dss] [etlserver] independentOf [private_openbis]
 # Check dependencies of etlserver to dss
 
 [dss.shared] = ${dss}.generic.shared.*
-[private_dss] = ${dss}.* excluding [dss.shared] ${dss}.generic.server.IDataSetCommandExecutorProvider ${dss}.generic.server.IDataSetCommandExecutor ${dss}.BuildAndEnvironmentInfo ${dss}.generic.DataStoreServer ${dss}.generic.server.api.v1.DssServiceRpcGeneric ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService
+[private_dss] = ${dss}.* excluding [dss.shared] ${dss}.generic.server.IDataSetCommandExecutorProvider ${dss}.generic.server.IDataSetCommandExecutor ${dss}.BuildAndEnvironmentInfo ${dss}.generic.DataStoreServer ${dss}.generic.server.DataStoreServer ${dss}.generic.server.api.v1.DssServiceRpcGeneric ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService
 
 [etlserver_registration] = ${etlserver}.registrator.* ${etlserver}.postregistration.* ${etlserver}.DssUniqueFilenameGenerator \
       ${etlserver}.Parameters ${etlserver}.ITopLevelDataSetRegistratorDelegate \

datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/MultiDataSetArchiverOrphanFinderTask.java

@@ -14,7 +14,6 @@ import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.mail.EMailAddress;
 import ch.systemsx.cisd.common.mail.IMailClient;
-import ch.systemsx.cisd.common.mail.MailClient;
 import ch.systemsx.cisd.common.maintenance.IMaintenanceTask;
 import ch.systemsx.cisd.common.properties.PropertyUtils;
 import ch.systemsx.cisd.openbis.dss.generic.server.DataStoreServer;
@@ -43,7 +42,7 @@ public class MultiDataSetArchiverOrphanFinderTask implements IMaintenanceTask
     {
         operationLog.info("Task " + pluginName + " initialized.");
         emailAddresses = getEMailAddresses(properties);
-        mailClient = new MailClient(DataStoreServer.getConfigParameters().getProperties());
+        mailClient = DataStoreServer.getMailClient();
     }
 
     @Transactional
@@ -54,10 +53,10 @@ public class MultiDataSetArchiverOrphanFinderTask implements IMaintenanceTask
 
         // 1.Directories.
         operationLog.info("1.Directories, obtain archiver directory.");
-        String destination = DataStoreServer.getConfigParameters().getProperties().getProperty("archiver.final-destination", null);
+        String destination = DataStoreServer.getConfigParameter("archiver.final-destination", null);
         if (destination == null)
         {
-            destination = DataStoreServer.getConfigParameters().getProperties().getProperty("archiver.destination", null);
+            destination = DataStoreServer.getConfigParameter("archiver.destination", null);
         }
 
         if (destination == null)

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java

@@ -68,6 +68,7 @@ import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.logging.LogInitializer;
+import ch.systemsx.cisd.common.mail.MailClient;
 import ch.systemsx.cisd.common.properties.ExtendedProperties;
 import ch.systemsx.cisd.common.resource.IInitializable;
 import ch.systemsx.cisd.common.servlet.InitializeRequestContextHolderFilter;
@@ -160,7 +161,7 @@ public class DataStoreServer
                         ServiceProvider.getHierarchicalContentProvider(), configParams);
         DssSessionAuthorizationHolder.setAuthorizer(new DatasetSessionAuthorizer(configParams
                 .getAuthCacheExpirationTimeMins(), configParams
-                .getAuthCacheCleanupTimerPeriodMins()));
+                        .getAuthCacheCleanupTimerPeriodMins()));
         configParams.log();
         server = createServer(applicationContext);
         try
@@ -297,7 +298,8 @@ public class DataStoreServer
                         .getUrlForRpcService(IServiceConversationClientManagerRemote.PATH);
         context.addServlet(
                 new ServletHolder(new HttpInvokerServlet(ServiceProvider
-                        .getServiceConversationClientManagerServer(), clientPath)), clientPath);
+                        .getServiceConversationClientManagerServer(), clientPath)),
+                clientPath);
 
         // Export service conversation server manager
         String serverPath =
@@ -305,7 +307,8 @@ public class DataStoreServer
                         .getUrlForRpcService(IServiceConversationServerManagerRemote.PATH);
         context.addServlet(
                 new ServletHolder(new HttpInvokerServlet(ServiceProvider
-                        .getServiceConversationServerManagerServer(), serverPath)), serverPath);
+                        .getServiceConversationServerManagerServer(), serverPath)),
+                serverPath);
 
         //
         // export the API via JSON
@@ -392,7 +395,8 @@ public class DataStoreServer
             {
                 throw EnvironmentFailureException.fromTemplate(
                         "Error while loading servlet plugin class '%s': %s. "
-                                + "Servlet implementation expected.", pluginServlet.getClass(),
+                                + "Servlet implementation expected.",
+                        pluginServlet.getClass(),
                         ex.getMessage());
             }
             ServletHolder holder =
@@ -562,4 +566,14 @@ public class DataStoreServer
         }
         return configParameters;
     }
+
+    public static MailClient getMailClient()
+    {
+        return new MailClient(getConfigParameters().getProperties());
+    }
+
+    public static String getConfigParameter(String key, String defaultValue)
+    {
+        return getConfigParameters().getProperties().getProperty(key, defaultValue);
+    }
 }