Skip to content

Commit

Permalink
Merge pull request #167 from com-pas/fix-compas-extension
Browse files Browse the repository at this point in the history 
Fix difference between core and data service
  • Loading branch information
Dennis Labordus authored Sep 15, 2022
2 parents 205e97c + ab6d160 commit 86deb08
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 22 deletions.
6 changes: 5 additions & 1 deletion ...n/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ 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 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";
}
12 changes: 6 additions & 6 deletions scl2003/src/test/resources/scl/scl_with_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!-- -->
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
<Private type="compas-scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
<compas:Label>Label1</compas:Label>
</compas:Labels>
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
<compas:Label>Label1</compas:Label>
</compas:Labels>
</Private>
<Header id="370e5d89-df3a-4d9b-a651-3dc5cb28bee1" version="1.0.0"/>
</SCL>
10 changes: 5 additions & 5 deletions scl2003/src/test/resources/scl/scl_without_filetype_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<!-- -->
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
<Private type="compas-scl">
<compas:SclName>project</compas:SclName>
<compas:Labels>
<compas:Label>Label1</compas:Label>
</compas:Labels>
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:Labels>
<compas:Label>Label1</compas:Label>
</compas:Labels>
</Private>
<Header id="370e5d89-df3a-4d9b-a651-3dc5cb28bee1" version="1.0.0"/>
</SCL>
2 changes: 1 addition & 1 deletion scl2003/src/test/resources/scl/scl_without_labels_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
</Private>
Expand Down
2 changes: 1 addition & 1 deletion scl2003/src/test/resources/scl/scl_without_sclname_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
<compas:Label>Label1</compas:Label>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b/src/test/resources/scl/scl_with_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b/src/test/resources/scl/scl_without_filetype_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:Labels>
<compas:Label>Label1</compas:Label>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b/src/test/resources/scl/scl_without_labels_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
</Private>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b/src/test/resources/scl/scl_without_sclname_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
<compas:Label>Label1</compas:Label>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b4/src/test/resources/scl/scl_with_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B" release="4">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b4/src/test/resources/scl/scl_without_filetype_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B" release="4">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:Labels>
<compas:Label>Label1</compas:Label>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b4/src/test/resources/scl/scl_without_labels_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B" release="4">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclName>project</compas:SclName>
<compas:SclFileType>CID</compas:SclFileType>
</Private>
Expand Down
2 changes: 1 addition & 1 deletion scl2007b4/src/test/resources/scl/scl_without_sclname_compas_private.scd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- SPDX-License-Identifier: Apache-2.0 -->
<SCL xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1" version="2007"
revision="B" release="4">
<Private type="compas-scl">
<Private type="compas_scl">
<compas:SclFileType>CID</compas:SclFileType>
<compas:Labels>
<compas:Label>Label1</compas:Label>
Expand Down

0 comments on commit 86deb08

Please sign in to comment.