Skip to content

Commit 51b311d

Browse files
AliouDIAITEAliouDIAITE
authored
[#88] : add private COMPAS_SCL_FILE_TYPE in created SCD (#102)
[#88] : add private COMPAS_SCL_FILE_TYPE in created SCD Signed-off-by: Aliou DIAITE <[email protected]>
1 parent 40d2664 commit 51b311d

File tree

8 files changed

+220
-76
lines changed

8 files changed

+220
-76
lines changed

‎sct-app/pom.xml‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,29 @@
7373
<target>11</target>
7474
</configuration>
7575
</plugin>
76-
7776
<plugin>
7877
<groupId>org.apache.maven.plugins</groupId>
7978
<artifactId>maven-surefire-plugin</artifactId>
8079
</plugin>
81-
80+
<plugin>
81+
<groupId>org.jacoco</groupId>
82+
<artifactId>jacoco-maven-plugin</artifactId>
83+
<executions>
84+
<execution>
85+
<id>default-prepare-agent</id>
86+
<goals>
87+
<goal>prepare-agent</goal>
88+
</goals>
89+
</execution>
90+
<execution>
91+
<id>report</id>
92+
<phase>test</phase>
93+
<goals>
94+
<goal>report</goal>
95+
</goals>
96+
</execution>
97+
</executions>
98+
</plugin>
8299
<plugin>
83100
<groupId>org.apache.maven.plugins</groupId>
84101
<artifactId>maven-dependency-plugin</artifactId>
@@ -89,21 +106,25 @@
89106
<goals>
90107
<goal>unpack</goal>
91108
</goals>
92-
93109
<configuration>
110+
<includes>**/SCL2007B4/*.xsd, **/SCL_CoMPAS.xsd</includes>
94111
<artifactItems>
95112
<artifactItem>
96113
<groupId>org.lfenergy.compas.xsd</groupId>
97114
<artifactId>compas-scl-xsd</artifactId>
98115
<version>0.0.4</version>
99116
</artifactItem>
117+
<artifactItem>
118+
<groupId>org.lfenergy.compas.core</groupId>
119+
<artifactId>scl-extension</artifactId>
120+
<version>0.8.0</version>
121+
</artifactItem>
100122
</artifactItems>
101123
<outputDirectory>${project.build.directory}</outputDirectory>
102124
</configuration>
103125
</execution>
104126
</executions>
105127
</plugin>
106-
107128
</plugins>
108129
</build>
109130
</project>

‎sct-commons/pom.xml‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<version>local-SNAPSHOT</version>
1818
<name>SCT-COMMONS</name>
1919

20-
2120
<properties>
2221
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
22+
<sonar.jacoco.excludes>**/scl2007b4/**/*</sonar.jacoco.excludes>
2323
<assertJ.version>3.22.0</assertJ.version>
2424
</properties>
2525

@@ -122,12 +122,34 @@
122122
<target>11</target>
123123
</configuration>
124124
</plugin>
125-
126125
<plugin>
127126
<groupId>org.apache.maven.plugins</groupId>
128127
<artifactId>maven-surefire-plugin</artifactId>
129128
</plugin>
130-
129+
<plugin>
130+
<groupId>org.jacoco</groupId>
131+
<artifactId>jacoco-maven-plugin</artifactId>
132+
<configuration>
133+
<excludes>
134+
<exclude>**/scl2007b4/**/*</exclude>
135+
</excludes>
136+
</configuration>
137+
<executions>
138+
<execution>
139+
<id>default-prepare-agent</id>
140+
<goals>
141+
<goal>prepare-agent</goal>
142+
</goals>
143+
</execution>
144+
<execution>
145+
<id>report</id>
146+
<phase>test</phase>
147+
<goals>
148+
<goal>report</goal>
149+
</goals>
150+
</execution>
151+
</executions>
152+
</plugin>
131153
<plugin>
132154
<groupId>org.apache.maven.plugins</groupId>
133155
<artifactId>maven-dependency-plugin</artifactId>
@@ -157,6 +179,27 @@
157179
</execution>
158180
</executions>
159181
</plugin>
182+
<plugin>
183+
<groupId>org.codehaus.mojo</groupId>
184+
<artifactId>jaxb2-maven-plugin</artifactId>
185+
<version>2.5.0</version>
186+
<executions>
187+
<execution>
188+
<id>xjc</id>
189+
<goals>
190+
<goal>xjc</goal>
191+
</goals>
192+
</execution>
193+
</executions>
194+
<configuration>
195+
<sources>
196+
<source>${project.build.directory}/xsd/SCL2007B4/SCL.xsd</source>
197+
<source>${project.build.directory}/xsd/SCL_CoMPAS.xsd</source>
198+
</sources>
199+
<packageName>org.lfenergy.compas.scl2007b4.model</packageName>
200+
<noPackageLevelAnnotations>true</noPackageLevelAnnotations>
201+
</configuration>
202+
</plugin>
160203
<plugin>
161204
<groupId>org.apache.maven.plugins</groupId>
162205
<artifactId>maven-jar-plugin</artifactId>

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/CommonConstants.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ public class CommonConstants {
1313
public static final String XML_DEFAULT_NS_URI = "http://www.iec.ch/61850/2003/SCL";
1414
public static final String XML_DEFAULT_XSD_PATH = "classpath:schema/SCL.xsd";
1515

16+
public static final String COMPAS_SCL_FILE_TYPE = "COMPAS-SclFileType";
17+
public static final String SCL_FILE_TYPE = "SclFileType";
1618
public static final String COMPAS_ICDHEADER = "COMPAS-ICDHeader";
1719
public static final String ICD_SYSTEM_VERSION_UUID = "ICDSystemVersionUUID";
1820
public static final String IED_NAME = "IEDName";

0 commit comments

Comments
 (0)