Skip to content
Snippets Groups Projects
Commit 5025a7cc authored by felmer's avatar felmer
Browse files

SSDM-3745: Jython27ClassLoader enabled again

SVN: 36814
parent dcecbffa
No related branches found
No related tags found
No related merge requests found
...@@ -160,10 +160,6 @@ CP=`echo $LIB_FOLDER/slf4j-log4j12-1.6.2.jar $LIB_FOLDER/datastore_server.jar $L ...@@ -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 \ $LIB_FOLDER/dbmigration*.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar \
| sed 's/\(.*\) [^ ]*jython27[^ ]* \(.*\)/\1 \2/g' \ | sed 's/\(.*\) [^ ]*jython27[^ ]* \(.*\)/\1 \2/g' \
| sed 's/ /:/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" CMD="${JAVA_BIN} ${JAVA_OPTS} ${JAVA_MEM_OPTS} -Dnative.libpath=$LIB_FOLDER/native -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
......
...@@ -45,8 +45,7 @@ public class Jython27FactoriesProvider ...@@ -45,8 +45,7 @@ public class Jython27FactoriesProvider
{ {
if (file.getName().startsWith("jython27")) if (file.getName().startsWith("jython27"))
{ {
// TODO un-comment when Jython27ClassLoader is working. return new Jython27ClassLoader(file);
// return new Jython27ClassLoader(file);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment