From f26d27769d9a6f56d4bc393a7f2cf76fc9b06005 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 11 Mar 2009 07:51:44 +0000
Subject: [PATCH] LMS-769 using server.keystore for DSS, clean up some warnings
SVN: 10172
---
datastore_server/dist/etc/jetty-keystore | Bin 1357 -> 0 bytes
datastore_server/dist/etc/service.properties | 2 +-
datastore_server/etc/service.properties | 2 +-
.../cisd/etlserver/DataStoreStrategyKey.java | 2 ++
.../java/ch/systemsx/cisd/etlserver/Main.java | 20 ------------------
5 files changed, 4 insertions(+), 22 deletions(-)
delete mode 100644 datastore_server/dist/etc/jetty-keystore
diff --git a/datastore_server/dist/etc/jetty-keystore b/datastore_server/dist/etc/jetty-keystore
deleted file mode 100644
index a5826327f67a2dd915237b7cf7d18bcfb225ad90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
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
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 7925bffc5a4..55a235ffac0 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -8,7 +8,7 @@ port = 8444
session-timeout = 30
# Path to the keystore
-keystore.path = etc/jetty-keystore
+keystore.path = etc/openBIS.keystore
# Password of the keystore
keystore.password = changeit
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index af28618f0ab..36f8e8ab563 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -8,7 +8,7 @@ port = 8889
session-timeout = 30
# Path to the keystore
-keystore.path = dist/etc/jetty-keystore
+keystore.path = dist/etc/openBIS.keystore
# Password of the keystore
keystore.password = changeit
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
index ba26e78155a..c162760ea48 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.etlserver;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
+
/**
* Key associated with each {@link IDataStoreStrategy}.
*
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 08928c8d74c..65990253f63 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
@@ -37,7 +37,6 @@ import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.TimerUtilities;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
-import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.HighLevelException;
import ch.systemsx.cisd.common.exceptions.StopException;
import ch.systemsx.cisd.common.filesystem.DirectoryScanningTimerTask;
@@ -52,7 +51,6 @@ import ch.systemsx.cisd.common.highwatermark.HostAwareFileWithHighwaterMark;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
-import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
import ch.systemsx.cisd.common.utilities.BuildAndEnvironmentInfo;
import ch.systemsx.cisd.common.utilities.IExitHandler;
import ch.systemsx.cisd.common.utilities.ISelfTestable;
@@ -61,7 +59,6 @@ import ch.systemsx.cisd.common.utilities.PropertyUtils;
import ch.systemsx.cisd.common.utilities.SystemExit;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
-import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.IWebService;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
@@ -214,23 +211,6 @@ public final class Main
}
}
- private static IETLLIMSService getETLLIMSService(final Parameters parameters)
- {
- final String serviceURL = getServiceURL(parameters) + "/rmi-etl";
- final IETLLIMSService service = HttpInvokerUtils.createServiceStub(IETLLIMSService.class, serviceURL, 5);
- return service;
- }
-
- private static String getServiceURL(final Parameters parameters)
- {
- final String serverURL = parameters.getServerURL();
- if (serverURL == null)
- {
- throw new EnvironmentFailureException("Application Server URL is not defined.");
- }
- return serverURL;
- }
-
private static void startupServer(final Parameters parameters)
{
final Map<String, IProcessorFactory> processorFactories =
--
GitLab