From d9f5a8dbfbf660cafe0a6bb7af130e95d129b6bc Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Thu, 15 Sep 2022 10:03:30 +0200 Subject: [PATCH 1/2] Fix difference between core and data service. Signed-off-by: Dennis Labordus --- .../commons/CompasExtensionsConstants.java | 2 +- .../test/resources/scl/scl_with_compas_private.scd | 12 ++++++------ .../scl/scl_without_filetype_compas_private.scd | 10 +++++----- .../scl/scl_without_labels_compas_private.scd | 2 +- .../scl/scl_without_sclname_compas_private.scd | 2 +- .../test/resources/scl/scl_with_compas_private.scd | 2 +- .../scl/scl_without_filetype_compas_private.scd | 2 +- .../scl/scl_without_labels_compas_private.scd | 2 +- .../scl/scl_without_sclname_compas_private.scd | 2 +- .../test/resources/scl/scl_with_compas_private.scd | 2 +- .../scl/scl_without_filetype_compas_private.scd | 2 +- .../scl/scl_without_labels_compas_private.scd | 2 +- .../scl/scl_without_sclname_compas_private.scd | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java index 0db903a..908a52d 100644 --- a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java +++ b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java @@ -13,6 +13,6 @@ public class CompasExtensionsConstants { public static final String XML_DEFAULT_NS_PREFIX = "compas"; public static final String COMPAS_EXTENSION_NS_URI = "https://www.lfenergy.org/compas/extension/v1"; - public static final String COMPAS_SCL_EXTENSION_TYPE = "compas-scl"; + public static final String COMPAS_SCL_EXTENSION_TYPE = "compas_scl"; public static final String JAXB_CONTEXT_PATH = "org.lfenergy.compas.scl.extensions.model"; } diff --git a/scl2003/src/test/resources/scl/scl_with_compas_private.scd b/scl2003/src/test/resources/scl/scl_with_compas_private.scd index f8844c3..933a7e9 100644 --- a/scl2003/src/test/resources/scl/scl_with_compas_private.scd +++ b/scl2003/src/test/resources/scl/scl_with_compas_private.scd @@ -2,12 +2,12 @@ - - project - CID - - Label1 - + + project + CID + + Label1 +
\ No newline at end of file diff --git a/scl2003/src/test/resources/scl/scl_without_filetype_compas_private.scd b/scl2003/src/test/resources/scl/scl_without_filetype_compas_private.scd index b1aeefb..018d5d8 100644 --- a/scl2003/src/test/resources/scl/scl_without_filetype_compas_private.scd +++ b/scl2003/src/test/resources/scl/scl_without_filetype_compas_private.scd @@ -2,11 +2,11 @@ - - project - - Label1 - + + project + + Label1 +
\ No newline at end of file diff --git a/scl2003/src/test/resources/scl/scl_without_labels_compas_private.scd b/scl2003/src/test/resources/scl/scl_without_labels_compas_private.scd index 9386124..bf05224 100644 --- a/scl2003/src/test/resources/scl/scl_without_labels_compas_private.scd +++ b/scl2003/src/test/resources/scl/scl_without_labels_compas_private.scd @@ -2,7 +2,7 @@ - + project CID diff --git a/scl2003/src/test/resources/scl/scl_without_sclname_compas_private.scd b/scl2003/src/test/resources/scl/scl_without_sclname_compas_private.scd index 92b8873..fdb0ecc 100644 --- a/scl2003/src/test/resources/scl/scl_without_sclname_compas_private.scd +++ b/scl2003/src/test/resources/scl/scl_without_sclname_compas_private.scd @@ -2,7 +2,7 @@ - + CID Label1 diff --git a/scl2007b/src/test/resources/scl/scl_with_compas_private.scd b/scl2007b/src/test/resources/scl/scl_with_compas_private.scd index 830687c..71a47c4 100644 --- a/scl2007b/src/test/resources/scl/scl_with_compas_private.scd +++ b/scl2007b/src/test/resources/scl/scl_with_compas_private.scd @@ -3,7 +3,7 @@ - + project CID diff --git a/scl2007b/src/test/resources/scl/scl_without_filetype_compas_private.scd b/scl2007b/src/test/resources/scl/scl_without_filetype_compas_private.scd index da144a9..2877e49 100644 --- a/scl2007b/src/test/resources/scl/scl_without_filetype_compas_private.scd +++ b/scl2007b/src/test/resources/scl/scl_without_filetype_compas_private.scd @@ -3,7 +3,7 @@ - + project Label1 diff --git a/scl2007b/src/test/resources/scl/scl_without_labels_compas_private.scd b/scl2007b/src/test/resources/scl/scl_without_labels_compas_private.scd index 0126a24..80994d5 100644 --- a/scl2007b/src/test/resources/scl/scl_without_labels_compas_private.scd +++ b/scl2007b/src/test/resources/scl/scl_without_labels_compas_private.scd @@ -3,7 +3,7 @@ - + project CID diff --git a/scl2007b/src/test/resources/scl/scl_without_sclname_compas_private.scd b/scl2007b/src/test/resources/scl/scl_without_sclname_compas_private.scd index 5b7965d..c1a87c3 100644 --- a/scl2007b/src/test/resources/scl/scl_without_sclname_compas_private.scd +++ b/scl2007b/src/test/resources/scl/scl_without_sclname_compas_private.scd @@ -3,7 +3,7 @@ - + CID Label1 diff --git a/scl2007b4/src/test/resources/scl/scl_with_compas_private.scd b/scl2007b4/src/test/resources/scl/scl_with_compas_private.scd index 36810f8..4dd6a6e 100644 --- a/scl2007b4/src/test/resources/scl/scl_with_compas_private.scd +++ b/scl2007b4/src/test/resources/scl/scl_with_compas_private.scd @@ -3,7 +3,7 @@ - + project CID diff --git a/scl2007b4/src/test/resources/scl/scl_without_filetype_compas_private.scd b/scl2007b4/src/test/resources/scl/scl_without_filetype_compas_private.scd index b5d9a34..76b7032 100644 --- a/scl2007b4/src/test/resources/scl/scl_without_filetype_compas_private.scd +++ b/scl2007b4/src/test/resources/scl/scl_without_filetype_compas_private.scd @@ -3,7 +3,7 @@ - + project Label1 diff --git a/scl2007b4/src/test/resources/scl/scl_without_labels_compas_private.scd b/scl2007b4/src/test/resources/scl/scl_without_labels_compas_private.scd index 1fa9d75..619c16d 100644 --- a/scl2007b4/src/test/resources/scl/scl_without_labels_compas_private.scd +++ b/scl2007b4/src/test/resources/scl/scl_without_labels_compas_private.scd @@ -3,7 +3,7 @@ - + project CID diff --git a/scl2007b4/src/test/resources/scl/scl_without_sclname_compas_private.scd b/scl2007b4/src/test/resources/scl/scl_without_sclname_compas_private.scd index 3922c27..f8d0322 100644 --- a/scl2007b4/src/test/resources/scl/scl_without_sclname_compas_private.scd +++ b/scl2007b4/src/test/resources/scl/scl_without_sclname_compas_private.scd @@ -3,7 +3,7 @@ - + CID Label1 From ab6d16056bc9fbf76e8f52474e219dcc83e79c25 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Thu, 15 Sep 2022 10:34:23 +0200 Subject: [PATCH 2/2] Fix difference between core and data service. Signed-off-by: Dennis Labordus --- .../scl/extensions/commons/CompasExtensionsConstants.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java index 908a52d..be13b41 100644 --- a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java +++ b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java @@ -14,5 +14,9 @@ public class CompasExtensionsConstants { public static final String XML_DEFAULT_NS_PREFIX = "compas"; public static final String COMPAS_EXTENSION_NS_URI = "https://www.lfenergy.org/compas/extension/v1"; public static final String COMPAS_SCL_EXTENSION_TYPE = "compas_scl"; + public static final String COMPAS_SCL_NAME_EXTENSION = "SclName"; + public static final String COMPAS_SCL_FILE_TYPE_EXTENSION = "SclFileType"; + public static final String COMPAS_LABELS_EXTENSION = "Labels"; + public static final String COMPAS_LABEL_EXTENSION = "Label"; public static final String JAXB_CONTEXT_PATH = "org.lfenergy.compas.scl.extensions.model"; }