From 2807ef98f66eca609941157bf28ff54d34ddca7b Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 15 Aug 2012 13:54:51 +0000
Subject: [PATCH] Renamed classes to introduce the easier names of
AggregationService and IngestionService
SVN: 26381
---
...ingPlugin.java => JythonAggregationService.java} | 13 ++++++-------
...rtingPlugin.java => JythonIngestionService.java} | 12 ++++++------
...ReportingPlugin.java => AggregationService.java} | 4 ++--
...ggregationService.java => IngestionService.java} | 10 +++++-----
.../plugin.properties | 2 +-
.../plugin.properties | 2 +-
...nBasedAggregationServiceReportingPluginTest.java | 2 +-
.../standard/ExampleAggregationServicePlugin.java | 2 +-
.../ExampleDbModifyingAggregationService.java | 2 +-
9 files changed, 24 insertions(+), 25 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/{JythonBasedAggregationServiceReportingPlugin.java => JythonAggregationService.java} (88%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/{JythonBasedDbModifyingAggregationServiceReportingPlugin.java => JythonIngestionService.java} (88%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/{AbstractAggregationServiceReportingPlugin.java => AggregationService.java} (91%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/{AbstractDbModifyingAggregationService.java => IngestionService.java} (97%)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
similarity index 88%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
index 24f4cafdfa0..65199787eff 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
@@ -24,23 +24,22 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractAggregationServiceReportingPlugin;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AggregationService;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTableModelBuilderAdaptor;
/**
* Aggregation service reporting plugin based on a Jython script.
- *
+ *
* @author Franz-Josef Elmer
*/
-public class JythonBasedAggregationServiceReportingPlugin extends
- AbstractAggregationServiceReportingPlugin
+public class JythonAggregationService extends AggregationService
{
private static final long serialVersionUID = 1L;
private static final Logger notifyLog = LogFactory.getLogger(LogCategory.NOTIFY,
- JythonBasedAggregationServiceReportingPlugin.class);
+ JythonAggregationService.class);
protected static String getScriptPathProperty(Properties properties)
{
@@ -49,13 +48,13 @@ public class JythonBasedAggregationServiceReportingPlugin extends
private final IPluginScriptRunnerFactory scriptRunnerFactory;
- public JythonBasedAggregationServiceReportingPlugin(Properties properties, File storeRoot)
+ public JythonAggregationService(Properties properties, File storeRoot)
{
this(properties, storeRoot,
new PluginScriptRunnerFactory(getScriptPathProperty(properties)));
}
- protected JythonBasedAggregationServiceReportingPlugin(Properties properties, File storeRoot,
+ protected JythonAggregationService(Properties properties, File storeRoot,
IPluginScriptRunnerFactory scriptRunnerFactory)
{
super(properties, storeRoot);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
similarity index 88%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
index a88ba4e5b4e..2641ce68e99 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedDbModifyingAggregationServiceReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
@@ -25,7 +25,7 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.etlserver.registrator.api.v2.IDataSetRegistrationTransactionV2;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDbModifyingAggregationService;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.IngestionService;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
@@ -36,13 +36,13 @@ import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTable
*
* @author Chandrasekhar Ramakrishnan
*/
-public class JythonBasedDbModifyingAggregationServiceReportingPlugin extends
- AbstractDbModifyingAggregationService<DataSetInformation>
+public class JythonIngestionService extends
+ IngestionService<DataSetInformation>
{
private static final long serialVersionUID = 1L;
private static final Logger notifyLog = LogFactory.getLogger(LogCategory.NOTIFY,
- JythonBasedDbModifyingAggregationServiceReportingPlugin.class);
+ JythonIngestionService.class);
protected static String getScriptPathProperty(Properties properties)
{
@@ -51,14 +51,14 @@ public class JythonBasedDbModifyingAggregationServiceReportingPlugin extends
private final IPluginScriptRunnerFactory scriptRunnerFactory;
- public JythonBasedDbModifyingAggregationServiceReportingPlugin(Properties properties,
+ public JythonIngestionService(Properties properties,
File storeRoot)
{
this(properties, storeRoot,
new PluginScriptRunnerFactory(getScriptPathProperty(properties)));
}
- protected JythonBasedDbModifyingAggregationServiceReportingPlugin(Properties properties,
+ protected JythonIngestionService(Properties properties,
File storeRoot, IPluginScriptRunnerFactory scriptRunnerFactory)
{
super(properties, storeRoot);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractAggregationServiceReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
similarity index 91%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractAggregationServiceReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
index cab7817037b..89bf8f299e7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractAggregationServiceReportingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
@@ -32,12 +32,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
*
* @author Chandrasekhar Ramakrishnan
*/
-public abstract class AbstractAggregationServiceReportingPlugin extends AbstractDatastorePlugin implements
+public abstract class AggregationService extends AbstractDatastorePlugin implements
IReportingPluginTask
{
private static final long serialVersionUID = 1L;
- protected AbstractAggregationServiceReportingPlugin(Properties properties, File storeRoot)
+ protected AggregationService(Properties properties, File storeRoot)
{
super(properties, storeRoot);
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
index 87bb74c2981..7983b23933e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDbModifyingAggregationService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
@@ -69,8 +69,8 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
/**
* @author Chandrasekhar Ramakrishnan
*/
-public abstract class AbstractDbModifyingAggregationService<T extends DataSetInformation> extends
- AbstractAggregationServiceReportingPlugin implements IOmniscientEntityRegistrator<T>
+public abstract class IngestionService<T extends DataSetInformation> extends
+ AggregationService implements IOmniscientEntityRegistrator<T>
{
private static final String AGGREGATION_SERVICE_SCRATCH_DIR_NAME = "aggregation-service";
@@ -99,7 +99,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
* @param properties
* @param storeRoot
*/
- public AbstractDbModifyingAggregationService(Properties properties, File storeRoot)
+ public IngestionService(Properties properties, File storeRoot)
{
this(DssPropertyParametersUtil.loadServiceProperties(), properties, storeRoot);
}
@@ -111,7 +111,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
* @param instanceProperties
* @param storeRoot
*/
- public AbstractDbModifyingAggregationService(Properties dssProperties,
+ public IngestionService(Properties dssProperties,
Properties instanceProperties, File storeRoot)
{
this(dssProperties, instanceProperties, storeRoot, null,
@@ -127,7 +127,7 @@ public abstract class AbstractDbModifyingAggregationService<T extends DataSetInf
* @param openBisService
* @param mailClient
*/
- public AbstractDbModifyingAggregationService(Properties dssProperties,
+ public IngestionService(Properties dssProperties,
Properties instanceProperties, File storeRoot,
IEncapsulatedOpenBISService openBisService, IMailClient mailClient)
{
diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties
index 44093a72967..473df6886df 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-aggregation-service-report/plugin.properties
@@ -1,3 +1,3 @@
label = Test Jython Aggregation Reporting
-class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonBasedAggregationServiceReportingPlugin
+class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonAggregationService
script-path = script.py
\ No newline at end of file
diff --git a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties
index 9e377f997d1..5bf050a32dc 100644
--- a/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties
+++ b/datastore_server/sourceTest/core-plugins/generic-test/1/dss/reporting-plugins/example-jython-db-modifying-aggregation-service/plugin.properties
@@ -1,3 +1,3 @@
label = Test Db Modifying Jython Aggregation Reporting
-class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonBasedDbModifyingAggregationServiceReportingPlugin
+class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonIngestionService
script-path = script.py
\ No newline at end of file
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
index edb6249a043..a47548377d7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
@@ -214,7 +214,7 @@ public class JythonBasedAggregationServiceReportingPluginTest extends AbstractFi
private IReportingPluginTask createPlugin(String scriptFile)
{
- return new JythonBasedAggregationServiceReportingPlugin(new Properties(), store,
+ return new JythonAggregationService(new Properties(), store,
new PluginScriptRunnerFactory(new File(scriptFolder, scriptFile).getPath())
{
private static final long serialVersionUID = 1L;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
index 0080454bde6..8a3652fa11d 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
/**
* @author Chandrasekhar Ramakrishnan
*/
-public class ExampleAggregationServicePlugin extends AbstractAggregationServiceReportingPlugin
+public class ExampleAggregationServicePlugin extends AggregationService
{
private static final long serialVersionUID = 1L;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
index a71c8399c40..79dbfde54ed 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
* @author Chandrasekhar Ramakrishnan
*/
public class ExampleDbModifyingAggregationService extends
- AbstractDbModifyingAggregationService<DataSetInformation>
+ IngestionService<DataSetInformation>
{
private static final long serialVersionUID = 1L;
--
GitLab