From 9c122c62ede2dd11af182ab1c67af1ee6fb54bfc Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Thu, 2 Aug 2012 16:45:31 +0000 Subject: [PATCH] Move ISessionWorkspaceProvider from dss.generic.shared to dss.generic.shared.api.internal.v1 to mark it part of the API and get javadoc created for it. SVN: 26299 --- .../openbis/dss/generic/server/SessionWorkspaceProvider.java | 2 +- .../server/plugins/jython/PluginScriptRunnerFactory.java | 2 +- .../openbis/dss/generic/shared/DataSetProcessingContext.java | 1 + .../shared/{ => api/internal/v1}/ISessionWorkspaceProvider.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/{ => api/internal/v1}/ISessionWorkspaceProvider.java (94%) diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java index 85a59b911ef..53331b626e2 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java @@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server; import java.io.File; -import ch.systemsx.cisd.openbis.dss.generic.shared.ISessionWorkspaceProvider; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISessionWorkspaceProvider; /** * A provider for the session workspace directory. diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java index 0bb1a13f3c7..01ad032a716 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java @@ -37,12 +37,12 @@ import ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api.IMailServi import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext; import ch.systemsx.cisd.openbis.dss.generic.shared.DataSourceQueryService; import ch.systemsx.cisd.openbis.dss.generic.shared.IHierarchicalContentProvider; -import ch.systemsx.cisd.openbis.dss.generic.shared.ISessionWorkspaceProvider; import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider; import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization.IAuthorizationService; import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetContentProvider; import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSourceQueryService; import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISearchService; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISessionWorkspaceProvider; import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTableModelBuilderAdaptor; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java index 15525332f6d..37230aa1240 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java @@ -20,6 +20,7 @@ import java.util.Map; import ch.systemsx.cisd.common.mail.IMailClient; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISessionWorkspaceProvider; /** * Context for processing data sets by a {@link IProcessingPluginTask}. diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISessionWorkspaceProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISessionWorkspaceProvider.java similarity index 94% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISessionWorkspaceProvider.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISessionWorkspaceProvider.java index 08f0a1526a9..20b3a4f484e 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISessionWorkspaceProvider.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISessionWorkspaceProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; import java.io.File; -- GitLab