From e2bb51621bbf83c13826d6a6a85f5842f18112da Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 21:05:34 +0000
Subject: [PATCH] Move JythonUtils from utilities to jython package.
SVN: 27011
---
.../cisd/common/{utilities => jython}/JythonUtils.java | 3 +--
.../v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java | 2 +-
.../shared/api/v1/validation/ValidationScriptRunner.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{utilities => jython}/JythonUtils.java (95%)
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java b/common/source/java/ch/systemsx/cisd/common/jython/JythonUtils.java
similarity index 95%
rename from common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
rename to common/source/java/ch/systemsx/cisd/common/jython/JythonUtils.java
index 7db6a0425a4..b985a0b6a5c 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/JythonUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/jython/JythonUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.jython;
import java.util.HashMap;
import java.util.Map;
@@ -25,7 +25,6 @@ import org.python.core.PyFunction;
import org.python.core.PyObject;
import org.python.core.PySequenceList;
-import ch.systemsx.cisd.common.jython.PythonInterpreter;
/**
* Jython utility methods.
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 4766708fdc7..f49473a6947 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,10 +23,10 @@ import org.python.core.PyObject;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.exceptions.NotImplementedException;
+import ch.systemsx.cisd.common.jython.JythonUtils;
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;
import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationContext;
import ch.systemsx.cisd.etlserver.registrator.JythonTopLevelDataSetHandler.JythonHookFunction;
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 1e795fc92be..8b499c5fa4c 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,8 +30,8 @@ import org.python.core.PyDictionary;
import org.python.core.PyFunction;
import org.python.core.PyObject;
+import ch.systemsx.cisd.common.jython.JythonUtils;
import ch.systemsx.cisd.common.jython.PythonInterpreter;
-import ch.systemsx.cisd.common.utilities.JythonUtils;
/**
* @author Chandrasekhar Ramakrishnan
--
GitLab