From 8b6fda5c20165250caf9c01af331b17f0a039710 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 28 Jan 2010 15:06:17 +0000
Subject: [PATCH] SE-186 Fix dependency problems.

SVN: 14561
---
 rtd_yeastx/resource/dependency-structure.ddf              | 8 +++++---
 .../server/EICMLChromatogramGeneratorServlet.java         | 2 +-
 .../yeastx/eicml/EICMLChromatogramImagesReporter.java     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/{generic => yeastx}/server/EICMLChromatogramGeneratorServlet.java (99%)

diff --git a/rtd_yeastx/resource/dependency-structure.ddf b/rtd_yeastx/resource/dependency-structure.ddf
index 95b060ece36..432b43e6d6c 100644
--- a/rtd_yeastx/resource/dependency-structure.ddf
+++ b/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
diff --git a/rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EICMLChromatogramGeneratorServlet.java b/rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/yeastx/server/EICMLChromatogramGeneratorServlet.java
similarity index 99%
rename from rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EICMLChromatogramGeneratorServlet.java
rename to rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/yeastx/server/EICMLChromatogramGeneratorServlet.java
index 52284791dcc..04b736164bb 100644
--- a/rtd_yeastx/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EICMLChromatogramGeneratorServlet.java
+++ b/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;
 
diff --git a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/eicml/EICMLChromatogramImagesReporter.java b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/eicml/EICMLChromatogramImagesReporter.java
index 3579a518a65..1e35d679e28 100644
--- a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/eicml/EICMLChromatogramImagesReporter.java
+++ b/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;
-- 
GitLab