From 656c5ed5676d6b1ebb1b9220756182550aef08cb Mon Sep 17 00:00:00 2001 From: jakubs <jakubs> Date: Mon, 22 Oct 2012 09:45:00 +0000 Subject: [PATCH] SP-334 SWE-14 rename common package to openbis.common in openbis-common project SVN: 27290 --- .../cisd/openbis/dss/etl/AbsoluteImageReference.java | 2 +- .../dss/etl/AbstractImageStorageProcessor.java | 4 ++-- ...IntensityLevelTransformationsMaintenanceTask.java | 2 +- .../dss/etl/HCSImageDatasetLoaderFactory.java | 2 +- .../cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java | 12 ++++++------ .../dss/etl/ImageSizeFeedingMaintenanceTask.java | 2 +- .../java/ch/systemsx/cisd/openbis/dss/etl/Utils.java | 2 +- .../dss/etl/dataaccess/ImagingDatasetLoader.java | 4 ++-- .../ImagingDataSetRegistrationTransaction.java | 4 ++-- .../etl/jython/SimpleImageDataSetRegistrator.java | 2 +- .../generic/server/MergingImagesDownloadServlet.java | 2 +- .../generic/server/images/ImageChannelsUtils.java | 6 +++--- ...bstractSpotImagesTransformerProcessingPlugin.java | 2 +- ...namixWellBrightnessEqualizerProcessingPlugin.java | 4 ++-- .../ExampleImageTransformationProcessingPlugin.java | 2 +- .../FeatureListsAggregationServicePlugin.java | 2 +- ...esetImageLevelTransformationProcessingPlugin.java | 2 +- .../dss/screening/server/DssServiceRpcScreening.java | 12 ++++++------ .../server/DssServiceRpcScreeningLogger.java | 2 +- .../client/api/v1/ScreeningOpenbisServiceFacade.java | 2 +- .../client/web/server/ScreeningClientService.java | 2 +- .../server/ScreeningApiServiceJsonServer.java | 2 +- .../screening/server/ScreeningApiServiceServer.java | 2 +- .../plugin/screening/server/ScreeningServer.java | 2 +- .../screening/server/ScreeningServerLogger.java | 2 +- ...ScreeningJsonClassValueToClassObjectsMapping.java | 2 +- .../shared/api/json/ScreeningObjectMapper.java | 10 +++++----- .../dss/etl/ImageSizeFeedingMaintenanceTaskTest.java | 2 +- .../server/images/ImageChannelsUtilsTest.java | 4 ++-- .../screening/server/DssServiceRpcScreeningTest.java | 8 ++++---- .../ScreeningJythonBasedReportingPluginTest.java | 2 +- .../api/v1/ScreeningOpenbisServiceFacadeTest.java | 6 +++--- .../screening/systemtests/JsonAnnotationTest.java | 4 ++-- 33 files changed, 60 insertions(+), 60 deletions(-) diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbsoluteImageReference.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbsoluteImageReference.java index 0e504f5cd82..2c5f832622b 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbsoluteImageReference.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbsoluteImageReference.java @@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.etl; import java.awt.image.BufferedImage; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.openbis.dss.etl.dto.ImageLibraryInfo; import ch.systemsx.cisd.openbis.dss.etl.dto.ImageTransfomationFactories; import ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.ChannelColorRGB; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java index 1dd59b4475d..9caeadb3895 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java @@ -42,8 +42,8 @@ import ch.systemsx.cisd.common.filesystem.FileOperations; import ch.systemsx.cisd.common.filesystem.FileUtilities; import ch.systemsx.cisd.common.filesystem.IFileOperations; import ch.systemsx.cisd.common.filesystem.SoftLinkMaker; -import ch.systemsx.cisd.common.hdf5.HDF5Container; -import ch.systemsx.cisd.common.hdf5.HierarchicalStructureDuplicatorFileToHDF5; +import ch.systemsx.cisd.openbis.common.hdf5.HDF5Container; +import ch.systemsx.cisd.openbis.common.hdf5.HierarchicalStructureDuplicatorFileToHDF5; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.mail.IMailClient; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ComputeIntensityLevelTransformationsMaintenanceTask.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ComputeIntensityLevelTransformationsMaintenanceTask.java index 23c3159efa9..dc52f723e6d 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ComputeIntensityLevelTransformationsMaintenanceTask.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ComputeIntensityLevelTransformationsMaintenanceTask.java @@ -32,7 +32,7 @@ import ch.systemsx.cisd.common.exception.ConfigurationFailureException; import ch.systemsx.cisd.common.image.IntensityRescaling.Levels; import ch.systemsx.cisd.common.io.PersistentExtendedBlockingQueueDecorator; import ch.systemsx.cisd.common.io.PersistentExtendedBlockingQueueFactory; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.maintenance.IMaintenanceTask; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/HCSImageDatasetLoaderFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/HCSImageDatasetLoaderFactory.java index 7f4bc17aaad..a8eda14b071 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/HCSImageDatasetLoaderFactory.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/HCSImageDatasetLoaderFactory.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.openbis.dss.etl; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.openbis.dss.etl.dataaccess.ImagingDatasetLoader; import ch.systemsx.cisd.openbis.dss.shared.DssScreeningUtils; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java index 41f4deb4c78..61d86f02ca4 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java @@ -39,12 +39,12 @@ import ch.systemsx.cisd.common.concurrent.ITaskExecutor; import ch.systemsx.cisd.common.concurrent.ParallelizedExecutor; import ch.systemsx.cisd.common.exception.Status; import ch.systemsx.cisd.common.filesystem.FileUtilities; -import ch.systemsx.cisd.common.hdf5.HDF5Container; -import ch.systemsx.cisd.common.hdf5.HDF5Container.IHDF5WriterClient; -import ch.systemsx.cisd.common.hdf5.IHDF5ContainerWriter; -import ch.systemsx.cisd.common.io.ByteArrayBasedContentNode; -import ch.systemsx.cisd.common.io.FileBasedContentNode; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.hdf5.HDF5Container; +import ch.systemsx.cisd.openbis.common.hdf5.HDF5Container.IHDF5WriterClient; +import ch.systemsx.cisd.openbis.common.hdf5.IHDF5ContainerWriter; +import ch.systemsx.cisd.openbis.common.io.ByteArrayBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.FileBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.process.ProcessExecutionHelper; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java index 67f6803cd3f..5018818c01a 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java @@ -27,7 +27,7 @@ import net.lemnik.eodsql.QueryTool; import org.apache.log4j.Logger; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.common.maintenance.IDataStoreLockingMaintenanceTask; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Utils.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Utils.java index b5e2ad8a59e..ed3298feb6b 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Utils.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Utils.java @@ -21,7 +21,7 @@ import java.awt.image.BufferedImage; import org.apache.log4j.Logger; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.openbis.dss.etl.dto.ImageLibraryInfo; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingDatasetLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingDatasetLoader.java index 24228c187ae..eaa873ee515 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingDatasetLoader.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingDatasetLoader.java @@ -27,8 +27,8 @@ import org.apache.commons.lang.StringUtils; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.hcs.Location; import ch.systemsx.cisd.openbis.dss.etl.AbsoluteImageReference; import ch.systemsx.cisd.openbis.dss.etl.IImagingDatasetLoader; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java index 627b5b01396..172d946588a 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java @@ -32,8 +32,8 @@ import java.util.Properties; import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.io.FileBasedContentNode; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.FileBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationDetails; import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationService; import ch.systemsx.cisd.etlserver.registrator.IDataSetRegistrationDetailsFactory; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java index fb25add1219..fe2bf44d6ac 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java @@ -39,7 +39,7 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities; import ch.systemsx.cisd.common.image.IntensityRescaling; import ch.systemsx.cisd.common.image.IntensityRescaling.Levels; import ch.systemsx.cisd.common.image.IntensityRescaling.PixelHistogram; -import ch.systemsx.cisd.common.io.FileBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.FileBasedContentNode; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationDetails; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MergingImagesDownloadServlet.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MergingImagesDownloadServlet.java index 30000b8b8ec..96ceae363c9 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MergingImagesDownloadServlet.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MergingImagesDownloadServlet.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.Properties; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.openbis.dss.generic.server.images.ImageChannelsUtils; import ch.systemsx.cisd.openbis.dss.generic.server.images.dto.ImageGenerationDescription; import ch.systemsx.cisd.openbis.dss.generic.shared.IHierarchicalContentProvider; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtils.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtils.java index 4eaa8a05980..9ac6fe3a76f 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtils.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtils.java @@ -32,9 +32,9 @@ import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.common.image.MixColors; -import ch.systemsx.cisd.common.io.ByteArrayBasedContentNode; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.ByteArrayBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.hcs.Location; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java index d4b445c3ec2..55d97206a61 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/AbstractSpotImagesTransformerProcessingPlugin.java @@ -22,7 +22,7 @@ import java.util.Properties; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.exception.Status; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.properties.PropertyUtils; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDatastorePlugin; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/DynamixWellBrightnessEqualizerProcessingPlugin.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/DynamixWellBrightnessEqualizerProcessingPlugin.java index 1bf3c248199..e717168b043 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/DynamixWellBrightnessEqualizerProcessingPlugin.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/DynamixWellBrightnessEqualizerProcessingPlugin.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Properties; import ch.systemsx.cisd.base.image.IImageTransformerFactory; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.common.properties.PropertyUtils; import ch.systemsx.cisd.openbis.dss.etl.dynamix.IntensityRangeReductionFactory; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.ColorRangeCalculator.ImagePixelsRange; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ExampleImageTransformationProcessingPlugin.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ExampleImageTransformationProcessingPlugin.java index 3583a28f255..650001649a7 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ExampleImageTransformationProcessingPlugin.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ExampleImageTransformationProcessingPlugin.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Properties; import ch.systemsx.cisd.base.image.IImageTransformerFactory; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.properties.PropertyUtils; import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ExampleImageTransformerFactory; import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgImageEnrichedDTO; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FeatureListsAggregationServicePlugin.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FeatureListsAggregationServicePlugin.java index 064bb1ed70a..021215fb9ca 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FeatureListsAggregationServicePlugin.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FeatureListsAggregationServicePlugin.java @@ -25,7 +25,7 @@ import java.util.Properties; import org.apache.commons.io.IOUtils; import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AggregationService; import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ResetImageLevelTransformationProcessingPlugin.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ResetImageLevelTransformationProcessingPlugin.java index 7081bfbb43c..49e95500989 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ResetImageLevelTransformationProcessingPlugin.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ResetImageLevelTransformationProcessingPlugin.java @@ -20,7 +20,7 @@ import java.io.File; import java.util.List; import java.util.Properties; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgImageEnrichedDTO; /** diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java index f37082d1ba8..0e173fddb90 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java @@ -38,15 +38,15 @@ import com.googlecode.jsonrpc4j.Base64; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.api.RpcServiceInterfaceVersionDTO; -import ch.systemsx.cisd.common.api.server.RpcServiceNameServer; +import ch.systemsx.cisd.openbis.common.api.server.RpcServiceNameServer; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.io.ConcatenatedContentInputStream; +import ch.systemsx.cisd.openbis.common.io.ConcatenatedContentInputStream; import ch.systemsx.cisd.common.io.ConcatenatedFileOutputStreamWriter; -import ch.systemsx.cisd.common.io.HierarchicalContentNodeBasedHierarchicalContentNode; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.io.HierarchicalContentNodeBasedHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.hcs.Location; import ch.systemsx.cisd.openbis.dss.etl.AbsoluteImageReference; import ch.systemsx.cisd.openbis.dss.etl.HCSImageDatasetLoaderFactory; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningLogger.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningLogger.java index b8c0e703c65..6a4997d93fe 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningLogger.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningLogger.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; import ch.systemsx.cisd.base.image.IImageTransformerFactory; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening; import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.LoadImageConfiguration; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java index 03a6eeb45a3..3ebe87908e8 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.time.DateUtils; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.api.MinimalMinorVersion; -import ch.systemsx.cisd.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; import ch.systemsx.cisd.common.api.retry.RetryCaller; import ch.systemsx.cisd.common.api.retry.RetryProxyFactory; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java index abe560a6762..9ab1a4f3c01 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.common.servlet.IRequestContextProvider; -import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile; +import ch.systemsx.cisd.openbis.common.spring.IUncheckedMultipartFile; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.IResultSetConfig; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ListMaterialDisplayCriteria; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSet; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceJsonServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceJsonServer.java index f5281d602fb..80b9353253a 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceJsonServer.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceJsonServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiJsonServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiJsonServiceExporter; import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames; import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceServer.java index cada4821289..6b9d910b56a 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceServer.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningApiServiceServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiServiceExporter; import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames; import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java index b49f2553985..8cfc2ce74bd 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Component; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.Capability; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java index f290fd2e2a3..5bca96d0617 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java @@ -21,7 +21,7 @@ import java.util.List; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Sample; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningJsonClassValueToClassObjectsMapping.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningJsonClassValueToClassObjectsMapping.java index 686a969c618..256ccc44116 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningJsonClassValueToClassObjectsMapping.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningJsonClassValueToClassObjectsMapping.java @@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.json; import java.util.List; -import ch.systemsx.cisd.common.api.server.json.mapping.JsonStaticClassValueToClassObjectsMapping; +import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonStaticClassValueToClassObjectsMapping; import ch.systemsx.cisd.openbis.generic.shared.api.json.GenericJsonClassValueToClassObjectsMapping; /** diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningObjectMapper.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningObjectMapper.java index b4500d9ee87..4b9849b9a93 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningObjectMapper.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/json/ScreeningObjectMapper.java @@ -19,11 +19,11 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.json; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext; -import ch.systemsx.cisd.common.api.server.json.deserializer.JsonDeserializerFactory; -import ch.systemsx.cisd.common.api.server.json.introspector.JsonTypeAndClassAnnotationIntrospector; -import ch.systemsx.cisd.common.api.server.json.mapping.JsonReflectionsBaseTypeToSubTypesMapping; -import ch.systemsx.cisd.common.api.server.json.resolver.JsonReflectionsSubTypeResolver; -import ch.systemsx.cisd.common.api.server.json.serializer.JsonSerializerFactory; +import ch.systemsx.cisd.openbis.common.api.server.json.deserializer.JsonDeserializerFactory; +import ch.systemsx.cisd.openbis.common.api.server.json.introspector.JsonTypeAndClassAnnotationIntrospector; +import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonReflectionsBaseTypeToSubTypesMapping; +import ch.systemsx.cisd.openbis.common.api.server.json.resolver.JsonReflectionsSubTypeResolver; +import ch.systemsx.cisd.openbis.common.api.server.json.serializer.JsonSerializerFactory; /** * Jackson library object mapper used in screening OpenBIS. diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java index 17f415dcc42..949f4a09471 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java @@ -28,7 +28,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.logging.BufferedAppender; import ch.systemsx.cisd.common.test.RecordingMatcher; import ch.systemsx.cisd.openbis.dss.etl.dataaccess.IImagingQueryDAO; diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtilsTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtilsTest.java index 3bf5b36bfce..50e3cfa7f48 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtilsTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/images/ImageChannelsUtilsTest.java @@ -38,8 +38,8 @@ import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel; import ch.systemsx.cisd.base.image.IImageTransformer; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; -import ch.systemsx.cisd.common.io.FileBasedContentNode; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.FileBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.imagereaders.ImageReaderConstants; import ch.systemsx.cisd.imagereaders.ImageReadersTestHelper; import ch.systemsx.cisd.openbis.dss.etl.AbsoluteImageReference; diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java index 60436be0fb5..96a32830f64 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java @@ -46,11 +46,11 @@ import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.base.mdarray.MDFloatArray; import ch.systemsx.cisd.common.exception.AuthorizationFailureException; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.io.ByteArrayBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.ByteArrayBasedContentNode; import ch.systemsx.cisd.common.io.ConcatenatedFileOutputStreamWriter; -import ch.systemsx.cisd.common.io.FileBasedContentNode; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.FileBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.hcs.Location; import ch.systemsx.cisd.openbis.dss.etl.AbsoluteImageReference; import ch.systemsx.cisd.openbis.dss.etl.IImagingDatasetLoader; diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/plugins/jython/ScreeningJythonBasedReportingPluginTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/plugins/jython/ScreeningJythonBasedReportingPluginTest.java index 5f5aaa34bf5..2a0c603e089 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/plugins/jython/ScreeningJythonBasedReportingPluginTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/plugins/jython/ScreeningJythonBasedReportingPluginTest.java @@ -28,7 +28,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent; import ch.systemsx.cisd.common.logging.LogInitializer; import ch.systemsx.cisd.common.test.RecordingMatcher; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.IPluginScriptRunnerFactory; diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java index 2621019cff0..b58dff3e827 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacadeTest.java @@ -39,9 +39,9 @@ import ch.rinn.restrictions.Friend; import ch.systemsx.cisd.base.image.IImageTransformerFactory; import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase; import ch.systemsx.cisd.common.filesystem.FileUtilities; -import ch.systemsx.cisd.common.io.ByteArrayBasedContentNode; -import ch.systemsx.cisd.common.io.ConcatenatedContentInputStream; -import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode; +import ch.systemsx.cisd.openbis.common.io.ByteArrayBasedContentNode; +import ch.systemsx.cisd.openbis.common.io.ConcatenatedContentInputStream; +import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.common.test.RecordingMatcher; import ch.systemsx.cisd.openbis.dss.client.api.v1.IDataSetDss; import ch.systemsx.cisd.openbis.dss.client.api.v1.IDssComponent; diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/JsonAnnotationTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/JsonAnnotationTest.java index 564ee3c4159..ff4282d51fc 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/JsonAnnotationTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/JsonAnnotationTest.java @@ -33,8 +33,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import ch.systemsx.cisd.base.annotation.JsonObject; -import ch.systemsx.cisd.common.api.server.json.JsonUniqueCheckIgnore; -import ch.systemsx.cisd.common.api.server.json.util.ClassReferences; +import ch.systemsx.cisd.openbis.common.api.server.json.JsonUniqueCheckIgnore; +import ch.systemsx.cisd.openbis.common.api.server.json.util.ClassReferences; import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric; import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationChangingService; -- GitLab