diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java
index e90c523ef717279e8e39589464fc60cf2591ac9f..2ff1ba3b1f2dd49b44cf3cabcd2f053a598bec1d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java
@@ -20,7 +20,7 @@ import java.io.File;
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.FastDateFormat;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.IFileOperations;
@@ -70,13 +70,15 @@ public class DssRegistrationLogger
moveToDir(helper.getSucceededDir());
}
+ private static FastDateFormat simpleNoISODateFormat = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
+
/**
* Logs a message.
*/
public void log(String message)
{
StringBuilder logMessage = new StringBuilder();
- logMessage.append(DateFormatUtils.ISO_TIME_NO_T_FORMAT.format(new Date()));
+ logMessage.append(simpleNoISODateFormat.format(new Date()));
logMessage.append(" ");
logMessage.append(message);
logMessage.append("\n");
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java
index 204768827670aeccb63d0f51de676892fb7d85f7..1777395cb0eea5d2af45394d1d0cd9b4d2ab9161 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java
@@ -87,9 +87,9 @@ public class DssRegistrationLogDirectoryHelperTest extends AbstractFileSystemTes
logFile.registerSuccess();
logFile.log("3: Succeeded");
List<String> contents = FileUtilities.loadToStringList(logFile.getFile());
- assertTrue(contents.get(0), Pattern.matches("^\\d{2}:\\d{2}:\\d{2} 1: The message$", contents.get(0)));
- assertTrue(contents.get(1), Pattern.matches("^\\d{2}:\\d{2}:\\d{2} 2: The message$", contents.get(1)));
- assertTrue(contents.get(2), Pattern.matches("^\\d{2}:\\d{2}:\\d{2} 3: Succeeded$", contents.get(2)));
+ assertTrue(contents.get(0), Pattern.matches("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} 1: The message$", contents.get(0)));
+ assertTrue(contents.get(1), Pattern.matches("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} 2: The message$", contents.get(1)));
+ assertTrue(contents.get(2), Pattern.matches("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} 3: Succeeded$", contents.get(2)));
}
@Test
@@ -100,7 +100,7 @@ public class DssRegistrationLogDirectoryHelperTest extends AbstractFileSystemTes
String contents = FileUtilities.loadToString(logFile.getFile());
assertTrue(contents,
Pattern.matches(
- "^\\d{2}:\\d{2}:\\d{2} This is a very long string, in fact, a string that is longer than the limit for the length of an...\\n$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} This is a very long string, in fact, a string that is longer than the limit for the length of an...\\n$",
contents));
}
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 ce8bfa65d9c9bc458cc7ad973d6896ef1fee0f9a..1508c29e897ad0100b662576fb471a8e4d8a968a 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
@@ -132,14 +132,14 @@ public class DssComponentTest extends SystemTestCase
File logFile = succeededContents[0];
String[] expectedContents =
{
- "^\\d{2}:\\d{2}:\\d{2} Prepared registration of 1 data set:$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Prepared registration of 1 data set:$",
"^\\t\\d+-\\d+$",
- "^\\d{2}:\\d{2}:\\d{2} Data has been moved to the pre-commit directory: .*$",
- "^\\d{2}:\\d{2}:\\d{2} About to register metadata with AS: registrationId\\(\\d+\\)$",
- "^\\d{2}:\\d{2}:\\d{2} Data has been registered with the openBIS Application Server.$",
- "^\\d{2}:\\d{2}:\\d{2} Storage processors have committed.$",
- "^\\d{2}:\\d{2}:\\d{2} Data has been moved to the final store.$",
- "^\\d{2}:\\d{2}:\\d{2} Storage has been confirmed in openBIS Application Server.$"
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Data has been moved to the pre-commit directory: .*$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} About to register metadata with AS: registrationId\\(\\d+\\)$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Data has been registered with the openBIS Application Server.$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Storage processors have committed.$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Data has been moved to the final store.$",
+ "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Storage has been confirmed in openBIS Application Server.$"
};
checkLogFileContents(logFile, expectedContents);
@@ -147,7 +147,7 @@ public class DssComponentTest extends SystemTestCase
File[] failedContents = checkDssRegistrationLogDirectoryCount(failedDir, 1);
logFile = failedContents[0];
expectedContents = new String[]
- { "^\\d{2}:\\d{2}:\\d{2} Processing failed : .*" };
+ { "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} Processing failed : .*" };
checkLogFileContents(logFile, expectedContents);
}