From 0e3b16f1a4de9d1f5a2f9ad31a0d5ff022e87387 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 3 Mar 2009 15:17:20 +0000
Subject: [PATCH] LMS-768 make a out-of-the-box distribution which fits nicely
 to the out-of-the-box distribution of openBIS

SVN: 10064
---
 .../dist/data/processing/.gitignore           |   0
 .../{etlserver.conf => datastore_server.conf} |   0
 datastore_server/dist/etc/openBIS.keystore    | Bin 1426 -> 2006 bytes
 datastore_server/dist/etc/service.properties  |  28 +++++++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 datastore_server/dist/data/processing/.gitignore
 rename datastore_server/dist/etc/{etlserver.conf => datastore_server.conf} (100%)

diff --git a/datastore_server/dist/data/processing/.gitignore b/datastore_server/dist/data/processing/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/datastore_server/dist/etc/etlserver.conf b/datastore_server/dist/etc/datastore_server.conf
similarity index 100%
rename from datastore_server/dist/etc/etlserver.conf
rename to datastore_server/dist/etc/datastore_server.conf
diff --git a/datastore_server/dist/etc/openBIS.keystore b/datastore_server/dist/etc/openBIS.keystore
index b727bd0fb777fddb3463c81cb56963a7541f7b45..3982a68319e9e1fed5ace51f72682d79e448eaa2 100644
GIT binary patch
literal 2006
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

literal 1426
zcmezO_TO6u1_mY|W&~r_+{*0KN+9!5EW=$#pv*3VCZ=r$d~96WY>X_7T1<kBjI0bS
zO-zd#wG~&$%iMm`c71|$Y5$YitEL_J$ZnqF`)W$d-o2eMs`U?M6zI7t-(A`+-cpqw
zHFxi9-Rrrt%0A4!7X5I`p&hRtn0Nl1W1MMabV=o@O##>LX-9cnmv_92vyZY^nksPD
zdgGz_%YMiA%<+G`?zc{_^OTmKsam}GdFt7neK!{P|Bco8Yq|9PvTGT0HqQC!@x9l1
z+kfrLjk$U4PfrzX4>?lEY_X)NU`c_upzVKwLzZV_Z=OB7;%H;~#q=-kB7C15mGAK^
zvQDWpwV1Q=%|)J*vS+h8eD_X&KBLa;y!Ym4fd?y?u6<@yiQRcgW4YSWJ1qI-Q@4qE
za4m1Vxao>O&#^E1)!s>&+m1~AFk#ErRgE9c$R|1RHZn>ST)F2PCX`h;GftH|P3C*s
zWzB^ZGW^U2Io6G9<Cm+dn@b%$@cxkDi?0v*4*&Xhu{qw<UFz0*cKw3~R!=THb>jl>
z6zzz+mrM40Funf&SL@T49sAWnZvUNcc-}kaM`;+(`I*O}e=OTwz2vdB%C^t0KV2dN
z8|5bLIJC=m`3p1S>EdUM&gly9o_)k?62R=&u_P~(KYzPEv+V7u$GBF7Yt*targsEg
zTQzgVqnKmgxtO%H)!0fto_uWX^v1c;QdM?#toT{0*tgvCKBx=r`VraapZ2`+cgggB
z-Pvqw9={ifyv<wt>(DLz=%jkh_cpEkNBn#fQtx!K-V#22ApgPb-K(wNrdO3Et=(zk
zH%r#4Uj9|=lZlRA5;d`xvpUaban7~tb)L?vqO<o@r$c({0U_Q-$DE%pD%yDqwYKp-
ze(+{JQ~%8mo`p*G>(?31t6P_KXXUmI|NTdEW^*XD%W$kc6J6C`ZJL<Zk@PWEN6V*F
zkgcZ1#>_TRc(ux#yKj=Ue_0-Rb!XA^BcIEU<sO}THR1C69iJfyIzrFXz!I2{Cjk?3
zpFtDjcP19gPahu`@Un4gwRyCC=VfGMVP!CA>@^esCUfRc7B*q_(7f!t{PH}Q2nU7;
zJ3>UpKnkRbOIX-9zo<mPDX~()IX|zsG^ZppFWpeVKn^6!EiCR|kea6uoL^d$oT}iG
zT9%rVUyz%cS7In?APiE$EX?DTT2fM}5S&_6mRe*WC(dhNU}#`uWN2(^YGM)v<Qf_n
z8W}*jgU-E;^N~XoSVk~6_5wq-lc}+hVe40umt9-5IP9-{sGrmj5_UQxbn3f#Rhcal
zb$96Tc-UWFAhSV0y0D>s$!bwcyY3l3?6uy+&YLB9AjrXwMJ9=TVxnh^gTTRrgQDAx
z_HixoIbPSC|G?I^w5omSz6+<W?mi^z$(h6X=Z@>C2WR&Q742Af!tZ{F_B0c(^#Lh&
zza|JWF*7nSB0CQl;mkmH*$SFDWnY}}>VU(o3#<5V+huGG`Dn2??1_qdd2)==i--F?
zs#KSqOx?Wrm7jRA(!0Yuu5HVhrWZZce5Lb}5Bq8!uvR=V-JM%7`INM|?JE9h{&PR9
zPS5OYv=7|qeAeX{<0}8%Th2N96wN*x(D1*r!0!3JEkDAd&tKmoUZ_-IpH*z9SS<f#
VnWy8+Ul;a#sHi_<p_OCR1^^CaPjmnP

diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index ac44c7717d0..7925bffc5a4 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -1,6 +1,21 @@
 # The root directory of the data store
 storeroot-dir = data/store
 
+# Port
+port = 8444
+
+# Session timeout in minutes
+session-timeout = 30
+
+# Path to the keystore
+keystore.path = etc/jetty-keystore
+
+# Password of the keystore
+keystore.password = changeit
+
+# Key password of the keystore
+keystore.key-password = changeit
+
 # The check interval (in seconds)
 check-interval = 60
 
@@ -14,7 +29,7 @@ shutdown-timeout = 180
 # If free disk space goes below value defined here, a notification email will be sent.
 # Value must be specified in kilobytes (1048576 = 1024 * 1024 = 1GB). If no high water mark is
 # specified or if value is negative, the system will not be watching.
-highwater-mark = 1048576
+highwater-mark = -1
 
 # If a data set is successfully registered it sends out an email to the registrator. 
 # If this property is not specified, no email is sent to the registrator. This property
@@ -22,13 +37,13 @@ highwater-mark = 1048576
 notify-successful-registration = false
 
 # The URL of the openBIS server
-server-url = https://localhost:8443/openbis
+server-url = https://localhost:8443/openbis/openbis
 
 # The username to use when contacting the openBIS server
 username = etlserver
 
 # The password to use when contacting the openBIS server
-password = <change this>
+password = etlserver
 
 # SMTP properties (must start with 'mail' to be considered). 
 # mail.smtp.host = localhost
@@ -64,7 +79,7 @@ default-prefix-for-absolute-paths =
 
 processors = DATA_ACQUISITION
 processor.DATA_ACQUISITION.prefix-for-absolute-paths = ${default-prefix-for-absolute-paths}
-processor.DATA_ACQUISITION.prefix-for-relative-paths = targets/processing
+processor.DATA_ACQUISITION.prefix-for-relative-paths = data/processing
 processor.DATA_ACQUISITION.parameters-file = parameters
 processor.DATA_ACQUISITION.data-set-code-prefix-glue = ${data-set-file-name-entity-separator}
 processor.DATA_ACQUISITION.finished-file-template = .MARKER_is_finished_{0}
@@ -79,7 +94,8 @@ inputs=main-thread
 # ---------------------------------------------------------------------------
 # 'main-thread' thread configuration
 # ---------------------------------------------------------------------------
-
+# The group 
+main-thread.group-code = TEST
 # The directory to watch for incoming data.
 main-thread.incoming-dir = data/incoming
 # The group the samples extracted by this thread belong to. If commented out or empty, then samples
@@ -87,7 +103,6 @@ main-thread.incoming-dir = data/incoming
 # main-thread.group-code = <change this>
 
 # ---------------- Plugin properties
-
 # The extractor class to use for code extraction
 main-thread.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
 # Separator used to extract the barcode in the data set file name
@@ -107,4 +122,3 @@ main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcess
 # main-thread.storage-processor.sampleTypeCode = CELL_PLATE
 # main-thread.storage-processor.sampleTypeDescription = Screening Plate
 # main-thread.storage-processor.format = UNKNOWN V1.0
-
-- 
GitLab