From 5025a7cc300370d571bdf7390b77026e9b79ec36 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 13 Jul 2016 10:34:46 +0000
Subject: [PATCH] SSDM-3745: Jython27ClassLoader enabled again
SVN: 36814
---
datastore_server/dist/datastore_server.sh | 4 ----
.../dss/generic/shared/utils/Jython27FactoriesProvider.java | 3 +--
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index bf260913703..13e4aca8805 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -160,10 +160,6 @@ 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 381184a4a66..aa2b6f0a825 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,8 +45,7 @@ public class Jython27FactoriesProvider
{
if (file.getName().startsWith("jython27"))
{
- // TODO un-comment when Jython27ClassLoader is working.
- // return new Jython27ClassLoader(file);
+ return new Jython27ClassLoader(file);
}
}
}
--
GitLab