From dd69181fac7693f579c7b41e6c8a5d15f7f21d0b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 25 Feb 2009 12:49:33 +0000
Subject: [PATCH] LMS-768 rename 'etlserver' project to 'datastore_server'
SVN: 9974
---
datastore_server/build/build.xml | 42 +++++++++----------
datastore_server/dist/datastore_server.bat | 3 ++
.../{etlserver.sh => datastore_server.sh} | 10 ++---
datastore_server/dist/etc/etlserver.conf | 2 +-
datastore_server/dist/etc/log.xml | 4 +-
datastore_server/dist/etc/service.properties | 2 +-
datastore_server/dist/etlserver.bat | 3 --
datastore_server/etc/service.properties | 2 +-
...ch => Data Store Server Fast Suite.launch} | 0
...Server.launch => Data Store Server.launch} | 0
.../java/ch/systemsx/cisd/etlserver/Main.java | 6 +--
11 files changed, 37 insertions(+), 37 deletions(-)
create mode 100755 datastore_server/dist/datastore_server.bat
rename datastore_server/dist/{etlserver.sh => datastore_server.sh} (95%)
delete mode 100755 datastore_server/dist/etlserver.bat
rename datastore_server/resource/eclipse/{ETL Server Fast Suite.launch => Data Store Server Fast Suite.launch} (100%)
rename datastore_server/resource/eclipse/{ETL Server.launch => Data Store Server.launch} (100%)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 6d5817155d4..c925a1ea767 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -1,13 +1,13 @@
-<project name="etlserver" default="dist" basedir="..">
+<project name="datastore_server" default="dist" basedir="..">
<import file="../../build_resources/ant/build-common.xml" />
<project-classpath name="ecp" classes="${classes}" />
<property name="original.dist" value="dist" />
- <property name="mainfolder" value="etlserver" />
- <property name="dist.etlserver" value="${dist}/${mainfolder}" />
- <property name="dist.etlserver.lib" value="${dist.etlserver}/lib" />
- <property name="jar.file" value="${dist.etlserver.lib}/etlserver.jar" />
- <property name="dist.file.prefix" value="${dist}/etlserver" />
+ <property name="mainfolder" value="datastore_server" />
+ <property name="dist.datastore_server" value="${dist}/${mainfolder}" />
+ <property name="dist.datastore_server.lib" value="${dist.datastore_server}/lib" />
+ <property name="jar.file" value="${dist.datastore_server.lib}/datastore_server.jar" />
+ <property name="dist.file.prefix" value="${dist}/datastore_server" />
<property name="nativesrc" value="${lib}/unix/native" />
<property name="nativeroot" value="${targets}/ant" />
<property name="native" value="${nativeroot}/native" />
@@ -25,7 +25,7 @@
</target>
<target name="jar" depends="compile">
- <mkdir dir="${dist.etlserver.lib}" />
+ <mkdir dir="${dist.datastore_server.lib}" />
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
<copy todir="${native}">
@@ -44,7 +44,7 @@
<manifest>
<attribute name="Main-Class" value="ch.systemsx.cisd.etlserver.Main" />
<attribute name="Class-Path"
- value="etlserver-plugins.jar log4j.jar activation.jar mail.jar spring.jar fast-md5.jar
+ value="datastore_server-plugins.jar log4j.jar activation.jar mail.jar spring.jar fast-md5.jar
commons-codec.jar commons-lang.jar commons-io.jar commons-logging.jar commons-httpclient.jar" />
<attribute name="Version" value="${version.number}" />
<attribute name="Build-Number"
@@ -54,26 +54,26 @@
</target>
<target name="dist" depends="jar">
- <copy file="${lib}/activation/activation.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/mail/mail.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/log4j/log4j.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/commons-codec/commons-codec.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/commons-io/commons-io.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.etlserver.lib}" />
+ <copy file="${lib}/activation/activation.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/mail/mail.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/log4j/log4j.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-codec/commons-codec.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-io/commons-io.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-lang/commons-lang.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/commons-httpclient/commons-httpclient.jar"
- todir="${dist.etlserver.lib}" />
- <copy file="${lib}/spring/spring.jar" todir="${dist.etlserver.lib}" />
- <copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.etlserver.lib}" />
+ todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/spring/spring.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.datastore_server.lib}" />
<property name="dist.file"
value="${dist.file.prefix}-${version.number}-r${revision.number}.zip" />
<zip basedir="${dist}" destfile="${dist.file}">
- <zipfileset dir="${original.dist}" excludes="**/etlserver.sh" prefix="${mainfolder}" />
- <zipfileset file="${original.dist}/etlserver.sh"
+ <zipfileset dir="${original.dist}" excludes="**/datastore_server.sh" prefix="${mainfolder}" />
+ <zipfileset file="${original.dist}/datastore_server.sh"
filemode="755"
prefix="${mainfolder}" />
</zip>
- <delete dir="${dist.etlserver}" />
+ <delete dir="${dist.datastore_server}" />
</target>
<target name="ci" depends="run-tests, check-dependencies, dist">
diff --git a/datastore_server/dist/datastore_server.bat b/datastore_server/dist/datastore_server.bat
new file mode 100755
index 00000000000..676dd8a090e
--- /dev/null
+++ b/datastore_server/dist/datastore_server.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -Djavax.net.ssl.trustStore=etc\openBIS.keystore -jar lib\datastore_server.jar %1 %2 %3 %4 %5 %6 %7
diff --git a/datastore_server/dist/etlserver.sh b/datastore_server/dist/datastore_server.sh
similarity index 95%
rename from datastore_server/dist/etlserver.sh
rename to datastore_server/dist/datastore_server.sh
index 2b1199085d2..2b2ac229574 100755
--- a/datastore_server/dist/etlserver.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -101,12 +101,12 @@ printStatus()
# definitions
#
-PIDFILE=${ETLSERVER_PID:-etlserver.pid}
-CONFFILE=etc/etlserver.conf
-LOGFILE=log/etlserver_log.txt
+PIDFILE=${DATASTORE_SERVER_PID:-datastore_server.pid}
+CONFFILE=etc/datastore_server.conf
+LOGFILE=log/datastore_server_log.txt
STARTUPLOG=log/startup_log.txt
-SUCCESS_MSG="etlserver ready and waiting for data"
-JAR_FILE=lib/etlserver.jar
+SUCCESS_MSG="Data Store Server ready and waiting for data"
+JAR_FILE=lib/datastore_server.jar
MAX_LOOPS=10
#
diff --git a/datastore_server/dist/etc/etlserver.conf b/datastore_server/dist/etc/etlserver.conf
index f51846de0bd..33c4f1bac8c 100644
--- a/datastore_server/dist/etc/etlserver.conf
+++ b/datastore_server/dist/etc/etlserver.conf
@@ -1,5 +1,5 @@
#
-# ETL Server configuration file
+# Data Store Server configuration file
#
#
diff --git a/datastore_server/dist/etc/log.xml b/datastore_server/dist/etc/log.xml
index 41d695d4d78..7a54e2382cb 100644
--- a/datastore_server/dist/etc/log.xml
+++ b/datastore_server/dist/etc/log.xml
@@ -5,7 +5,7 @@
<appender name="DEFAULT" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="log/etlserver_log.txt"/>
+ <param name="File" value="log/datastore_server_log.txt"/>
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
@@ -26,7 +26,7 @@
<param name="BufferSize" value="512" />
<param name="SMTPHost" value="localhost" />
- <param name="From" value="etlserver@localhost" />
+ <param name="From" value="datastore_server@localhost" />
<param name="To" value="root@localhost" />
<param name="Subject" value="ATTENTION: etl server" />
<param name="EvaluatorClass" value="ch.systemsx.cisd.common.logging.AlwaysTrueTriggeringEventEvaluator" />
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 3392d3b2f92..ac44c7717d0 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -32,7 +32,7 @@ password = <change this>
# SMTP properties (must start with 'mail' to be considered).
# mail.smtp.host = localhost
-# mail.from = etlserver@localhost
+# mail.from = datastore_server@localhost
# ---------------- Timing parameters for file system operations on remote shares.
diff --git a/datastore_server/dist/etlserver.bat b/datastore_server/dist/etlserver.bat
deleted file mode 100755
index 5da5824e65f..00000000000
--- a/datastore_server/dist/etlserver.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -Djavax.net.ssl.trustStore=etc\openBIS.keystore -jar lib\etlserver.jar %1 %2 %3 %4 %5 %6 %7
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index 71b9a000811..026cc56c6de 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -30,7 +30,7 @@ password = doesnotmatter
# SMTP properties (must start with 'mail' to be considered).
# mail.smtp.host = localhost
-# mail.from = etlserver@localhost
+# mail.from = datastore_server@localhost
# mail.smtp.user =
# mail.smtp.password =
diff --git a/datastore_server/resource/eclipse/ETL Server Fast Suite.launch b/datastore_server/resource/eclipse/Data Store Server Fast Suite.launch
similarity index 100%
rename from datastore_server/resource/eclipse/ETL Server Fast Suite.launch
rename to datastore_server/resource/eclipse/Data Store Server Fast Suite.launch
diff --git a/datastore_server/resource/eclipse/ETL Server.launch b/datastore_server/resource/eclipse/Data Store Server.launch
similarity index 100%
rename from datastore_server/resource/eclipse/ETL Server.launch
rename to datastore_server/resource/eclipse/Data Store Server.launch
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
index f573e571829..d98947fcce3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
@@ -108,7 +108,7 @@ public final class Main
private static void printInitialLogMessage(final Parameters parameters)
{
- operationLog.info("Etlserver is starting up.");
+ operationLog.info("Data Store Server is starting up.");
for (final String line : BuildAndEnvironmentInfo.INSTANCE.getEnvironmentInfo())
{
operationLog.info(line);
@@ -143,7 +143,7 @@ public final class Main
private static void selfTest(final File incomingDirectory,
final IEncapsulatedLimsService service, final ISelfTestable... selfTestables)
{
- final String msgStart = "Etlserver self test failed:";
+ final String msgStart = "Data Store Server self test failed:";
ISelfTestable currentSelfTestableOrNull = null;
try
{
@@ -491,7 +491,7 @@ public final class Main
QueueingPathRemoverService.start(shredderQueueFile);
printInitialLogMessage(parameters);
startupServer(parameters);
- operationLog.info("etlserver ready and waiting for data.");
+ operationLog.info("Data Store Server ready and waiting for data.");
}
}
--
GitLab