From 302397a78630cb4f7a28f4a062941dce9d8d27be Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 5 Jul 2016 10:44:12 +0000
Subject: [PATCH] SSDM-3745: for the sprint release: not using
Jython27ClassLoader because it doesn't work.
SVN: 36791
---
datastore_server/dist/datastore_server.sh | 4 ++++
.../dss/generic/shared/utils/Jython27FactoriesProvider.java | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index 13e4aca8805..bf260913703 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -160,6 +160,10 @@ CP=`echo $LIB_FOLDER/slf4j-log4j12-1.6.2.jar $LIB_FOLDER/datastore_server.jar $L
$LIB_FOLDER/dbmigration*.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar \
| sed 's/\(.*\) [^ ]*jython27[^ ]* \(.*\)/\1 \2/g' \
| sed 's/ /:/g'`
+# TODO: remove the following statement when Jython27ClassLoader works
+CP=`echo $LIB_FOLDER/slf4j-log4j12-1.6.2.jar $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/common.jar \
+ $LIB_FOLDER/dbmigration*.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar \
+ | sed 's/ /:/g'`
CMD="${JAVA_BIN} ${JAVA_OPTS} ${JAVA_MEM_OPTS} -Dnative.libpath=$LIB_FOLDER/native -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java
index aa2b6f0a825..381184a4a66 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java
@@ -45,7 +45,8 @@ public class Jython27FactoriesProvider
{
if (file.getName().startsWith("jython27"))
{
- return new Jython27ClassLoader(file);
+ // TODO un-comment when Jython27ClassLoader is working.
+ // return new Jython27ClassLoader(file);
}
}
}
--
GitLab