From bb7ddd5ecb17086e20315d354861fddaffd2831b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 20:44:46 +0000
Subject: [PATCH] Move Interpreter from interpreter to jython package.
SVN: 27008
---
.../cisd/common/{interpreter => jython}/PythonInterpreter.java | 2 +-
.../ch/systemsx/cisd/common/jython/evaluator/Evaluator.java | 2 +-
.../java/ch/systemsx/cisd/common/utilities/JythonUtils.java | 2 +-
.../systemsx/cisd/common/jython/JythonScriptSplitterTest.java | 1 -
.../etlserver/registrator/JythonTopLevelDataSetHandler.java | 2 +-
.../registrator/api/v2/DataSetRegistrationServiceV2.java | 2 +-
.../api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java | 2 +-
.../registrator/api/v2/JythonDataSetRegistrationServiceV2.java | 2 +-
.../registrator/api/v2/JythonTopLevelDataSetHandlerV2.java | 2 +-
.../shared/api/v1/validation/ValidationScriptRunner.java | 2 +-
.../jython/api/v1/impl/MasterDataRegistrationScriptRunner.java | 2 +-
.../cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java | 2 +-
.../openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java | 2 +-
13 files changed, 12 insertions(+), 13 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{interpreter => jython}/PythonInterpreter.java (98%)
diff --git a/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java b/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java
rename to common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
index 616ad2a4432..43438c5b1ac 100644
--- a/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java
+++ b/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.interpreter;
+package ch.systemsx.cisd.common.jython;
import org.apache.log4j.Logger;
import org.python.core.PyObject;
diff --git a/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java b/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java
index b2fd759aa5b..df1ed26d8f9 100644
--- a/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java
+++ b/common/source/java/ch/systemsx/cisd/common/jython/evaluator/Evaluator.java
@@ -39,7 +39,7 @@ import org.python.core.PyStringMap;
import org.python.core.PySystemState;
import org.python.core.PyTraceback;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.shared.basic.utils.CommaSeparatedListBuilder;
/**
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java b/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
index 02479f0bea2..7db6a0425a4 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
@@ -25,7 +25,7 @@ import org.python.core.PyFunction;
import org.python.core.PyObject;
import org.python.core.PySequenceList;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
/**
* Jython utility methods.
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java
index f67e59aac90..95055952c67 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/jython/JythonScriptSplitterTest.java
@@ -25,7 +25,6 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
/**
* @author pkupczyk
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
index a3c4ed6facf..df5fad34fa7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
@@ -27,7 +27,7 @@ import org.python.core.PyObject;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.NotImplementedException;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
index d6ba93711a0..41dd6e633c8 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
@@ -41,7 +41,7 @@ public class DataSetRegistrationServiceV2<T extends DataSetInformation> extends
{
super(registrator, incomingDataSetFile, userProvidedDataSetInformationOrNull,
globalCleanAfterwardsAction, delegate,
- new ch.systemsx.cisd.common.interpreter.PythonInterpreter()
+ new ch.systemsx.cisd.common.jython.PythonInterpreter()
{
@Override
public void set(String name, Object value)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
index 55988f477e0..4766708fdc7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
@@ -23,7 +23,7 @@ import org.python.core.PyObject;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.exceptions.NotImplementedException;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.utilities.JythonUtils;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
index 2acacc59622..af5037a4fa7 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v2;
import java.io.File;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
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 bad4ef96304..4b2a2d0f75c 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
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v2;
import java.io.File;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
index 01ebac526ba..1e795fc92be 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
@@ -30,7 +30,7 @@ import org.python.core.PyDictionary;
import org.python.core.PyFunction;
import org.python.core.PyObject;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.utilities.JythonUtils;
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
index f0ba40ea4cc..b668fef7507 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
@@ -21,8 +21,8 @@ import java.util.List;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
import ch.systemsx.cisd.common.jython.JythonScriptSplitter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
/**
* A class for running python scripts that register master data.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
index 6a3c1368dfe..3d6159aa675 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/JythonPlateDataSetHandler.java
@@ -2,7 +2,7 @@ package ch.systemsx.cisd.openbis.dss.etl.jython;
import java.io.File;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
index b843cf02131..8dc82e3f5ba 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/v2/JythonPlateDataSetHandlerV2.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.etl.jython.v2;
import java.io.File;
-import ch.systemsx.cisd.common.interpreter.PythonInterpreter;
+import ch.systemsx.cisd.common.jython.PythonInterpreter;
import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
--
GitLab