From 35dc4fcca84f9954b428266c6d21e8b3758adef5 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Thu, 31 May 2012 09:05:19 +0000
Subject: [PATCH] BIS-35 / SP-68: @JsonObject moved to cisd-base.jar. Enabled
all tests checking @JsonObject presence.
SVN: 25419
---
.../cisd/common/annotation/JsonObject.java | 43 -------------------
.../generic/shared/api/v1/DataSetFileDTO.java | 2 +-
.../generic/shared/api/v1/FileInfoDssDTO.java | 2 +-
.../generic/shared/api/v1/NewDataSetDTO.java | 2 +-
.../systemtests/RmiConversationTest.java | 12 +++---
.../openbis/generic/server/ETLService.java | 22 +++++-----
.../shared/basic/dto/NewVocabulary.java | 2 +-
.../basic/dto/UpdatedVocabularyTerm.java | 2 +-
.../dto/VocabularyTermBatchUpdateDetails.java | 2 +-
.../v1/dto/AggregationServiceDescription.java | 2 +-
.../api/v1/dto/AggregationServiceType.java | 2 +-
.../shared/api/v1/dto/QueryDescription.java | 2 +-
.../shared/api/v1/dto/QueryTableColumn.java | 2 +-
.../api/v1/dto/QueryTableColumnDataType.java | 2 +-
.../shared/api/v1/dto/QueryTableModel.java | 2 +-
.../shared/api/v1/dto/ReportDescription.java | 2 +-
openbis_api/.classpath | 1 +
.../dto/ControlledVocabularyPropertyType.java | 2 +-
.../generic/shared/api/v1/dto/DataSet.java | 2 +-
.../shared/api/v1/dto/DataSetFetchOption.java | 2 +-
.../api/v1/dto/DataSetFetchOptions.java | 2 +-
.../shared/api/v1/dto/DataSetType.java | 2 +-
.../api/v1/dto/EntityRegistrationDetails.java | 2 +-
.../generic/shared/api/v1/dto/Experiment.java | 2 +-
.../generic/shared/api/v1/dto/Material.java | 2 +-
.../shared/api/v1/dto/MaterialIdentifier.java | 2 +-
.../api/v1/dto/MaterialTypeIdentifier.java | 2 +-
.../shared/api/v1/dto/NewVocabularyTerm.java | 2 +-
.../generic/shared/api/v1/dto/Project.java | 2 +-
.../shared/api/v1/dto/PropertyType.java | 2 +-
.../shared/api/v1/dto/PropertyTypeGroup.java | 2 +-
.../generic/shared/api/v1/dto/Role.java | 2 +-
.../generic/shared/api/v1/dto/Sample.java | 2 +-
.../shared/api/v1/dto/SampleFetchOption.java | 2 +-
.../shared/api/v1/dto/SearchCriteria.java | 2 +-
.../shared/api/v1/dto/SearchSubCriteria.java | 2 +-
.../api/v1/dto/SearchableEntityKind.java | 2 +-
.../SpaceWithProjectsAndRoleAssignments.java | 2 +-
.../generic/shared/api/v1/dto/Vocabulary.java | 2 +-
.../shared/api/v1/dto/VocabularyTerm.java | 2 +-
.../openbis/generic/shared/basic/TechId.java | 2 +-
.../shared/basic/dto/DataTypeCode.java | 2 +-
.../shared/basic/dto/DatabaseInstance.java | 2 +-
.../generic/shared/basic/dto/Person.java | 2 +-
.../generic/shared/basic/dto/Vocabulary.java | 2 +-
.../shared/basic/dto/VocabularyTerm.java | 2 +-
...scaleIntensityImageTransformerFactory.java | 2 +-
.../BitShiftingImageTransformerFactory.java | 2 +-
...IntensityRangeImageTransformerFactory.java | 2 +-
.../IntensityRangeReductionFactory.java | 2 +-
.../shared/api/v1/LoadImageConfiguration.java | 2 +-
.../v1/ExampleImageTransformerFactory.java | 2 +-
.../client/api/v1/WellImageCache.java | 2 +-
.../dto/AbstractFormatSelectionCriterion.java | 2 +-
.../api/v1/dto/ColorDepthCriterion.java | 2 +-
.../shared/api/v1/dto/DatasetIdentifier.java | 2 +-
.../DatasetImageRepresentationFormats.java | 2 +-
.../shared/api/v1/dto/DatasetReference.java | 2 +-
.../api/v1/dto/ExperimentIdentifier.java | 2 +-
.../api/v1/dto/ExperimentImageMetadata.java | 2 +-
.../shared/api/v1/dto/FeatureInformation.java | 2 +-
.../shared/api/v1/dto/FeatureVector.java | 2 +-
.../api/v1/dto/FeatureVectorDataset.java | 2 +-
.../v1/dto/FeatureVectorDatasetReference.java | 2 +-
.../FeatureVectorDatasetWellReference.java | 2 +-
.../v1/dto/FeatureVectorWithDescription.java | 2 +-
.../shared/api/v1/dto/FileTypeCriterion.java | 2 +-
.../screening/shared/api/v1/dto/Geometry.java | 2 +-
.../shared/api/v1/dto/IDatasetIdentifier.java | 2 +-
.../dto/IFeatureVectorDatasetIdentifier.java | 2 +-
.../api/v1/dto/IImageDatasetIdentifier.java | 2 +-
...epresentationFormatSelectionCriterion.java | 2 +-
.../shared/api/v1/dto/ImageChannel.java | 2 +-
.../api/v1/dto/ImageDatasetMetadata.java | 2 +-
.../api/v1/dto/ImageDatasetReference.java | 2 +-
.../api/v1/dto/ImageRepresentationFormat.java | 2 +-
.../shared/api/v1/dto/ImageSize.java | 2 +-
.../api/v1/dto/ImageTransformationInfo.java | 2 +-
.../screening/shared/api/v1/dto/Material.java | 2 +-
.../shared/api/v1/dto/MaterialIdentifier.java | 2 +-
.../api/v1/dto/MaterialTypeIdentifier.java | 2 +-
.../api/v1/dto/MicroscopyImageReference.java | 2 +-
.../shared/api/v1/dto/OriginalCriterion.java | 2 +-
.../screening/shared/api/v1/dto/Plate.java | 2 +-
.../shared/api/v1/dto/PlateIdentifier.java | 2 +-
.../api/v1/dto/PlateImageReference.java | 2 +-
.../shared/api/v1/dto/PlateMetadata.java | 2 +-
.../api/v1/dto/PlateWellMaterialMapping.java | 2 +-
.../dto/PlateWellReferenceWithDatasets.java | 2 +-
.../shared/api/v1/dto/SizeCriterion.java | 2 +-
.../shared/api/v1/dto/WellIdentifier.java | 2 +-
.../shared/api/v1/dto/WellMetadata.java | 2 +-
.../shared/api/v1/dto/WellPosition.java | 2 +-
.../server/DssServiceRpcScreeningTest.java | 36 ++++++++--------
.../systemtests/JsonAnnotationTest.java | 12 +++---
95 files changed, 131 insertions(+), 173 deletions(-)
delete mode 100644 common/source/java/ch/systemsx/cisd/common/annotation/JsonObject.java
diff --git a/common/source/java/ch/systemsx/cisd/common/annotation/JsonObject.java b/common/source/java/ch/systemsx/cisd/common/annotation/JsonObject.java
deleted file mode 100644
index 997fb57fee2..00000000000
--- a/common/source/java/ch/systemsx/cisd/common/annotation/JsonObject.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.common.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation all JSON transfered classes should be marked with. It was originally created to
- * replace @JsonTypeName annotation which was not visible in the documentation. With @JsonTypeName
- * annotation it would be impossible for our users to find a logical type name of a class to be sent
- * to JSON-RPC services.
- *
- * @author pkupczyk
- */
-@Target(
- { ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface JsonObject
-{
- /**
- * Logical type name for annotated type.
- */
- public String value();
-}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java
index a1a31c556e8..bb3d827403f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Represents a reference to a file/folder within a data set.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java
index 4cd94e926ad..912f996a067 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java
@@ -22,7 +22,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java
index 9448c238485..02e64cbf74e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RmiConversationTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RmiConversationTest.java
index 7676a32406b..ff8210bef15 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RmiConversationTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RmiConversationTest.java
@@ -44,7 +44,7 @@ import org.testng.annotations.BeforeMethod;
import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
import ch.systemsx.cisd.common.conversation.ConversationalRmiClient;
-import ch.systemsx.cisd.common.conversation.ProgressListener;
+import ch.systemsx.cisd.common.conversation.IProgressListener;
import ch.systemsx.cisd.common.conversation.RmiConversationController;
import ch.systemsx.cisd.common.conversation.ConversationalRmiServer;
import ch.systemsx.cisd.common.conversation.RmiServiceFactory;
@@ -183,7 +183,7 @@ public class RmiConversationTest extends SystemTestCase
return echo(input, delayInMillis);
}
- public String echo(String input, Integer delayInMillis,ProgressListener progress) {
+ public String echo(String input, Integer delayInMillis,IProgressListener progress) {
long startTime = System.currentTimeMillis();
@@ -206,7 +206,7 @@ public class RmiConversationTest extends SystemTestCase
return echoWithoutProgress(input, delayInMillis, null);
}
- public String echoWithoutProgress(String input, Integer delayInMillis, ProgressListener progress) {
+ public String echoWithoutProgress(String input, Integer delayInMillis, IProgressListener progress) {
try
{
Thread.sleep(delayInMillis);
@@ -222,7 +222,7 @@ public class RmiConversationTest extends SystemTestCase
return echoWithStore(input, null);
}
- public String echoWithStore(String input, ProgressListener progress) {
+ public String echoWithStore(String input, IProgressListener progress) {
DatabaseInstancePE db = new DatabaseInstancePE();
db.setCode(input);
@@ -238,7 +238,7 @@ public class RmiConversationTest extends SystemTestCase
return echoWithStoreAndProcessingException(input, null);
}
- public String echoWithStoreAndProcessingException(String input, ProgressListener progress) {
+ public String echoWithStoreAndProcessingException(String input, IProgressListener progress) {
DatabaseInstancePE db = new DatabaseInstancePE();
db.setCode(input);
@@ -254,7 +254,7 @@ public class RmiConversationTest extends SystemTestCase
return exists(code, null);
}
- public boolean exists(String code, ProgressListener progress) {
+ public boolean exists(String code, IProgressListener progress) {
Criteria criteria = sessionFactory.getCurrentSession().createCriteria(DatabaseInstancePE.class);
criteria.add(Restrictions.eq("code", code));
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index c3e014040a7..f60a3098cb5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.authentication.IAuthenticationService;
import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.collections.CollectionUtils;
import ch.systemsx.cisd.common.conversation.ConversationalRmiClient;
-import ch.systemsx.cisd.common.conversation.ProgressListener;
+import ch.systemsx.cisd.common.conversation.IProgressListener;
import ch.systemsx.cisd.common.conversation.RmiServiceFactory;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
@@ -1251,7 +1251,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
public AtomicEntityOperationResult performEntityOperations(String sessionToken,
AtomicEntityOperationDetails operationDetails)
{
- return this.performEntityOperations(sessionToken, operationDetails, new ProgressListener()
+ return this.performEntityOperations(sessionToken, operationDetails, new IProgressListener()
{
public void update(String label, int totalItemsToProcess, int numItemsProcessed)
@@ -1261,7 +1261,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
public AtomicEntityOperationResult performEntityOperations(String sessionToken,
- AtomicEntityOperationDetails operationDetails, ProgressListener progressListener)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progressListener)
{
final Session session = getSession(sessionToken);
@@ -1312,7 +1312,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private List<Space> createSpaces(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
ArrayList<SpacePE> spacePEsCreated = new ArrayList<SpacePE>();
List<NewSpace> newSpaces = operationDetails.getSpaceRegistrations();
@@ -1328,7 +1328,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private List<Material> createMaterials(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
MaterialHelper materialHelper =
new MaterialHelper(session, businessObjectFactory, getDAOFactory(),
@@ -1380,7 +1380,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private List<Project> createProjects(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
ArrayList<ProjectPE> projectPEsCreated = new ArrayList<ProjectPE>();
List<NewProject> newProjects = operationDetails.getProjectRegistrations();
@@ -1413,7 +1413,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private List<Sample> createSamples(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
List<NewSample> newSamples = operationDetails.getSampleRegistrations();
List<NewSample> containerSamples = new ArrayList<NewSample>();
@@ -1443,7 +1443,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private List<Sample> updateSamples(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
ArrayList<SamplePE> samplePEsUpdated = new ArrayList<SamplePE>();
List<SampleUpdatesDTO> sampleUpdates = operationDetails.getSampleUpdates();
@@ -1462,7 +1462,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
* order
*/
private List<ExternalData> createDataSets(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
ArrayList<DataPE> dataSetsCreated = new ArrayList<DataPE>();
List<? extends NewExternalData> dataSetRegistrations =
@@ -1481,7 +1481,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private List<ExternalData> updateDataSets(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
List<DataPE> dataSetsUpdated = new ArrayList<DataPE>();
int index = 0;
@@ -1518,7 +1518,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
}
private ArrayList<Experiment> createExperiments(Session session,
- AtomicEntityOperationDetails operationDetails, ProgressListener progress)
+ AtomicEntityOperationDetails operationDetails, IProgressListener progress)
{
ArrayList<Experiment> experimentsCreated = new ArrayList<Experiment>();
List<NewExperiment> experimentRegistrations = operationDetails.getExperimentRegistrations();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java
index 9271118dfbd..26006eb1995 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* New controlled vocabulary.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java
index 016b8547ef7..660e5898144 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* A vocabulary term to update.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
index beb8b060ad7..eef96e6e9f8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Holds information about which vocabulary term attributes should be updated.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
index 199babfa9fa..0a1589fee6b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Bean with information about aggregation services that provide data.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java
index 21658e5db12..974d6f04522 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* The different kinds of aggregation services.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java
index 19a413aa84a..a1879725ee6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto;
import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Description of a query. Contains everything needed on client side to show to the user what
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java
index 0fa5d02bc11..79ae4d326c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Column of query data. Defines title and data type.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java
index 2495ddbba6c..7aaee28da35 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Data types of {@link QueryTableModel}.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java
index 747dc3b3dff..7151915cbee 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Model of query data.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java
index f6590b757a2..b5eeeb58931 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.dto;
import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Bean with basic meta data of a service offered by a Data Store Server.
diff --git a/openbis_api/.classpath b/openbis_api/.classpath
index 953d1cae3dd..7b9c0026094 100644
--- a/openbis_api/.classpath
+++ b/openbis_api/.classpath
@@ -7,5 +7,6 @@
<classpathentry kind="lib" path="/libraries/jackson/jackson-core-asl.jar" sourcepath="/libraries/jackson/jackson-src.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="/libraries/spring/spring-core.jar"/>
+ <classpathentry kind="lib" path="/libraries/cisd-base/cisd-base.jar" sourcepath="/libraries/cisd-base/cisd-base-src.zip"/>
<classpathentry kind="output" path="targets/classes"/>
</classpath>
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java
index a30c8ad2cb8..a42dec83705 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.commons.lang.builder.ToStringBuilder;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Vocabulary;
/**
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
index f2319996576..1784ff876a6 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Immutable value object representing a data set.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java
index 7e60c5edd64..ece756283d3 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FetchOption;
/**
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java
index 352512c83bc..c6ab60d256c 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FetchOptions;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java
index 233154fff00..cfe569ab56a 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Immutable value object representing a data set type.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java
index fec3b35bf83..b753a5d1a0d 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* A class that encapsulates the details about entity registration.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java
index 0c644787cea..937a4e1ca17 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java
index bb9b3a93cdd..56a65c7a489 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java
@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author jakubs
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java
index aab851890e2..b417046e281 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author jakubs
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java
index a36ad64a003..ecdad48d35e 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* duplicated from ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.MaterialTypeIdentifier
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java
index 16a8d018ab8..3006c706ebe 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* A value object representing a new vocabulary term to be created by the openBIS backend.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java
index a46976a3c85..8ff21388f80 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java
index 83e3d61bf83..5097a83de60 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
/**
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java
index f86019ce9de..bb2b23e2245 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Immutable value object representing a data set type.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java
index 865767ffb3e..9d4d32ef280 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Immutable value object representing an authorization role. A role has a code and a flag which
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
index 91023d09fcc..5f515fdaf04 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
@@ -31,7 +31,7 @@ import org.apache.commons.lang.builder.ToStringStyle;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet.Connections;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java
index 127b44def9b..d5fcdf53e82 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FetchOption;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
index f498ce3f98a..cabb86fcfaf 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* A (mutable) object representing the specification of a search. A search is specified by
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java
index e6f7e1ed8d5..a135e3957eb 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java
@@ -7,7 +7,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria.MatchClause;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java
index eb73d526a2c..efadcd4f3bc 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java
@@ -1,6 +1,6 @@
package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* An enum listing the different kinds of entities that are searchable.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java
index f15af610513..8d8d6212986 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java
@@ -28,7 +28,7 @@ import java.util.Set;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java
index cc37448905a..a7243b09102 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Immutable value object representing an openBIS vocabulary.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java
index 2494fd28798..908e4ceba8f 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService;
/**
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
index c62eb541839..d2e6439124f 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
index f23bcd4fb91..fe2019552af 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Available types of entity properties.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
index a0c0982782c..ffa4c58038b 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author Franz-Josef Elmer
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
index e2b684f92ed..d936e144fe9 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* The <i>GWT</i> equivalent PersonPE.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java
index e818a988c42..c642d8870da 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import ch.systemsx.cisd.common.annotation.CollectionMapping;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Controlled vocabulary.
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
index 937b5e9e59c..c7fa25a291f 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
import org.codehaus.jackson.annotate.JsonIgnore;
import ch.systemsx.cisd.common.annotation.BeanProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* A vocabulary term.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/AutoRescaleIntensityImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/AutoRescaleIntensityImageTransformerFactory.java
index bd27b9608b2..8b8dc8d3942 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/AutoRescaleIntensityImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/AutoRescaleIntensityImageTransformerFactory.java
@@ -21,7 +21,7 @@ import java.awt.image.BufferedImage;
import ch.systemsx.cisd.base.image.IImageTransformer;
import ch.systemsx.cisd.base.image.IImageTransformerFactory;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.image.IntensityRescaling;
import ch.systemsx.cisd.common.image.IntensityRescaling.Levels;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/BitShiftingImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/BitShiftingImageTransformerFactory.java
index f211d279693..c63ca136753 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/BitShiftingImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/BitShiftingImageTransformerFactory.java
@@ -5,7 +5,7 @@ import java.awt.image.BufferedImage;
import ch.systemsx.cisd.base.image.IImageTransformer;
import ch.systemsx.cisd.base.image.IImageTransformerFactory;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.image.IntensityRescaling;
/**
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/IntensityRangeImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/IntensityRangeImageTransformerFactory.java
index 86572dec846..32932f04653 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/IntensityRangeImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/IntensityRangeImageTransformerFactory.java
@@ -22,7 +22,7 @@ import java.awt.image.BufferedImage;
import ch.systemsx.cisd.base.image.IImageTransformer;
import ch.systemsx.cisd.base.image.IImageTransformerFactory;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.image.IntensityRescaling;
import ch.systemsx.cisd.common.image.IntensityRescaling.Levels;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/IntensityRangeReductionFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/IntensityRangeReductionFactory.java
index f871f8f14cc..82b3a4c9707 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/IntensityRangeReductionFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dynamix/IntensityRangeReductionFactory.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.etl.dynamix;
import java.awt.image.BufferedImage;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.base.image.IImageTransformer;
import ch.systemsx.cisd.base.image.IImageTransformerFactory;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/LoadImageConfiguration.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/LoadImageConfiguration.java
index 9c78405a5ea..bf1d57b1ab4 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/LoadImageConfiguration.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/LoadImageConfiguration.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.screening.shared.api.v1;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ImageSize;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ExampleImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ExampleImageTransformerFactory.java
index eecb785ef0f..80e48bbb785 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ExampleImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ExampleImageTransformerFactory.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.client.api.v1;
import java.awt.image.BufferedImage;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.base.image.IImageTransformer;
import ch.systemsx.cisd.base.image.IImageTransformerFactory;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/WellImageCache.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/WellImageCache.java
index 7e0c3e4d7c7..10763658c3f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/WellImageCache.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/WellImageCache.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.DatasetIdentifier;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/AbstractFormatSelectionCriterion.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/AbstractFormatSelectionCriterion.java
index 2587250145e..c05b6d5fd80 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/AbstractFormatSelectionCriterion.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/AbstractFormatSelectionCriterion.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Abstract super class of {@link IImageRepresentationFormatSelectionCriterion} which accepting
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ColorDepthCriterion.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ColorDepthCriterion.java
index 3cfb4063392..2b809970061 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ColorDepthCriterion.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ColorDepthCriterion.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetIdentifier.java
index b4bf0d9ad8e..ab195b00720 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetIdentifier.java
@@ -2,7 +2,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Contains data which uniquely define a dataset.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetImageRepresentationFormats.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetImageRepresentationFormats.java
index 30905710ca0..a6d09f57fbb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetImageRepresentationFormats.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetImageRepresentationFormats.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetReference.java
index 7ae0c7f4063..207999407cb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/DatasetReference.java
@@ -7,7 +7,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Description of one plate-based screening dataset.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentIdentifier.java
index 3850b7b3cda..3ecb95f2f02 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentIdentifier.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentImageMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentImageMetadata.java
index d2b1e27b905..512cba6e817 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentImageMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ExperimentImageMetadata.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureInformation.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureInformation.java
index a7dff78df5a..6f980fb8e2c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureInformation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureInformation.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVector.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVector.java
index 99ea3115dec..f2fbcbfc981 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVector.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVector.java
@@ -6,7 +6,7 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Feature vector for one well.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java
index ed0604d1c41..1ed56b53079 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java
@@ -3,7 +3,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java
index f48a9b3a788..3fa2200a23f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetReference.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.util.Date;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Description of one feature vector dataset.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetWellReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetWellReference.java
index 18b403eb633..e3756f61b3b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetWellReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDatasetWellReference.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.util.Date;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorWithDescription.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorWithDescription.java
index 4903ee39dc7..ffbfe653dc9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorWithDescription.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorWithDescription.java
@@ -3,7 +3,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FileTypeCriterion.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FileTypeCriterion.java
index b7d36966522..68d82210e78 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FileTypeCriterion.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FileTypeCriterion.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Geometry.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Geometry.java
index 996bd1ed749..191e0c2284d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Geometry.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Geometry.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IDatasetIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IDatasetIdentifier.java
index 8bf1bd5aeb0..5db2a6435c9 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IDatasetIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IDatasetIdentifier.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Contains data which uniquely define a dataset
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IFeatureVectorDatasetIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IFeatureVectorDatasetIdentifier.java
index 0d6a672b01d..ab3c33ec3c7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IFeatureVectorDatasetIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IFeatureVectorDatasetIdentifier.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Uniquely Identifies a feature vector dataset.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageDatasetIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageDatasetIdentifier.java
index 809e8962f5d..1ece3c24734 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageDatasetIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageDatasetIdentifier.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Contains data which uniquely define an image dataset.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageRepresentationFormatSelectionCriterion.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageRepresentationFormatSelectionCriterion.java
index ff72e756ed5..cbeaeb66dcb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageRepresentationFormatSelectionCriterion.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/IImageRepresentationFormatSelectionCriterion.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Interface of an image selection criterion based on {@link ImageRepresentationFormat}.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageChannel.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageChannel.java
index eb017977435..794270fb4ea 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageChannel.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageChannel.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetMetadata.java
index 45115a66e97..9cdb458d688 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetMetadata.java
@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Metadata information about images in a specified dataset.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetReference.java
index 33fdbf92f4d..8e414e4f86e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageDatasetReference.java
@@ -23,7 +23,7 @@ import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.codehaus.jackson.annotate.JsonTypeInfo.As;
import org.codehaus.jackson.annotate.JsonTypeInfo.Id;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageRepresentationFormat.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageRepresentationFormat.java
index 16e813b38fc..790989645e6 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageRepresentationFormat.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageRepresentationFormat.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageSize.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageSize.java
index 1d61fa5ead1..9edc1b94443 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageSize.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageSize.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageTransformationInfo.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageTransformationInfo.java
index a71d5ccb8a2..ddf93340dc6 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageTransformationInfo.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/ImageTransformationInfo.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Material.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Material.java
index 429052fe3d3..e8332cd1eb5 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Material.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Material.java
@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialIdentifier.java
index 3c9f5fc603f..7dc2c1a4416 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialIdentifier.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.codehaus.jackson.annotate.JsonIgnore;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* A unique identifier for a material like e.g. a gene.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialTypeIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialTypeIdentifier.java
index c03e7980862..7ae91efbd36 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialTypeIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MaterialTypeIdentifier.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import java.io.Serializable;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MicroscopyImageReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MicroscopyImageReference.java
index 08b2ba38b9a..7c82c880bd2 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MicroscopyImageReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/MicroscopyImageReference.java
@@ -1,6 +1,6 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/OriginalCriterion.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/OriginalCriterion.java
index 367577fba04..3c001376774 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/OriginalCriterion.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/OriginalCriterion.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Plate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Plate.java
index 5015b6f8f18..dbd0a13bb23 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Plate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/Plate.java
@@ -5,7 +5,7 @@ import java.io.ObjectInputStream;
import org.codehaus.jackson.annotate.JsonSubTypes;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateIdentifier.java
index d043182d0b0..c149f0c8347 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateIdentifier.java
@@ -3,7 +3,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Contains data which uniquely define a plate.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java
index 720665c3e1b..35c37285a6f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java
@@ -1,6 +1,6 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateMetadata.java
index 89e975015c9..0310a6dcf23 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateMetadata.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellMaterialMapping.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellMaterialMapping.java
index 1f81770ecac..f27b8d27a3a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellMaterialMapping.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellMaterialMapping.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellReferenceWithDatasets.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellReferenceWithDatasets.java
index 6a595728451..c6913c4a4e5 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellReferenceWithDatasets.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateWellReferenceWithDatasets.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/SizeCriterion.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/SizeCriterion.java
index 12a7c128bd8..6e30c48fae1 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/SizeCriterion.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/SizeCriterion.java
@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellIdentifier.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellIdentifier.java
index 1e4565705b9..a3369bc5590 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellIdentifier.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellIdentifier.java
@@ -1,6 +1,6 @@
package ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* Contains data which uniquely define a well on a plate.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java
index 2d49962139f..1b246a4cb14 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellMetadata.java
@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellPosition.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellPosition.java
index 86099bffe7b..4ffc85f3e0c 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellPosition.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/WellPosition.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
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 7c05f0aa441..896497c04df 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
@@ -28,7 +28,6 @@ import java.util.List;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.lang.SerializationUtils;
-import org.codehaus.jackson.annotate.JsonTypeName;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.springframework.aop.framework.ProxyFactory;
@@ -38,6 +37,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.base.convert.NativeTaggedArray;
import ch.systemsx.cisd.base.image.IImageTransformer;
import ch.systemsx.cisd.base.image.IImageTransformerFactory;
@@ -113,7 +113,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgIm
*/
public class DssServiceRpcScreeningTest extends AssertJUnit
{
- @JsonTypeName("ImageTransformerFactory")
+ @JsonObject("ImageTransformerFactory")
private static final class ImageTransformerFactory implements IImageTransformerFactory
{
private static final long serialVersionUID = 1L;
@@ -278,8 +278,8 @@ public class DssServiceRpcScreeningTest extends AssertJUnit
{ 1, 2 };
String[][] featureCodesPerDataset = new String[][]
{
- { "f1", "f2" },
- { "f2", "f3" } };
+ { "f1", "f2" },
+ { "f2", "f3" } };
prepareListAnalysisDatasets(dataSetIDs);
prepareGetFeatureDefinitions(dataSetIDs, featureCodesPerDataset);
@@ -303,16 +303,16 @@ public class DssServiceRpcScreeningTest extends AssertJUnit
FeatureInformation[][] featureCodesPerDataset =
new FeatureInformation[][]
{
- {
- new FeatureInformation("f1", "Feature 1",
- "The first feature."),
- new FeatureInformation("f2", "Feature 2",
- "The second feature.") },
- {
- new FeatureInformation("f2", "Feature 2",
- "The second feature."),
- new FeatureInformation("f3", "Feature 3",
- "The third feature.") } };
+ {
+ new FeatureInformation("f1", "Feature 1",
+ "The first feature."),
+ new FeatureInformation("f2", "Feature 2",
+ "The second feature.") },
+ {
+ new FeatureInformation("f2", "Feature 2",
+ "The second feature."),
+ new FeatureInformation("f3", "Feature 3",
+ "The third feature.") } };
prepareListAnalysisDatasets(dataSetIDs);
prepareGetFeatureDefinitions(dataSetIDs, featureCodesPerDataset);
@@ -338,12 +338,12 @@ public class DssServiceRpcScreeningTest extends AssertJUnit
FeatureVectorDatasetReference r2 = createFeatureVectorDatasetReference(DATASET_CODE2);
String[][] featureCodesPerDataset = new String[][]
{
- { "F1", "F2" } };
+ { "F1", "F2" } };
prepareLoadFeatures(new long[]
{ 1 }, featureCodesPerDataset);
featureCodesPerDataset = new String[][]
{
- { "F2" } };
+ { "F2" } };
prepareLoadFeatures(new long[]
{ 2 }, featureCodesPerDataset);
@@ -825,8 +825,8 @@ public class DssServiceRpcScreeningTest extends AssertJUnit
new PlateFeatureValues(NativeTaggedArray
.toByteArray(new MDFloatArray(new float[][]
{
- { 3.5f * dataSetId + offset },
- { 1.25f * dataSetId + offset } })));
+ { 3.5f * dataSetId + offset },
+ { 1.25f * dataSetId + offset } })));
ImgFeatureValuesDTO value =
new ImgFeatureValuesDTO(0.0, 0.0, matrixValues, 0L);
value.setFeatureDefId(featureDefIds[featureDefIx]);
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 5c459c48da7..420ac44c150 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
@@ -31,7 +31,7 @@ import org.reflections.Reflections;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.common.annotation.JsonObject;
+import ch.systemsx.cisd.base.annotation.JsonObject;
import ch.systemsx.cisd.common.api.server.json.ClassReferences;
import ch.systemsx.cisd.common.api.server.json.JsonUniqueCheckIgnore;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric;
@@ -65,10 +65,10 @@ public class JsonAnnotationTest
private void findAllClassesUsedByJsonRpcApi()
{
Class<?>[] jsonRpcInterfaces =
- { IDssServiceRpcGeneric.class, IScreeningApiServer.class,
- IGeneralInformationChangingService.class,
- IGeneralInformationService.class, IWebInformationService.class,
- IQueryApiServer.class, IDssServiceRpcScreening.class };
+ { IDssServiceRpcGeneric.class, IScreeningApiServer.class,
+ IGeneralInformationChangingService.class,
+ IGeneralInformationService.class, IWebInformationService.class,
+ IQueryApiServer.class, IDssServiceRpcScreening.class };
for (Class<?> jsonClass : jsonRpcInterfaces)
{
@@ -76,7 +76,7 @@ public class JsonAnnotationTest
}
}
- @Test(enabled = false)
+ @Test
public void jsonClassesAreAnnotatedWithJsonObject()
{
Collection<Class<?>> classesWithoutJsonObject = getAllJsonRpcClassesWithoutJsonObject();
--
GitLab