From 16091e21e924b2ce2be63d59d7ff314d26e8437d Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 1 Apr 2009 07:18:40 +0000
Subject: [PATCH] LMS-801 Classes from openbis.plugin moved to
 openbis.generic.server.plugin, dependencies between generic and plugin
 checked.

SVN: 10507
---
 openbis/resource/dependency-structure.ddf     |  8 ++
 .../web/server}/AbstractClientService.java    |  2 +-
 .../web/server/CommonClientService.java       |  1 -
 .../generic/server/AbstractServer.java        |  8 +-
 .../openbis/generic/server/CommonServer.java  |  2 +-
 .../plugin/AbstractPluginRegistry.java        |  2 +-
 .../plugin/DataSetServerPluginRegistry.java   |  5 +-
 .../server}/plugin/IDataSetServerPlugin.java  |  2 +-
 .../plugin/IDataSetTypeSlaveServerPlugin.java |  2 +-
 .../server}/plugin/ISampleServerPlugin.java   |  2 +-
 .../plugin/ISampleTypeSlaveServerPlugin.java  |  2 +-
 .../server}/plugin/IServerPlugin.java         |  2 +-
 .../plugin/SampleServerPluginRegistry.java    |  5 +-
 .../openbis/generic/shared/ResourceNames.java |  6 ++
 .../plugin/AbstractSampleServerPlugin.java    |  6 +-
 .../cisd/openbis/plugin/Technology.java       | 75 -------------------
 .../web/server/GenericClientService.java      |  2 +-
 .../server/AbstractGenericServerPlugin.java   |  2 +-
 .../server/GenericDataSetServerPlugin.java    |  9 +--
 .../GenericDataSetTypeSlaveServerPlugin.java  |  4 +-
 .../server/GenericSampleServerPlugin.java     |  9 +--
 .../GenericSampleTypeSlaveServerPlugin.java   |  4 +-
 .../plugin/generic/server/GenericServer.java  |  4 +-
 .../plugin/generic/shared/ResourceNames.java  | 10 ---
 .../web/server/ScreeningClientService.java    |  2 +-
 .../server/MasterPlateSampleServerPlugin.java |  6 +-
 .../screening/server/ScreeningServer.java     |  4 +-
 .../source/java/genericApplicationContext.xml |  4 +-
 .../generic/server/CommonServerTest.java      |  4 +-
 .../generic/server/GenericServerTest.java     |  4 +-
 .../screening/server/ScreeningServerTest.java |  4 +-
 31 files changed, 64 insertions(+), 138 deletions(-)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client/web/server}/AbstractClientService.java (99%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/AbstractPluginRegistry.java (98%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/DataSetServerPluginRegistry.java (90%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/IDataSetServerPlugin.java (94%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/IDataSetTypeSlaveServerPlugin.java (96%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/ISampleServerPlugin.java (93%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/ISampleTypeSlaveServerPlugin.java (96%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/IServerPlugin.java (94%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{ => generic/server}/plugin/SampleServerPluginRegistry.java (90%)
 delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/plugin/Technology.java

diff --git a/openbis/resource/dependency-structure.ddf b/openbis/resource/dependency-structure.ddf
index 2e1a33a87d2..514d7ed65ab 100644
--- a/openbis/resource/dependency-structure.ddf
+++ b/openbis/resource/dependency-structure.ddf
@@ -87,6 +87,14 @@ check layeringOf generic.server.1 generic.server.2 generic.server.3 generic.serv
 # Plugins
 ##########################################
 
+[generic] = ${generic}.* excluding *.DefaultClientPluginFactoryProvider
+[plugins] = ${plugin}.* 
+[plugins-clientpluginfactories] = ${plugin}.* excluding *.ClientPluginFactory 
+
+check sets [generic] [plugins] [plugins-clientpluginfactories]
+check [generic] directlyIndependentOf [plugins]
+check ${generic}.*.DefaultClientPluginFactoryProvider directlyIndependentOf [plugins-clientpluginfactories]
+
 [plugin.generic] = ${plugin}.generic.*
 [plugin.screening] = ${plugin}.screening.*
 check sets [plugin.generic] [plugin.screening]
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
similarity index 99%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index 5ff22bccd03..d846b14b291 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.client.web.server;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index d14ad37508c..a9bfe239072 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -119,7 +119,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
-import ch.systemsx.cisd.openbis.plugin.AbstractClientService;
 
 /**
  * The {@link ICommonClientService} implementation.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index eed04a17284..8fe98cdeafc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -29,6 +29,10 @@ import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.common.spring.AbstractServiceWithLogger;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.server.plugin.DataSetServerPluginRegistry;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.SampleServerPluginRegistry;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
@@ -40,10 +44,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleSession;
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-import ch.systemsx.cisd.openbis.plugin.DataSetServerPluginRegistry;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.SampleServerPluginRegistry;
 
 /**
  * An <i>abstract</i> {@link IServer} implementation.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index cfcc2e11220..da189fb26e3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
@@ -51,6 +51,7 @@ import ch.systemsx.cisd.openbis.generic.server.business.bo.IVocabularyBO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IHibernateSearchDAO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IRoleAssignmentDAO;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetSearchCriteria;
@@ -99,7 +100,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
 
 /**
  * Implementation of client-server interface.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginRegistry.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginRegistry.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
index 816f5a696c2..6efadfec07b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginRegistry.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/DataSetServerPluginRegistry.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/DataSetServerPluginRegistry.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
index 0a90edfc075..582f6e15b3b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/DataSetServerPluginRegistry.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
-import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
 /**
  * A registry for data set server plug-ins.
@@ -52,7 +51,7 @@ public class DataSetServerPluginRegistry extends AbstractPluginRegistry<IDataSet
     @Override
     protected String getBeanNameOfGenericPlugin()
     {
-        return ResourceNames.GENERIC_DATA_SET_SERVER_PLUGIN;
+        return ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_DATA_SET_SERVER_PLUGIN;
     }
 
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/IDataSetServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/IDataSetServerPlugin.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
index 50e4ad98749..dc11dffdc3b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/IDataSetServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
 /**
  * Plug-in interface for data sets.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/IDataSetTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/IDataSetTypeSlaveServerPlugin.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
index e0a051a9e49..7f8bf05d36f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/IDataSetTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/ISampleServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/ISampleServerPlugin.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.java
index 3d3b8a97700..9dc0da4a643 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/ISampleServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
 /**
  * The sample plug-in.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/ISampleTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/ISampleTypeSlaveServerPlugin.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.java
index 9776e81f0a9..b9bf743f2fc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/ISampleTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/IServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/IServerPlugin.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
index 608f345cc47..0bb03abd59b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/IServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
 import java.util.Set;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/SampleServerPluginRegistry.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/SampleServerPluginRegistry.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.java
index deee6871521..eec52a4fc1e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/SampleServerPluginRegistry.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin;
+package ch.systemsx.cisd.openbis.generic.server.plugin;
 
-import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
 /**
  * A registry for sample server plug-ins.
@@ -52,6 +51,6 @@ public final class SampleServerPluginRegistry extends AbstractPluginRegistry<ISa
     @Override
     protected String getBeanNameOfGenericPlugin()
     {
-        return ResourceNames.GENERIC_SAMPLE_SERVER_PLUGIN;
+        return ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_SAMPLE_SERVER_PLUGIN;
     }
 }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java
index 311855b9984..7926c823190 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java
@@ -28,6 +28,12 @@ package ch.systemsx.cisd.openbis.generic.shared;
  */
 public final class ResourceNames
 {
+    public final static String GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN =
+    "generic-sample-type-slave-server-plugin";
+    public final static String GENERIC_SAMPLE_SERVER_PLUGIN = "generic-sample-server-plugin";
+    public final static String GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN =
+    "generic-data-set-type-slave-server-plugin";
+    public final static String GENERIC_DATA_SET_SERVER_PLUGIN = "generic-data-set-server-plugin";
     private ResourceNames()
     {
         // Can not be instantiated.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java
index 9aa6eca4d5e..b89978e28c3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java
@@ -20,7 +20,9 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
-import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.SampleServerPluginRegistry;
 
 /**
  * An abstract {@link ISampleServerPlugin} which registers itself to
@@ -35,7 +37,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
  */
 public abstract class AbstractSampleServerPlugin implements ISampleServerPlugin
 {
-    @Resource(name = ResourceNames.GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN)
+    @Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN)
     private ISampleTypeSlaveServerPlugin genericSampleTypeSlaveServerPlugin;
 
     protected AbstractSampleServerPlugin()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/Technology.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/Technology.java
deleted file mode 100644
index 81b9b610dd0..00000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/Technology.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2008 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.openbis.plugin;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-
-/**
- * A technology.
- * 
- * @author Christian Ribeaud
- */
-public final class Technology
-{
-    private final String name;
-
-    public Technology(final String name)
-    {
-        assert name != null : "Unspecified name.";
-        this.name = name;
-    }
-
-    /**
-     * Returns the description of this technology.
-     */
-    public final String getDescription()
-    {
-        return StringUtils.capitalize(getName().toLowerCase());
-    }
-
-    /**
-     * Returns the name of this technology.
-     */
-    public final String getName()
-    {
-        return name;
-    }
-
-    //
-    // Object
-    //
-
-    @Override
-    public final boolean equals(final Object obj)
-    {
-        return EqualsBuilder.reflectionEquals(this, obj);
-    }
-
-    @Override
-    public final int hashCode()
-    {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
-    @Override
-    public final String toString()
-    {
-        return getDescription();
-    }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index 28b8451b124..626d12ce241 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -38,6 +38,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.BatchRegistrationR
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Experiment;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Material;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGeneration;
+import ch.systemsx.cisd.openbis.generic.client.web.server.AbstractClientService;
 import ch.systemsx.cisd.openbis.generic.client.web.server.UploadedFilesBean;
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.ExperimentTranslator;
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.MaterialTranslator;
@@ -59,7 +60,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
-import ch.systemsx.cisd.openbis.plugin.AbstractClientService;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.IGenericClientService;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
index 14ff073f546..7a4bba8e34f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
@@ -18,8 +18,8 @@ package ch.systemsx.cisd.openbis.plugin.generic.server;
 
 import java.util.Set;
 
+import ch.systemsx.cisd.openbis.generic.server.plugin.IServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
-import ch.systemsx.cisd.openbis.plugin.IServerPlugin;
 
 /**
  * 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
index e9f30b13e77..408108aa5af 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
@@ -20,20 +20,19 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
-import ch.systemsx.cisd.openbis.plugin.IDataSetServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
 
 /**
  * The default {@link IDataSetServerPlugin} implementation for the <i>generic</i> technology.
  *
  * @author Franz-Josef Elmer
  */
-@Component(ResourceNames.GENERIC_DATA_SET_SERVER_PLUGIN)
+@Component(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_DATA_SET_SERVER_PLUGIN)
 public class GenericDataSetServerPlugin extends AbstractGenericServerPlugin implements
         IDataSetServerPlugin
 {
-    @Resource(name = ResourceNames.GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN)
+    @Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN)
     private GenericDataSetTypeSlaveServerPlugin genericDataSetTypeSlaveServerPlugin;
 
     public IDataSetTypeSlaveServerPlugin getSlaveServer()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
index fb329f7f18b..b1d5a8267f2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
@@ -25,9 +25,9 @@ import org.springframework.stereotype.Component;
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.openbis.generic.server.business.DataStoreServerSessionManager;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataTable;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
 /**
@@ -35,7 +35,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
  *
  * @author Franz-Josef Elmer
  */
-@Component(ResourceNames.GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN)
+@Component(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN)
 public class GenericDataSetTypeSlaveServerPlugin implements IDataSetTypeSlaveServerPlugin
 {
     @Private static final String DELETION_DESCRIPTION = "single deletion";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java
index 086a584f741..b92088bef86 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java
@@ -20,19 +20,18 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
-import ch.systemsx.cisd.openbis.plugin.ISampleServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 
 /**
  * The default {@link ISampleServerPlugin} implementation for the <i>generic</i> technology.
  * 
  * @author Christian Ribeaud
  */
-@Component(ResourceNames.GENERIC_SAMPLE_SERVER_PLUGIN)
+@Component(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_SAMPLE_SERVER_PLUGIN)
 public final class GenericSampleServerPlugin extends AbstractGenericServerPlugin implements ISampleServerPlugin
 {
-    @Resource(name = ResourceNames.GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN)
+    @Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN)
     private GenericSampleTypeSlaveServerPlugin genericSampleTypeSlaveServerPlugin;
 
     public GenericSampleServerPlugin()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
index 92160dd10a6..dd22b2316be 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
@@ -27,12 +27,12 @@ import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleTable;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.SampleHierarchyFiller;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleGenerationDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
 /**
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
  * 
  * @author Christian Ribeaud
  */
-@Component(ResourceNames.GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN)
+@Component(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN)
 public final class GenericSampleTypeSlaveServerPlugin implements ISampleTypeSlaveServerPlugin
 {
     @Resource(name = ResourceNames.GENERIC_BUSINESS_OBJECT_FACTORY)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
index 43689a3aa15..f5520fca06a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
@@ -34,6 +34,8 @@ import ch.systemsx.cisd.openbis.generic.server.business.bo.IMaterialTable;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IProcedureBO;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleBO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewMaterial;
@@ -53,8 +55,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.IdentifierHelper;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.dto.types.ProcedureTypeCode;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java
index 2ad5a9a7d38..51c93e0716e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java
@@ -34,16 +34,6 @@ public final class ResourceNames
 
     public final static String GENERIC_BUSINESS_OBJECT_FACTORY = "generic-business-object-factory";
 
-    public final static String GENERIC_SAMPLE_TYPE_SLAVE_SERVER_PLUGIN =
-            "generic-sample-type-slave-server-plugin";
-
-    public final static String GENERIC_SAMPLE_SERVER_PLUGIN = "generic-sample-server-plugin";
-    
-    public final static String GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN =
-            "generic-data-set-type-slave-server-plugin";
-
-    public final static String GENERIC_DATA_SET_SERVER_PLUGIN = "generic-data-set-server-plugin";
-
     private ResourceNames()
     {
         // Can not be instantiated.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java
index 79536c7d79b..f0ddfe55da5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java
@@ -25,6 +25,7 @@ import ch.systemsx.cisd.common.servlet.IRequestContextProvider;
 import ch.systemsx.cisd.common.utilities.BeanUtils;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGeneration;
 import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException;
+import ch.systemsx.cisd.openbis.generic.client.web.server.AbstractClientService;
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.DtoConverters;
 import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailureExceptionTranslator;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
@@ -32,7 +33,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleGenerationDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
-import ch.systemsx.cisd.openbis.plugin.AbstractClientService;
 import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/MasterPlateSampleServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/MasterPlateSampleServerPlugin.java
index fdec3855508..036fe086310 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/MasterPlateSampleServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/MasterPlateSampleServerPlugin.java
@@ -21,11 +21,11 @@ import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.SampleServerPluginRegistry;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 import ch.systemsx.cisd.openbis.plugin.AbstractSampleServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.SampleServerPluginRegistry;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
index af9009ce62e..33e9b72c997 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
@@ -26,13 +26,13 @@ import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleBO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleGenerationDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
 
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index 166a67c98bd..7f12f487957 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -185,7 +185,7 @@
             expression="org.springframework.stereotype.Controller" />
     </plugins:component-scan>
 
-    <bean class="ch.systemsx.cisd.openbis.plugin.SampleServerPluginRegistry" factory-method="getInstance" /> 
+    <bean class="ch.systemsx.cisd.openbis.generic.server.plugin.SampleServerPluginRegistry" factory-method="getInstance" /> 
     
-    <bean class="ch.systemsx.cisd.openbis.plugin.DataSetServerPluginRegistry" factory-method="getInstance" /> 
+    <bean class="ch.systemsx.cisd.openbis.generic.server.plugin.DataSetServerPluginRegistry" factory-method="getInstance" /> 
 </beans>
\ No newline at end of file
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index 6186e64f900..fb3d6b31ba7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -29,6 +29,8 @@ import org.testng.annotations.Test;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.openbis.generic.server.business.DataStoreServerSessionManager;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase;
 import ch.systemsx.cisd.openbis.generic.shared.CommonTestUtils;
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
@@ -64,8 +66,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleOwnerIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
 
 /**
  * Test cases for corresponding {@link CommonServer} class.
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
index dcdd14d97d4..95ba1846188 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
@@ -26,6 +26,8 @@ import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase;
 import ch.systemsx.cisd.openbis.generic.shared.CommonTestUtils;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperiment;
@@ -43,8 +45,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 
 /**
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java
index b0869da3306..c26710dc3eb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerTest.java
@@ -21,13 +21,13 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.rinn.restrictions.Friend;
+import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
+import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase;
 import ch.systemsx.cisd.openbis.generic.shared.CommonTestUtils;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleGenerationDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
-import ch.systemsx.cisd.openbis.plugin.IDataSetTypeSlaveServerPlugin;
-import ch.systemsx.cisd.openbis.plugin.ISampleTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
 
 /**
-- 
GitLab