From 63d2fc609a55ded2a4fb4760e795284f91cd7183 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Mon, 7 Jan 2008 09:48:22 +0000
Subject: [PATCH] LMS-211 multiple ETL threads - fixing integration tests
SVN: 3328
---
.../templates/data/store-analys/.gitignore | 0
.../templates/data/store-raw/.gitignore | 0
.../etc/service.properties | 0
.../etlserver.sh | 0
.../shutdown.sh | 0
.../etlserver-analys/etc/service.properties | 58 -------------------
.../templates/etlserver-raw/etlserver.sh | 3 -
.../templates/etlserver-raw/shutdown.sh | 48 ---------------
8 files changed, 109 deletions(-)
delete mode 100644 integration-tests/templates/data/store-analys/.gitignore
delete mode 100644 integration-tests/templates/data/store-raw/.gitignore
rename integration-tests/templates/{etlserver-raw => etlserver-all}/etc/service.properties (100%)
rename integration-tests/templates/{etlserver-analys => etlserver-all}/etlserver.sh (100%)
rename integration-tests/templates/{etlserver-analys => etlserver-all}/shutdown.sh (100%)
delete mode 100644 integration-tests/templates/etlserver-analys/etc/service.properties
delete mode 100755 integration-tests/templates/etlserver-raw/etlserver.sh
delete mode 100755 integration-tests/templates/etlserver-raw/shutdown.sh
diff --git a/integration-tests/templates/data/store-analys/.gitignore b/integration-tests/templates/data/store-analys/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/integration-tests/templates/data/store-raw/.gitignore b/integration-tests/templates/data/store-raw/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/integration-tests/templates/etlserver-raw/etc/service.properties b/integration-tests/templates/etlserver-all/etc/service.properties
similarity index 100%
rename from integration-tests/templates/etlserver-raw/etc/service.properties
rename to integration-tests/templates/etlserver-all/etc/service.properties
diff --git a/integration-tests/templates/etlserver-analys/etlserver.sh b/integration-tests/templates/etlserver-all/etlserver.sh
similarity index 100%
rename from integration-tests/templates/etlserver-analys/etlserver.sh
rename to integration-tests/templates/etlserver-all/etlserver.sh
diff --git a/integration-tests/templates/etlserver-analys/shutdown.sh b/integration-tests/templates/etlserver-all/shutdown.sh
similarity index 100%
rename from integration-tests/templates/etlserver-analys/shutdown.sh
rename to integration-tests/templates/etlserver-all/shutdown.sh
diff --git a/integration-tests/templates/etlserver-analys/etc/service.properties b/integration-tests/templates/etlserver-analys/etc/service.properties
deleted file mode 100644
index 0b104685953..00000000000
--- a/integration-tests/templates/etlserver-analys/etc/service.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-# The root directory of the data store
-storeroot-dir = ../data/store-analys
-
-# The directory to watch for incoming data.
-incoming-dir = ../data/out-analys
-
-# The check interval (in seconds)
-check-interval = 2
-
-# The URL of the LIMS server
-server-url = https://localhost:8443/openbis/services/etl-openbis
-
-# The username to use when contacting the LIMS server
-username = etlserver1
-
-# The password to use when contacting the LIMS server
-password = dummy-password
-
-# The code of the organization to process data sets
-organization-code = 3V
-
-# SMTP properties (must start with 'mail' to be considered).
-mail.smtp.host = mail.ethz.ch
-# mail.from = etlserver@localhost
-
-# Maximum number of retries if renaming failed.
-# renaming.failure.max-retries = 12
-
-# The number of milliseconds to wait before retrying to execute the renaming process.
-# renaming.failure.millis-to-sleep = 5000
-
-# ---------------------------------------------------------------------------
-# Plugin properties
-# ---------------------------------------------------------------------------
-
-# The extractor class to use for code extraction
-code-extractor = ch.systemsx.cisd.etlserver.threev.CodeExtractor
-# The separator that separates an experiment code from the data set one
-code-extractor.entity-separator = _
-code-extractor.number-of-prefixes = 2
-# The separator that separates project code from experiment code
-code-extractor.project-separator = .
-# ...........................................................................
-
-# The extractor class to use for type extraction
-type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
-type-extractor.file-format-type = 3VPROPRIETARY
-type-extractor.locator-type = RELATIVE LOCATION
-type-extractor.observable-type = IMAGE_ANALYSIS_DATA
-type-extractor.procedure-type = IMAGE ANALYSIS
-
-# The storage processor (IStorageProcessor implementation)
-storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
-# storage-processor = ch.systemsx.cisd.etlserver.BDSStorageProcessor
-# storage-processor.version = 1.0
-# storage-processor.measurementEntityTypeDescription = screening plate
-# storage-processor.processingType = RAW_DATA
-# storage-processor.format = UNKNOWN V1.0
\ No newline at end of file
diff --git a/integration-tests/templates/etlserver-raw/etlserver.sh b/integration-tests/templates/etlserver-raw/etlserver.sh
deleted file mode 100755
index 0a9ff523e8b..00000000000
--- a/integration-tests/templates/etlserver-raw/etlserver.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-./shutdown.sh
-java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
diff --git a/integration-tests/templates/etlserver-raw/shutdown.sh b/integration-tests/templates/etlserver-raw/shutdown.sh
deleted file mode 100755
index 2e5771bca66..00000000000
--- a/integration-tests/templates/etlserver-raw/shutdown.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# This is an exact copy of datamover.stop
-
-awkBin()
-{
- # We need a awk that accepts variable assignments with '-v'
- case `uname -s` in
- "SunOS")
- echo "nawk"
- return
- ;;
- esac
- # default
- echo "awk"
-}
-
-isPIDRunning()
-{
- if [ "$1" = "" ]; then
- return 0
- fi
- # This will have a return value of 0 on BSDish systems
- isBSD="`ps aux > /dev/null 2>&1; echo $?`"
- AWK=`awkBin`
- if [ "$isBSD" = "0" ]; then
- if [ "`ps aux | $AWK -v PID=$1 '{if ($2==PID) {print "FOUND"}}'`" = "FOUND" ]; then
- return 0
- else
- return 1
- fi
- else
- if [ "`ps -ef | $AWK -v PID=$1 '{if ($2==PID) {print "FOUND"}}'`" = "FOUND" ]; then
- return 0
- else
- return 1
- fi
- fi
-}
-
-if [ -f running.pid ]; then
- PID=`cat running.pid`
- isPIDRunning $PID
- if [ $? -eq 0 ]; then
- kill $PID
- echo "Previously running program with PID $PID was found and killed"
- fi
- rm running.pid
-fi
--
GitLab