From 9c6addea9fda99e62321f8b256613df071ff7b55 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 18 Dec 2015 15:38:51 +0000
Subject: [PATCH] SSDM-2978 : V3 AS API - change the package structure ("as" is
a Python keyword)
SVN: 35377
---
.../dssapi}/v3/DataStoreServerApi.java | 31 ++++++++++---------
.../dssapi}/v3/DataStoreServerApiLogger.java | 11 ++++---
.../dssapi}/v3/DataStoreServerApiServer.java | 12 ++++++-
.../DataSetFileDownloadInputStream.java | 8 ++---
.../dss/generic/server/DataStoreServer.java | 2 +-
.../server/EncapsulatedOpenBISService.java | 2 +-
.../dss/generic/shared/ServiceProvider.java | 4 +--
.../source/java/dssApplicationContext.xml | 4 +--
.../systemtest/api/v3/AbstractFileTest.java | 4 +--
.../systemtest/api/v3/DownloadFileTest.java | 12 +++----
.../dss/systemtest/api/v3/SearchFileTest.java | 4 +--
11 files changed, 53 insertions(+), 41 deletions(-)
rename datastore_server/source/java/ch/ethz/sis/openbis/generic/{dss/api => server/dssapi}/v3/DataStoreServerApi.java (89%)
rename datastore_server/source/java/ch/ethz/sis/openbis/generic/{dss/api => server/dssapi}/v3/DataStoreServerApiLogger.java (70%)
rename datastore_server/source/java/ch/ethz/sis/openbis/generic/{dss/api => server/dssapi}/v3/DataStoreServerApiServer.java (89%)
rename datastore_server/source/java/ch/ethz/sis/openbis/generic/{dss/api => server/dssapi}/v3/download/DataSetFileDownloadInputStream.java (89%)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java
similarity index 89%
rename from datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
rename to datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java
index 1a298b00ad6..56018b3bab2 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApi.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package ch.ethz.sis.openbis.generic.dss.api.v3;
+package ch.ethz.sis.openbis.generic.server.dssapi.v3;
import java.io.InputStream;
import java.util.ArrayList;
@@ -33,20 +33,21 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import ch.ethz.sis.openbis.generic.as.api.v3.IApplicationServerApi;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.search.ISearchCriteria;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.search.SearchOperator;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.common.search.SearchResult;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.dataset.DataSet;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.dataset.id.DataSetPermId;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.dataset.search.DataSetSearchCriteria;
-import ch.ethz.sis.openbis.generic.dss.api.v3.download.DataSetFileDownloadInputStream;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.DataSetFile;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.download.DataSetFileDownloadOptions;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.id.DataSetFilePermId;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.id.IDataSetFileId;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.search.DataSetFileSearchCriteria;
+import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchOperator;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search.DataSetSearchCriteria;
+import ch.ethz.sis.openbis.generic.dssapi.v3.IDataStoreServerApi;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.DataSetFile;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download.DataSetFileDownloadOptions;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.id.DataSetFilePermId;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.id.IDataSetFileId;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.search.DataSetFileSearchCriteria;
+import ch.ethz.sis.openbis.generic.server.dssapi.v3.download.DataSetFileDownloadInputStream;
import ch.systemsx.cisd.common.filesystem.IFreeSpaceProvider;
import ch.systemsx.cisd.common.filesystem.SimpleFreeSpaceProvider;
import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java
similarity index 70%
rename from datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
rename to datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java
index a9db2ccf424..07427f727c5 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiLogger.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java
@@ -1,12 +1,13 @@
-package ch.ethz.sis.openbis.generic.dss.api.v3;
+package ch.ethz.sis.openbis.generic.server.dssapi.v3;
import java.io.InputStream;
import java.util.List;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.DataSetFile;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.download.DataSetFileDownloadOptions;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.id.IDataSetFileId;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.search.DataSetFileSearchCriteria;
+import ch.ethz.sis.openbis.generic.dssapi.v3.IDataStoreServerApi;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.DataSetFile;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download.DataSetFileDownloadOptions;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.id.IDataSetFileId;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.search.DataSetFileSearchCriteria;
import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger;
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java
similarity index 89%
rename from datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
rename to datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java
index 46fbcd6844b..9ed8c84a1fe 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataStoreServerApiServer.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.ethz.sis.openbis.generic.dss.api.v3;
+package ch.ethz.sis.openbis.generic.server.dssapi.v3;
import java.io.IOException;
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import ch.ethz.sis.openbis.generic.dssapi.v3.IDataStoreServerApi;
import ch.systemsx.cisd.openbis.common.api.server.AbstractStreamSupportingApiServiceExporter;
/**
@@ -36,6 +37,15 @@ public class DataStoreServerApiServer extends AbstractStreamSupportingApiService
{
public static final String INTERNAL_BEAN_NAME = "v3-exporter";
+
+ /**
+ *
+ *
+ */
+ public DataStoreServerApiServer()
+ {
+ System.out.println();
+ }
@Resource(name = DataStoreServerApi.INTERNAL_SERVICE_NAME)
private IDataStoreServerApi service;
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/download/DataSetFileDownloadInputStream.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java
similarity index 89%
rename from datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/download/DataSetFileDownloadInputStream.java
rename to datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java
index 57bb76dbee7..9fda0c43b8d 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/dss/api/v3/download/DataSetFileDownloadInputStream.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.ethz.sis.openbis.generic.dss.api.v3.download;
+package ch.ethz.sis.openbis.generic.server.dssapi.v3.download;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -22,9 +22,9 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Map;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.dataset.id.DataSetPermId;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.DataSetFile;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.id.DataSetFilePermId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.DataSetFile;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.id.DataSetFilePermId;
import ch.systemsx.cisd.openbis.common.io.ConcatenatedContentInputStream;
import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index 32a9b13c8c4..e07bdd0647e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -56,7 +56,7 @@ import org.springframework.web.context.WebApplicationContext;
import com.googlecode.jsonrpc4j.spring.JsonServiceExporter;
import com.marathon.util.spring.StreamSupportingHttpInvokerServiceExporter;
-import ch.ethz.sis.openbis.generic.dss.api.v3.IDataStoreServerApi;
+import ch.ethz.sis.openbis.generic.dssapi.v3.IDataStoreServerApi;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.api.IRpcServiceNameServer;
import ch.systemsx.cisd.common.api.RpcServiceInterfaceVersionDTO;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index 899870837ad..d1caf622481 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang.time.DateUtils;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.FactoryBean;
-import ch.ethz.sis.openbis.generic.as.api.v3.IApplicationServerApi;
+import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
import ch.systemsx.cisd.common.api.retry.RetryCaller;
import ch.systemsx.cisd.common.api.retry.config.RetryConfiguration;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java
index ef395b941a8..9e116dce2cb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java
@@ -24,8 +24,8 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter;
import com.marathon.util.spring.StreamSupportingHttpInvokerServiceExporter;
-import ch.ethz.sis.openbis.generic.as.api.v3.IApplicationServerApi;
-import ch.ethz.sis.openbis.generic.dss.api.v3.DataStoreServerApiServer;
+import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
+import ch.ethz.sis.openbis.generic.server.dssapi.v3.DataStoreServerApiServer;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.openbis.dss.generic.shared.content.IContentCache;
diff --git a/datastore_server/source/java/dssApplicationContext.xml b/datastore_server/source/java/dssApplicationContext.xml
index 49a407df537..d23c1961077 100644
--- a/datastore_server/source/java/dssApplicationContext.xml
+++ b/datastore_server/source/java/dssApplicationContext.xml
@@ -11,12 +11,12 @@
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
<context:annotation-config />
- <context:component-scan base-package="ch.ethz.sis.openbis.generic.dss.api.v3" use-default-filters="false">
+ <context:component-scan base-package="ch.ethz.sis.openbis.generic.server.dssapi.v3" use-default-filters="false">
<context:include-filter type="annotation"
expression="org.springframework.stereotype.Controller" />
</context:component-scan>
- <context:component-scan base-package="ch.ethz.sis.openbis.generic.dss.api.v3" annotation-config="false">
+ <context:component-scan base-package="ch.ethz.sis.openbis.generic.server.dssapi.v3" annotation-config="false">
<context:include-filter type="annotation" expression="org.springframework.stereotype.Component" />
</context:component-scan>
diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java
index ba5a9fb13d8..f0ec160536f 100644
--- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java
+++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java
@@ -12,8 +12,8 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.testng.annotations.BeforeClass;
-import ch.ethz.sis.openbis.generic.dss.api.v3.IDataStoreServerApi;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.DataSetFile;
+import ch.ethz.sis.openbis.generic.dssapi.v3.IDataStoreServerApi;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.DataSetFile;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.openbis.datastoreserver.systemtests.SystemTestCase;
import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
index a8012389424..d13b56f3adb 100644
--- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
+++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
@@ -9,12 +9,12 @@ import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.testng.annotations.Test;
-import ch.ethz.sis.openbis.generic.as.api.v3.dto.dataset.id.DataSetPermId;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.download.DataSetFileDownload;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.download.DataSetFileDownloadOptions;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.download.DataSetFileDownloadReader;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.id.DataSetFilePermId;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.id.IDataSetFileId;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download.DataSetFileDownload;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download.DataSetFileDownloadOptions;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download.DataSetFileDownloadReader;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.id.DataSetFilePermId;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.id.IDataSetFileId;
public class DownloadFileTest extends AbstractFileTest
{
diff --git a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java
index a1eda3df796..3a94ae7bfc8 100644
--- a/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java
+++ b/datastore_server/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java
@@ -7,8 +7,8 @@ import java.util.List;
import org.testng.annotations.Test;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.DataSetFile;
-import ch.ethz.sis.openbis.generic.dss.api.v3.dto.datasetfile.search.DataSetFileSearchCriteria;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.DataSetFile;
+import ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.search.DataSetFileSearchCriteria;
public class SearchFileTest extends AbstractFileTest
{
--
GitLab