SE-186 Fix dependency problems.

SVN: 14561

rtd_yeastx/resource/dependency-structure.ddf

@@ -11,7 +11,7 @@
 ######################################################################
 # Check dependencies of yeastx to openbis
 
-[yeastx] = ${yeastx}.**
+[yeastx] = ${yeastx}.** 
 [dss] = ${dss}.*
 [private_openbis] = ${openbis}.* excluding [dss] ${openbis}.generic.shared.*
 
@@ -25,12 +25,14 @@ check [yeastx] independentOf [private_openbis]
 [dss.shared] = ${dss}.generic.shared.*
 # TODO TPK: move plugins package interface to shared
 [dss.plugins] = ${dss}.generic.server.plugins.*
-[private_dss] = ${dss}.* excluding [dss.shared] [dss.plugins] ${dss}.generic.DataStoreServer 
+[dss.yeastx] = ${dss}.yeastx.server.**
+[private_dss] = ${dss}.* excluding [dss.shared] [dss.plugins] [dss.yeastx] ${dss}.generic.DataStoreServer
 
 layer l1 = [dss.shared]
 layer l2 = [yeastx] [private_dss]
+layer l3 = [dss.yeastx]
 
-check layeringOf l1 l2
+check layeringOf l1 l2 l3
 
 ######################################################################
 # Check internal dependencies of yeastx

rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EICMLChromatogramGeneratorServlet.java → rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/yeastx/server/EICMLChromatogramGeneratorServlet.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.generic.server;
+package ch.systemsx.cisd.openbis.dss.yeastx.server;
 
 import java.io.IOException;
 

rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/eicml/EICMLChromatogramImagesReporter.java

@@ -29,10 +29,10 @@ import net.lemnik.eodsql.DataIterator;
 import net.lemnik.eodsql.QueryTool;
 
 import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext;
-import ch.systemsx.cisd.openbis.dss.generic.server.EICMLChromatogramGeneratorServlet;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractDatastorePlugin;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IReportingPluginTask;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.SimpleTableModelBuilder;
+import ch.systemsx.cisd.openbis.dss.yeastx.server.EICMLChromatogramGeneratorServlet;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ImageTableCell;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;