From 75f9eaeff538a474ae6c9089252945159094b10a Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 14 Dec 2010 12:27:30 +0000
Subject: [PATCH] [LMS-1921] changed build and dependency structure to allow
usage of DssComponent in screening API
SVN: 19127
---
screening/build/build.xml | 5 ++++-
screening/resource/dependency-structure.ddf | 15 ++++++++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/screening/build/build.xml b/screening/build/build.xml
index a2cdbff07e8..f81b67172a7 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -344,7 +344,10 @@
<include name="OpenBISScreeningML*.class" />
<include name="ch/systemsx/cisd/common/api/**/*.class" />
<exclude name="ch/systemsx/cisd/common/api/server/**/*.class" />
- <include name="ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.class" />
+ <exclude name="ch/systemsx/cisd/openbis/dss/client/api/v1/impl/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.class" />
+ <include name="ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/**/*.class" />
<include name="ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/**/*.class" />
<include name="ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/**/*.class" />
<include name="ch/systemsx/cisd/openbis/plugin/screening/client/cli/**/*.class" />
diff --git a/screening/resource/dependency-structure.ddf b/screening/resource/dependency-structure.ddf
index 10a74ed0afc..08958e421ee 100644
--- a/screening/resource/dependency-structure.ddf
+++ b/screening/resource/dependency-structure.ddf
@@ -6,7 +6,10 @@
# -------- check that screening openbis is indendent of the DSS code
[screening_openbis] = ${screening}.*
-[dss] = ${root}.dss.* ch.systemsx.cisd.etlserver.* excluding ${root}.dss.screening.shared.api.* ${root}.dss.generic.shared.api.authorization.*
+
+[dss_authorization] = ${root}.dss.generic.shared.api.authorization.*
+[dss_api] = ${root}.dss.screening.shared.api.v1.** ${root}.dss.client.api.v1.** ${root}.dss.generic.shared.api.v1.**
+[dss] = ${root}.dss.* ch.systemsx.cisd.etlserver.* excluding [dss_api] [dss_authorization]
check sets [screening_openbis] [dss]
check [screening_openbis] independentOf [dss]
@@ -48,20 +51,18 @@ check [screening_web_client] independentOf [screening_server]
# -------- check screening public API dependencies
[openbis_authorization] = ${screening}.shared.api.authorization.* ${root}.generic.shared.basic.dto.RoleWithHierarchy* ${root}.generic.shared.authorization.** ${root}.generic.shared.dto.** ${root}.generic.shared.util.SpaceCodeHelper
-[dss_authorization] = ${root}.dss.generic.shared.api.authorization.*
[authorization] = [openbis_authorization] [dss_authorization]
-[api_openbis] = ${screening}.shared.api.**
-[api_dss] = ${root}.dss.screening.shared.api.v1.**
+[api_openbis] = ${screening}.shared.api.**
[api_client_facade] = ${screening}.client.api.v1.**
-[api] = [api_dss] [api_openbis] [api_client_facade] [authorization]
+[api] = [dss_api] [api_openbis] [api_client_facade] [authorization]
[openbis_rest] = ${root}.** excluding [api]
-check sets [api_dss] [api_openbis] [api_client_facade] [api] [openbis_rest] [openbis_authorization]
+check sets [dss_api] [api_openbis] [api_client_facade] [api] [openbis_rest] [openbis_authorization]
# TODO: how to check that the api does not depend on external libraries?
check [api] independentOf [openbis_rest]
check [api_client_facade] directlyIndependentOf [authorization]
layer s_api_openbis = [api_openbis]
-layer s_api_dss_and_utils = [api_dss]
+layer s_api_dss_and_utils = [dss_api]
layer s_api_client = [api_client_facade]
check layeringOf s_api_openbis s_api_dss_and_utils s_api_client
--
GitLab