From a47fbaaf36404a549a9f2657a62a32797c73ed71 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 11 Jan 2012 15:29:14 +0000
Subject: [PATCH] LMS-2738 Made dssRegistrationLogDir available to the
TopLevelDataSetHandler.
SVN: 24152
---
.../java/ch/systemsx/cisd/etlserver/ETLDaemon.java | 4 ++--
.../etlserver/TopLevelDataSetRegistratorGlobalState.java | 9 ++++++---
.../cisd/etlserver/TransferredDataSetHandlerTest.java | 4 ++--
.../api/v1/PutDataSetTopLevelDataSetHandlerTest.java | 2 +-
.../registrator/AbstractJythonDataSetHandlerTest.java | 2 +-
.../registrator/DataSetStorageRollbackerTest.java | 2 +-
.../api/v1/impl/DataSetRegistrationTransactionTest.java | 4 ++--
.../datastoreserver/systemtests/DssComponentTest.java | 2 ++
.../openbis/dss/generic/server/DssServiceRpcV1Test.java | 2 +-
9 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
index 7c14ee2ce0f..edecf227bea 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
@@ -374,7 +374,7 @@ public final class ETLDaemon
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState(initializationData.dssCode, initializationData.shareId, initializationData.storeRootDir,
- initializationData.dssInternalTempDir, openBISService, mailClient, dataSetValidator,
+ initializationData.dssInternalTempDir, initializationData.dssRegistrationLogDir, openBISService, mailClient, dataSetValidator,
dataSourceQueryService, new DynamicTransactionQueryFactory(),
notifySuccessfulRegistration, threadParameters);
@@ -403,7 +403,7 @@ public final class ETLDaemon
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState(initializationData.dssCode, initializationData.shareId, initializationData.storeRootDir,
- initializationData.dssInternalTempDir, openBISService, mailClient, dataSetValidator,
+ initializationData.dssInternalTempDir, initializationData.dssRegistrationLogDir, openBISService, mailClient, dataSetValidator,
dataSourceQueryService, new DynamicTransactionQueryFactory(),
notifySuccessfulRegistration, threadParameters, useIsFinishedMarkerFile,
deleteUnidentified, preRegistrationScriptOrNull,
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
index 4eea2ca4164..264fdfff3fd 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
@@ -50,6 +50,8 @@ public class TopLevelDataSetRegistratorGlobalState
private final File dssInternalTempDir;
+ private final File dssRegistrationLogDir;
+
private final IEncapsulatedOpenBISService openBisService;
private final IMailClient mailClient;
@@ -87,13 +89,13 @@ public class TopLevelDataSetRegistratorGlobalState
* @param threadParameters
*/
public TopLevelDataSetRegistratorGlobalState(String dssCode, String shareId, File storeRootDir,
- File dssInternalTempDir, IEncapsulatedOpenBISService openBisService,
+ File dssInternalTempDir, File dssRegistrationLogDir, IEncapsulatedOpenBISService openBisService,
IMailClient mailClient, IDataSetValidator dataSetValidator,
IDataSourceQueryService dataSourceQueryService,
DynamicTransactionQueryFactory dynamicTransactionQueryFactory,
boolean notifySuccessfulRegistration, ThreadParameters threadParameters)
{
- this(dssCode, shareId, storeRootDir, dssInternalTempDir, openBisService, mailClient,
+ this(dssCode, shareId, storeRootDir, dssInternalTempDir, dssRegistrationLogDir, openBisService, mailClient,
dataSetValidator, dataSourceQueryService, dynamicTransactionQueryFactory,
notifySuccessfulRegistration, threadParameters, threadParameters
.useIsFinishedMarkerFile(), threadParameters.deleteUnidentified(),
@@ -102,7 +104,7 @@ public class TopLevelDataSetRegistratorGlobalState
}
public TopLevelDataSetRegistratorGlobalState(String dssCode, String shareId, File storeRootDir,
- File dssInternalTempDir, IEncapsulatedOpenBISService openBisService,
+ File dssInternalTempDir, File dssRegistrationLogDir, IEncapsulatedOpenBISService openBisService,
IMailClient mailClient, IDataSetValidator dataSetValidator,
IDataSourceQueryService dataSourceQueryService,
DynamicTransactionQueryFactory dynamicTransactionQueryFactory,
@@ -116,6 +118,7 @@ public class TopLevelDataSetRegistratorGlobalState
this.shareId = shareId;
this.storeRootDir = storeRootDir;
this.dssInternalTempDir = dssInternalTempDir;
+ this.dssRegistrationLogDir = dssRegistrationLogDir;
this.openBisService = openBisService;
this.mailClient = mailClient;
this.dataSetValidator = dataSetValidator;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
index 3129e6a3266..5b9afcca80f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -288,7 +288,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState("dss",
ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
- workingDirectory, workingDirectory, authorizedLimsService, mailClient,
+ workingDirectory, workingDirectory, workingDirectory, authorizedLimsService, mailClient,
dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
threadParameters);
@@ -807,7 +807,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState("dss",
ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
- workingDirectory, workingDirectory, authorizedLimsService, mailClient,
+ workingDirectory, workingDirectory, workingDirectory, authorizedLimsService, mailClient,
dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
threadParameters);
context.checking(new Expectations()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
index d88daf8c444..5ea85563a97 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
@@ -306,6 +306,6 @@ public class PutDataSetTopLevelDataSetHandlerTest extends AbstractFileSystemTest
new ThreadParameters(createThreadProperties(), getClass().getSimpleName()
+ "-thread");
return new TopLevelDataSetRegistratorGlobalState(DATA_SET_CODE, "1", this.storeDir,
- tmpIncomingDir, this.service, null, null, null, null, true, params);
+ tmpIncomingDir, workingDirectory, this.service, null, null, null, null, true, params);
}
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
index 250210e5d7a..9c20411b62a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
@@ -177,7 +177,7 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState("dss",
ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
- workingDirectory, workingDirectory, openBisService, mailClient,
+ workingDirectory, workingDirectory, workingDirectory, openBisService, mailClient,
dataSetValidator, dataSourceQueryService, myFactory, true, threadParameters);
return globalState;
}
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
index 43dffe1af82..cb273dc233f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
@@ -111,7 +111,7 @@ public class DataSetStorageRollbackerTest extends AbstractFileSystemTestCase
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState("dss",
ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
- workingDirectory, workingDirectory, openBisService, mailClient,
+ workingDirectory, workingDirectory, workingDirectory, openBisService, mailClient,
dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
threadParameters);
return globalState;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
index 206e5e7dd1e..bf81678f319 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
@@ -287,7 +287,7 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
context.assertIsSatisfied();
}
-
+
@Test
public void testRollbackWhereMoveCreatesIntermediateDirectories()
{
@@ -445,7 +445,7 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
TopLevelDataSetRegistratorGlobalState globalState =
new TopLevelDataSetRegistratorGlobalState("dss",
ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
- workingDirectory, workingDirectory, openBisService, mailClient,
+ workingDirectory, workingDirectory, workingDirectory, openBisService, mailClient,
dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
threadParameters);
return globalState;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index 630609ab050..c16903cb416 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
@@ -92,6 +92,8 @@ public class DssComponentTest extends SystemTestCase
File registrationLogDir = getRegistrationLogDir();
assertTrue(registrationLogDir.exists());
+ File[] contents = registrationLogDir.listFiles();
+ assertTrue(contents.length > 0);
}
@Test
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index e4ed7beb4c5..84c2512907b 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -751,7 +751,7 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
new ThreadParameters(createThreadProperties(), getClass().getSimpleName()
+ "-thread");
return new TopLevelDataSetRegistratorGlobalState(DATA_SET_CODE, "1", storeDir,
- rpcIncomingDir, openBisService, null, null, null, null, true, params);
+ rpcIncomingDir, workingDirectory, openBisService, null, null, null, null, true, params);
}
}
--
GitLab