From 20575a1afe0c57175703c1e2ff4597f258353b52 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 20 Apr 2016 12:07:10 +0000
Subject: [PATCH] SSDM-3510 change name of python version in dropboxes to not
hide global service property
SVN: 36238
---
.../registrator/api/v2/JythonTopLevelDataSetHandlerV2.java | 2 +-
.../cisd/etlserver/registrator/JythonDropboxRecoveryTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
index 3a55c0f13a2..a5235021187 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
@@ -49,7 +49,7 @@ public class JythonTopLevelDataSetHandlerV2<T extends DataSetInformation> extend
protected final IJythonInterpreterFactory jythonInterpreterFactory;
// version of jython. Available options are "2.7" and "2.5". Default is jython 2.7
- public static final String JYTHON_VERSION = "jython-version";
+ public static final String JYTHON_VERSION = "plugin-jython-version";
/**
* Constructor.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
index eced767be4a..02528be2a25 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
@@ -80,8 +80,8 @@ public class JythonDropboxRecoveryTest extends AbstractJythonDataSetHandlerTest
LinkedList<RecoveryTestCase> testCasesWithJython27 = recoveryTestCases();
for (RecoveryTestCase recoveryTestCase : testCasesWithJython27)
{
- recoveryTestCase.overrideProperties.put("jython-version", "2.7");
- recoveryTestCase.title += " @ jython 2.7";
+ recoveryTestCase.overrideProperties.put("plugin-jython-version", "2.5");
+ recoveryTestCase.title += " @ jython 2.5";
}
testCases.addAll(testCasesWithJython27);
--
GitLab