From fe4e4d48b3864adcaff8946aba024cfe406296fa Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 26 Feb 2009 15:04:56 +0000
Subject: [PATCH] LMS-768 Other files/code snippets moved from
'dataset_download' to 'datastore_server'. Build script and service.properties
adapted.
SVN: 10017
---
datastore_server/build/build.xml | 11 ++++--
datastore_server/dist/datastore_server.sh | 4 +--
datastore_server/dist/etc/jetty-keystore | Bin 0 -> 1357 bytes
datastore_server/etc/service.properties | 15 ++++++++
.../resource/eclipse/Data Store Server.launch | 4 +--
.../openbis/dss/generic/DataStoreServer.java | 34 ++++++++++++++++++
6 files changed, 61 insertions(+), 7 deletions(-)
create mode 100644 datastore_server/dist/etc/jetty-keystore
create mode 100644 datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index c925a1ea767..3cfcb13002b 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -42,10 +42,12 @@
<include name="**/unix.so"/>
</fileset>
<manifest>
- <attribute name="Main-Class" value="ch.systemsx.cisd.etlserver.Main" />
+ <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer" />
<attribute name="Class-Path"
- 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" />
+ value="datastore_server-plugins.jar jetty.jar jetty-util.jar servlet-api-2.5.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"
value="${version.number} (r${revision.number},${clean.flag})" />
@@ -54,6 +56,9 @@
</target>
<target name="dist" depends="jar">
+ <copy file="${lib}/jetty/jetty.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jetty/jetty-util.jar" todir="${dist.datastore_server.lib}" />
+ <copy file="${lib}/jetty/servlet-api-2.5.jar" todir="${dist.datastore_server.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}" />
diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index 2b2ac229574..648a0a2b0cc 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -143,7 +143,7 @@ case "$command" in
exit 100
fi
- echo -n "Starting ETL Server "
+ echo -n "Starting Data Store Server "
rotateLogFiles $LOGFILE $MAXLOGS
shift 1
${JAVA_BIN} ${ALL_JAVA_OPTS} -jar $JAR_FILE "$@" > $STARTUPLOG 2>&1 & echo $! > $PIDFILE
@@ -192,7 +192,7 @@ case "$command" in
fi
;;
stop)
- echo -n "Stopping ETL Server "
+ echo -n "Stopping Data Store Server "
if [ -f $PIDFILE ]; then
PID=`cat $PIDFILE 2> /dev/null`
isPIDRunning $PID
diff --git a/datastore_server/dist/etc/jetty-keystore b/datastore_server/dist/etc/jetty-keystore
new file mode 100644
index 0000000000000000000000000000000000000000..a5826327f67a2dd915237b7cf7d18bcfb225ad90
GIT binary patch
literal 1357
zcmezO_TO6u1_mY|W&~rllKkA{#1bG^^38*^c%alSgC?eJ27GK>+H8z0j9N^BjEt-d
zEKN*{>htpZ-y8XP9gEEC3TCuBSul;i`&cx$^^&QpOVX5Imy2}dY0saju>MlRC+lZI
z;Wj&NyiC-1l{G~zc$-0(mD&X_wco-u-y?GSU(dN-8p3+oXNTRL{;ej;eFvo`ht3J!
z`*P{AJG*z!emcc(C7<4s!r+^&3l4YW39bv%yLKl`nR!P*=cJO&UB^}x%CR?g288T5
zx%B7iSA8WF!n*Gp+}YAUOtW4qR^<14`NUkg4>7L}*;c&yBQ1Yc**kgVq~Jvc$um;y
zMDLc%JW=a0`X=*l!PbS#LaQqEJR81Qo^#A)S5lV@l3?F`(J?II%7Y_Kn-*1j+%vdc
z!l%8^akgoc*^;ALPdz_czpd@doVUZ+tv%b<v-141mopDk|8>;bTlebKDpvUmr7t$#
z-NN_Xzck0}*_EApBEO0({}fny^ZX{!HM$q-LRnQeu0PrOY)X9uW58;T^;>ow@!a*f
zlX2_Cox2vd-Ffy(zFh22<}c2Q-ucG_MXtYHEtH*J7o%`fWoviAp)Gn>6E8}w$gr!J
zcDpBU!_$So{<Z$-etwRJbLS8Ff?JcKZ7k21F1+UAmeJ~WZqJ8*>5m@GddrjFlX1dy
zdU<{5UM0pCGfU@NvF^~?sBN_M{r<@NT8Gy=Eq&)a>EOFAJC*Cwm*Y<uPvQA|hn;<k
zVEO&0Pa=QX@6fZ~xMIz1b}^aXkz#Ln{zbNj+;0~;_e1{|llqi*QU}&0wnTqBv*v`y
zztmlqbeFKVM9MR<u-v<^&^d9o-=fWz-x!BxPEN4h;g+kvFh42l9_x*O_{X-vA!eR#
zW{sPt2jsbSWwvOu?(N-L%XGs-HT<*H>NQMf(*JGc`_ZY?ai=(_<>9F({dX4YJv+=1
zymW<8YW}UGHR9pHrJ5fy%mQ2PmRT_x|6j)T@>=Gsc~L<I(^DWRnl(bt)W8y$kbQs&
z*~6fTaU&CphmPZX170>xtu~Lg@4SqREUXL$*@oN(oNUaYENsF|&K`yWz$6dka0s)9
z=4I#Qm*>Gm*byQk20|b;T*BP0Asz}*rKv@k$r&(p+z540vzXx`26E!O1{MaUhNgzb
zrWU5AQR2LYAg(c#OJBz{qJ#x7cQZHkG8i;=GBq|bOsrgd*(56d<Ae1F^(NkY^?`i}
z-`=J24P|pOC#wYYY`?7h_*1&=^Diy^d}|Ke-fU>I^lI+xS#|<*gEL!7cOCNfpVs!O
z$Nz|R+Z{odS5H5QSTUVnY?yR{F;h!;w{01N{_fxHYbPjc)vwT4d1ljeUbp4ECLCv3
zuC6qD<!do%#ntAMOw5c7jA&8C40KoYv+|^>)DFhwCH~sn+$~&@yXLOB=_c@LPT#!8
zRnc;c@{26$1mEy;w4XImKAu`-HCvtYaZ%T+t7(7Vl$WYmdGP#G*XQ?5IW6BI`NIA5
zbkF~SvhQrqTv`?6m)Y6y^P14T<mk{hC7m-r<nT@v`E};eLq4$rhES%zOWs+%@K<HZ
a4_14i{&Rm@;EnL>%m*VkFLE*O+YbOV*De$Q
literal 0
HcmV?d00001
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index 026cc56c6de..af28618f0ab 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -1,6 +1,21 @@
# The root directory of the data store
storeroot-dir = targets/store
+# Port
+port = 8889
+
+# Session timeout in minutes
+session-timeout = 30
+
+# Path to the keystore
+keystore.path = dist/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 = 5
diff --git a/datastore_server/resource/eclipse/Data Store Server.launch b/datastore_server/resource/eclipse/Data Store Server.launch
index afdd321a796..ff93a24f1f4 100644
--- a/datastore_server/resource/eclipse/Data Store Server.launch
+++ b/datastore_server/resource/eclipse/Data Store Server.launch
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java"/>
+<listEntry value="/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.etlserver.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="datastore_server"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
</launchConfiguration>
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
new file mode 100644
index 00000000000..57b7dd79c82
--- /dev/null
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2009 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.dss.generic;
+
+import ch.systemsx.cisd.etlserver.Main;
+import ch.systemsx.cisd.openbis.dss.generic.server.DatasetDownloadService;
+
+/**
+ *
+ *
+ * @author Franz-Josef Elmer
+ */
+public class DataStoreServer
+{
+ public static void main(String[] args)
+ {
+ DatasetDownloadService.main(args);
+ Main.main(args);
+ }
+}
--
GitLab