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 997fb57fee2c6e08af4fdb444c9d13f4e94c8ec6..0000000000000000000000000000000000000000
--- 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 a1a31c556e8cb8172dd32277d523c6ff62e4fa02..bb3d827403f63171b2f21cd841af893002c0079e 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 4cd94e926add62c56615a6873b083e7072347a45..912f996a067c54adf7bad90d5251d65141d55651 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 9448c23848582e3e65f7c3cab673c9df959e47e3..02e64cbf74e3037d86f5f56529a8db6a430da268 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 7676a32406bf79933ace978a022c294ffc6249af..ff8210bef158bb222f7e90a950b41a9e0b924ee6 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 c3e014040a73c289ffae210d0a16c199a3e89d7c..f60a3098cb5c1dccf4b0d110e4a0e232b1d3bec1 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 9271118dfbd7a98f34c6b42088320d4ae0d85462..26006eb1995a6775820a01573a08ed884ca86756 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 016b8547ef72dd132a597afa84638e2a484b99a3..660e58981449eeecbe1fcb56a518af105809b71f 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 beb8b060ad706b2af1337eebe22adb4347780fe2..eef96e6e9f834cc4c359416ff40cfe1af066b25b 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 199babfa9fae17c65d7233ef17e386a132aa5581..0a1589fee6bb9f84ac67f1a3bfb3cae12af920b7 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 21658e5db12a50ac6f7db32af6e2290c7141afda..974d6f04522b306ccc8262d6b73bed457a125693 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 19a413aa84a515cb7673fa000c59f90d84daa642..a1879725ee67f8285e8175f8bfc5e8b007628b98 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 0fa5d02bc117925a7b521ec8c4ecad1d3e353314..79ae4d326c831c2504b257c23bd0d76d0fe8f7f4 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 2495ddbba6c10a723b101f7c315703fa19bfaec8..7aaee28da352915ae7ea9097189c292a28f0a135 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 747dc3b3dffd36e54844dc0799a54f7563ad1009..7151915cbee4652fc48e8e07801d255c6e60fb51 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 f6590b757a28c395ab3a56d126a5f1ebd120b7ab..b5eeeb58931e36eeec850fe706ec546353b919eb 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 953d1cae3dd66763187a4b8ce0448ec93a2c702b..7b9c00260948bd2d434e7758a08b5de116fa01d7 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 a30c8ad2cb8203819740a4aac8c1e2327bccebd7..a42dec83705fbc89e451bd690dc09d246fc68a8d 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 f2319996576ffd171e1290d6346005023ac6d889..1784ff876a6eb968c303ec4755549ef4e231dc4b 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 7e60c5edd64676b4f884eba002bb7c5a21de5337..ece756283d308f0c7484b47060276abc0489a115 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 352512c83bc4f3c930435ccec90053ec99a652dc..c6ab60d256cc9842e26a03d414c1afcddaf0e677 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 233154fff00f51e9dd3a6f27d3f794fe6f3b4b55..cfe569ab56a80fa2ef89a14c22752981f9085a25 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 fec3b35bf83cedbd7a4828a6fce16b59ff734d45..b753a5d1a0d86e7599080985ed7e603016e8cbc7 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 0c644787cea194c49579e21b63ca297b1e673640..937a4e1ca174aeeb7d1059d46f5d56ad52b5c509 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 bb9b3a93cdd08650d1b09a487169dd27ad9bd3c8..56a65c7a489a6c094f541d685857d52757db6b47 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 aab851890e262673d6b9b9200890107b6be4e624..b417046e28173946f40f61fba6ee980f7a3fb76b 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 a36ad64a0037117571092e03a335ceb1a4070bfa..ecdad48d35e531399b3c6e606a080dee8104b7d1 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 16a8d018ab8dc063ea62125eba03a8bcb65803cf..3006c706ebe39cb8d3d12d43147b818b1d872140 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 a46976a3c85c0463385674b6cebbcd44bb67d315..8ff21388f8087e5ab07555146b2a3b1dc7f8ae0e 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 83e3d61bf83de3df4fc0183941ecac67afb5ca77..5097a83de60d0834847b92e9125492423bec0ea0 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 f86019ce9de44bf79b1ed35ca6f4b097c84a2a18..bb2b23e22457b66c45b989bece975bb2045badb4 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 865767ffb3ea6b7a9be4c7c1bba64ad2dae0443c..9d4d32ef2805f17ecd499c2cbe10f2d8f6a43d6f 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 91023d09fcc6bfebe3dcccaeae6a8b4e81636655..5f515fdaf04c551430729647776af54adef9d289 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 127b44def9ba1617b1dfcf1be32e0825935f25f3..d5fcdf53e8219ad411c8adbc2c4ae7b48e2f8c4e 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 f498ce3f98a4260cc7e10ec4430a7e74ff3f6b3e..cabb86fcfafedc8ec165df58a482cb4bc77b7214 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 e6f7e1ed8d58e65e21de7e678401ff321b2c94c4..a135e3957eb64745884ea57690023530fe1522b2 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 eb73d526a2cceb938a910d819e70dfb04f367369..efadcd4f3bc3642883e726bfc09c9e32b8581304 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 f15af610513a6a28cd3c294b681bf00470bf61ca..8d8d62129866cb7533dc592dc0185ce36c04e92b 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 cc37448905a2a80e0859d8bcf4d484975eb57558..a7243b091021819539f26f61790773951e1d4e60 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 2494fd28798da12298abe27b645d9c5ceacb1131..908e4ceba8f8949f7377849bb564c8c23e6c83fd 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 c62eb5418397d8b75be89fa35f75a21a7e4caa4f..d2e6439124f20ba6f81e09b6d6cb9f0d2ec4021e 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 f23bcd4fb9122f44febcd3f97862d1ac34133ccb..fe2019552af27c17daf3c8b827b69fe2e4ab3992 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 a0c0982782c14d9cc624b09161662a47578cb614..ffa4c58038b13861d92ea6084832d1aea380bc99 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 e2b684f92ed5f833fa2ef0a831c2f8d9ab27a9a6..d936e144fe9ef4fb6a6c6f7fc73c0c12da3da881 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 e818a988c427922412e5e337da56e3b44faa346a..c642d8870da68e8853606186f88566be775439dd 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 937b5e9e59c38fed3767a0bba2d4ee97f584b774..c7fa25a291f9cf17772683cfea06b44727cdb76b 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 bd27b9608b2f6e1c6f5684a4560bd0a69be6a1fd..8b8dc8d3942e83b6126ced2cdbfe636f86056df9 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 f211d279693cd77ca8f9e64b83e12c2d73fa5bd3..c63ca136753b8ba7ad708ba8962c2d96bdc93923 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 86572dec846634637fbecc1295e0d382c13d4c69..32932f046536d0a0db1ba30ad13a217422733ff3 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 f871f8f14cc6bfac5ab597d85cebc89ed8f6b721..82b3a4c97079a9eeca15d1a4d17758cd967a0c36 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 9c78405a5ea207d31bf49457e378ea3aea0fe925..bf1d57b1ab4f3dd8387a8959fd755539ed1f17a1 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 eecb785ef0f4ec030241878ed0c773576f5eec9b..80e48bbb785576dfe9e9fe59aa5972cb046fd191 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 7e0c3e4d7c7014b960328e4d484a753a2eafbb38..10763658c3fc534fa6a9cb80f653c7f44f8c73a2 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 2587250145e565ca490d0e9a2f0d250bc3431fad..c05b6d5fd805b1f8bddedc31a45d0d91102bafff 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 3cfb40633921781073f978aa36cd2616ca0d6c2d..2b809970061d5bc6c4d57b1f67a8302442d9b5fc 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 b4bf0d9ad8e0e914345c5d4af189daea27aa3b3a..ab195b007206ea9af6cadfae4ca4db5fcec79890 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 30905710ca022e967d63e1bfa1a2a1257e012713..a6d09f57fbb285e2f8fcafaf9f6c0a483dd7bb88 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 7ae0c7f40632663360e0c8b370b87944b2bd51f1..207999407cb578acb34d3a0e7900b57245e17bfb 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 3850b7b3cda12b3207e2011cb717a83121c2a9f5..3ecb95f2f02aff28cb2a74eeda525fdf2337f659 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 d2b1e27b90560aea06e9bbc92df53f22e9f9bb9e..512cba6e817e3b8048ba9f35fddddfeb86922949 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 a7dff78df5a1b06df9de2ade9ceebbb0282f3010..6f980fb8e2c970e59548cf21ffc2f1c305c1e26f 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 99ea3115dece852e968b22fe8f521c6c9779e89b..f2fbcbfc98179edf70512fe5c192d09614da0870 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 ed0604d1c415883c2663c69fd5742bc3da34cf24..1ed56b530795b4934f1fd0d633593ba45e0caf08 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 f48a9b3a7882816b0fd7dbb64dad25591eace7e3..3fa2200a23fa1d83da6deb71d4460c23f8b23889 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 18b403eb633505633d5034dc57e7af2154dba883..e3756f61b3bcd29b40557b555f09af547d357f6f 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 4903ee39dc7e11fa8f1139e98c803e3ca75c8f1d..ffbfe653dc90243c274cf6d8a48e87da9113aa9b 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 b7d369665226ebe522dbd990b77b429a504733b8..68d82210e78b872fae62ade0f6cdd6540883489a 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 996bd1ed749cff215a93c59b2dcae400657ce0a4..191e0c2284d0e03fa0b12d56952c6bdb382804b5 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 8bf1bd5aeb07690c934b808fbed5d6385e08c616..5db2a6435c9649d4e65b9c5911e7175de2bb91b9 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 0d6a672b01d19bb159d31dc90162e76a68c31878..ab3c33ec3c740d6c99b651dd168db792d79560e4 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 809e8962f5d6512f59c2dc1226fd970d2afd4f42..1ece3c24734c0684d272f22cbac81bba797d3a75 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 ff72e756ed5ff3242d694aa0f1dc502124000b2b..cbeaeb66dcba93a6d350fe636e53f9c6dd4afee3 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 eb017977435110633bca15f3075bb1c79532b780..794270fb4eae37ca839495de558b1835059d505a 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 45115a66e97f6155abaa8c5500ef3d58fdf950b4..9cdb458d68852147c942acc0a0ae706acaaecab2 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 33fdbf92f4db795355abae70364c91a7987f6e05..8e414e4f86e3fc6b54d4803ad0cd9dcb231fe08f 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 16e813b38fc9cc57fab1321d852e9546fb62a0d6..790989645e6f0a56e5ee672c907bfc99c60a4657 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 1d61fa5ead17db62a82ce32374d5e4b446e8f88d..9edc1b944435da5dc00864236fe8d6cbdd3d029a 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 a71d5ccb8a208bf5b03453f85402fe7d5cb5cf4b..ddf93340dc62e0066aaa9baee374038db9a10926 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 429052fe3d34fff7889594de6ca5a0c5917a00ca..e8332cd1eb5d149f45ed0b852a3dd72bb992e405 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 3c9f5fc603f94b682afb5de5ad8b53a525c242e1..7dc2c1a44160a50c1e911f061246986cabc663d9 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 c03e7980862abd178d716d8eb2abbbd62e1ff2e3..7ae91efbd3617bd245621574542c777e39b74f3a 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 08b2ba38b9a1fe6ebd10582f7d70c1eb3b9992d6..7c82c880bd2868819c3cb582eb341e1028536e67 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 367577fba0453123923cae71e7983690ffdc9af9..3c00137677428b55f4c8eb1d1033b135a9a0c4b5 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 5015b6f8f18da734f7b1e2cdd8879b3fa8f5c4ea..dbd0a13bb23ce1e6937efa51fb5b026721f86caa 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 d043182d0b033d2bc461ac1111a9a8d4b74234bb..c149f0c834748016b432ed57f1d242178d45e168 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 720665c3e1b34777ba14677a6707d42fdce9cd32..35c37285a6f420b4f9f7a85350e9bcc6f0b8e11f 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 89e975015c9aa1149ce0378bbebb5de8b4fd968a..0310a6dcf234b15f88de963538728ed2bc1a1e81 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 1f81770ecacc904d67dd7586fee9dea18cedb4b2..f27b8d27a3a3b54fa70fbef58d33670e2406c010 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 6a595728451062c3b03cb79946f3cf34a0a9b716..c6913c4a4e554996145bc00691392a79f751332a 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 12a7c128bd86853e7d1c09d0a24c8f3bdfe7b0a0..6e30c48fae13203aab365ee88acf8e96a1b90426 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 1e4565705b914f72959d4f31905cf1648e4a575b..a3369bc559091837567a4be1eaf14a335505ca53 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 2d49962139f0f0bcdd7f5beafd72487b788504b6..1b246a4cb14c985a3977dcf35173870628e0fe8d 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 86099bffe7b0cfe56a95f46679ef81812afaafe6..4ffc85f3e0cafadce491e3d7bfa548e9d22b3d27 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 7c05f0aa44179a37fb0e97ed906a1d06617f4330..896497c04dff276612e769cbc4135385d1261c2e 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 5c459c48da757e274b3cfbcfeb845fe6914ab9a9..420ac44c150b404fcf04223f5cd9a45e7489c52d 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();