Skip to content

Commit 86deb08

Browse files
author
Dennis Labordus
authored
Merge pull request #167 from com-pas/fix-compas-extension
Fix difference between core and data service
2 parents 205e97c + ab6d160 commit 86deb08

13 files changed

+26
-22
lines changed

‎scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ public class CompasExtensionsConstants {
1313

1414
public static final String XML_DEFAULT_NS_PREFIX = "compas";
1515
public static final String COMPAS_EXTENSION_NS_URI = "https://www.lfenergy.org/compas/extension/v1";
16-
public static final String COMPAS_SCL_EXTENSION_TYPE = "compas-scl";
16+
public static final String COMPAS_SCL_EXTENSION_TYPE = "compas_scl";
17+
public static final String COMPAS_SCL_NAME_EXTENSION = "SclName";
18+
public static final String COMPAS_SCL_FILE_TYPE_EXTENSION = "SclFileType";
19+
public static final String COMPAS_LABELS_EXTENSION = "Labels";
20+
public static final String COMPAS_LABEL_EXTENSION = "Label";
1721
public static final String JAXB_CONTEXT_PATH = "org.lfenergy.compas.scl.extensions.model";
1822
}

‎scl2003/src/test/resources/scl/scl_with_compas_private.scd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<!-- -->
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
5-
<Private type="compas-scl">
6-
<compas:SclName>project</compas:SclName>
7-
<compas:SclFileType>CID</compas:SclFileType>
8-
<compas:Labels>
9-
<compas:Label>Label1</compas:Label>
10-
</compas:Labels>
5+
<Private type="compas_scl">
6+
<compas:SclName>project</compas:SclName>
7+
<compas:SclFileType>CID</compas:SclFileType>
8+
<compas:Labels>
9+
<compas:Label>Label1</compas:Label>
10+
</compas:Labels>
1111
</Private>
1212
<Header id="370e5d89-df3a-4d9b-a651-3dc5cb28bee1" version="1.0.0"/>
1313
</SCL>

‎scl2003/src/test/resources/scl/scl_without_filetype_compas_private.scd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- -->
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
5-
<Private type="compas-scl">
6-
<compas:SclName>project</compas:SclName>
7-
<compas:Labels>
8-
<compas:Label>Label1</compas:Label>
9-
</compas:Labels>
5+
<Private type="compas_scl">
6+
<compas:SclName>project</compas:SclName>
7+
<compas:Labels>
8+
<compas:Label>Label1</compas:Label>
9+
</compas:Labels>
1010
</Private>
1111
<Header id="370e5d89-df3a-4d9b-a651-3dc5cb28bee1" version="1.0.0"/>
1212
</SCL>

‎scl2003/src/test/resources/scl/scl_without_labels_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- -->
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
5-
<Private type="compas-scl">
5+
<Private type="compas_scl">
66
<compas:SclName>project</compas:SclName>
77
<compas:SclFileType>CID</compas:SclFileType>
88
</Private>

‎scl2003/src/test/resources/scl/scl_without_sclname_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- -->
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
5-
<Private type="compas-scl">
5+
<Private type="compas_scl">
66
<compas:SclFileType>CID</compas:SclFileType>
77
<compas:Labels>
88
<compas:Label>Label1</compas:Label>

‎scl2007b/src/test/resources/scl/scl_with_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclName>project</compas:SclName>
88
<compas:SclFileType>CID</compas:SclFileType>
99
<compas:Labels>

‎scl2007b/src/test/resources/scl/scl_without_filetype_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclName>project</compas:SclName>
88
<compas:Labels>
99
<compas:Label>Label1</compas:Label>

‎scl2007b/src/test/resources/scl/scl_without_labels_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclName>project</compas:SclName>
88
<compas:SclFileType>CID</compas:SclFileType>
99
</Private>

‎scl2007b/src/test/resources/scl/scl_without_sclname_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclFileType>CID</compas:SclFileType>
88
<compas:Labels>
99
<compas:Label>Label1</compas:Label>

‎scl2007b4/src/test/resources/scl/scl_with_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B" release="4">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclName>project</compas:SclName>
88
<compas:SclFileType>CID</compas:SclFileType>
99
<compas:Labels>

‎scl2007b4/src/test/resources/scl/scl_without_filetype_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B" release="4">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclName>project</compas:SclName>
88
<compas:Labels>
99
<compas:Label>Label1</compas:Label>

‎scl2007b4/src/test/resources/scl/scl_without_labels_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B" release="4">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclName>project</compas:SclName>
88
<compas:SclFileType>CID</compas:SclFileType>
99
</Private>

‎scl2007b4/src/test/resources/scl/scl_without_sclname_compas_private.scd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- SPDX-License-Identifier: Apache-2.0 -->
44
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
55
revision="B" release="4">
6-
<Private type="compas-scl">
6+
<Private type="compas_scl">
77
<compas:SclFileType>CID</compas:SclFileType>
88
<compas:Labels>
99
<compas:Label>Label1</compas:Label>

0 commit comments

Comments
 (0)