LMS-768 rename 'etlserver' project to 'datastore_server'

SVN: 9974

datastore_server/build/build.xml

-<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">

datastore_server/dist/datastore_server.bat

+@echo off
+
+java -Djavax.net.ssl.trustStore=etc\openBIS.keystore -jar lib\datastore_server.jar %1 %2 %3 %4 %5 %6 %7

datastore_server/dist/etlserver.sh → 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
 
 #

datastore_server/dist/etc/etlserver.conf

 #
-# ETL Server configuration file
+# Data Store Server configuration file
 #
 
 #

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" />

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.
 

datastore_server/dist/etlserver.bat

-@echo off
-
-java -Djavax.net.ssl.trustStore=etc\openBIS.keystore -jar lib\etlserver.jar %1 %2 %3 %4 %5 %6 %7

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 = 
 

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.");
     }
 
 }