Commit ba034f2e authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '29-add-feature-for-entsoecim16' into 'master'

Resolve "Add feature for EntsoeCim16"

Closes #29

See merge request RiseClipseGroup/RiseClipseDeveloper!35
parents eda02e7f 5d91145e
......@@ -9,7 +9,7 @@
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.edit.editor</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
# Copyright (c) 2018 CentraleSuplec & EDF.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# This file is part of the RiseClipse tool
#
# Contributors:
# Computer Science Department, CentraleSuplec
# EDF R&D
# Contacts:
# dominique.marcadet@centralesupelec.fr
# aurelie.dehouck-neveu@edf.fr
# Web site:
# http://wdi.supelec.fr/software/RiseClipse/
featureName=RiseClipse Entsoe CGMES v2.4.15 with editor feature
providerName=CentraleSuplec & EDF
descriptionURL=http://wdi.supelec.fr/software/RiseClipse/
description=This feature contains the editor and the support of Entsoe CGMES v2.4.15.
copyright=Copyright (c) 2018 CentraleSuplec & EDF.
licenseURL=http://www.eclipse.org/legal/epl-v10.html
license=This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 \
which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018 CentraleSupélec & EDF.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
This file is part of the RiseClipse tool
Contributors:
Computer Science Department, CentraleSupélec
EDF R&D
Contacts:
dominique.marcadet@centralesupelec.fr
aurelie.dehouck-neveu@edf.fr
Web site:
http://wdi.supelec.fr/software/RiseClipse/
-->
<feature
id="fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.editor"
label="%featureName"
version="1.0.1.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
%description
</description>
<copyright>
%copyright
</copyright>
<license url="%licenseURL">
%license
</license>
<url>
<update label="Update site for RiseClipse" url="http://wdi.supelec.fr/riseclipse-update-site/1.0"/>
<discovery label="RiseClipse home" url="http://wdi.supelec.fr/software/RiseClipse/"/>
</url>
<includes
id="fr.centralesupelec.edf.riseclipse.feature.editor"
version="0.0.0"
name="RiseClipse Editor"/>
<includes
id="fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe"
version="0.0.0"
name="Entsoe CGMED v2.4.15 support"/>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.editor</artifactId>
<version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.4</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- This needed parameter seems to be ignored if put in the pom root file -->
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
</plugins>
</build>
<!-- RiseClipse plugins needed -->
<dependencies>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.editor</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
# Copyright (c) 2018 CentraleSuplec & EDF.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# This file is part of the RiseClipse tool
#
# Contributors:
# Computer Science Department, CentraleSuplec
# EDF R&D
# Contacts:
# dominique.marcadet@centralesupelec.fr
# aurelie.dehouck-neveu@edf.fr
# Web site:
# http://wdi.supelec.fr/software/RiseClipse/
featureName=RiseClipse Entsoe CGMES v2.4.15 feature
providerName=CentraleSuplec & EDF
descriptionURL=http://wdi.supelec.fr/software/RiseClipse/
description=This feature allows RiseClipse to support Entsoe CGMES v2.4.15.
copyright=Copyright (c) 2018 CentraleSuplec & EDF.
licenseURL=http://www.eclipse.org/legal/epl-v10.html
license=This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 \
which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018 CentraleSupélec & EDF.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
This file is part of the RiseClipse tool
Contributors:
Computer Science Department, CentraleSupélec
EDF R&D
Contacts:
dominique.marcadet@centralesupelec.fr
aurelie.dehouck-neveu@edf.fr
Web site:
http://wdi.supelec.fr/software/RiseClipse/
-->
<feature
id="fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe"
label="%featureName"
version="1.0.1.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
%description
</description>
<copyright>
%copyright
</copyright>
<license url="%licenseURL">
%license
</license>
<url>
<update label="Update site for RiseClipse" url="http://wdi.supelec.fr/riseclipse-update-site/1.0"/>
<discovery label="RiseClipse home" url="http://wdi.supelec.fr/software/RiseClipse/"/>
</url>
<requires>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.emf.ecore"/>
<import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="fr.centralesupelec.edf.riseclipse.main"/>
<import plugin="org.eclipse.emf.edit"/>
</requires>
<plugin
id="fr.centralesupelec.edf.riseclipse.cim.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="fr.centralesupelec.edf.riseclipse.cim.headerModel"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="fr.centralesupelec.edf.riseclipse.cim.headerModel.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="fr.centralesupelec.edf.riseclipse.cim.cim16.util"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe-v2.4.15"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe-v2.4.15.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe</artifactId>
<version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.4</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- This needed parameter seems to be ignored if put in the pom root file -->
<pomDependencies>consider</pomDependencies>
</configuration>
</plugin>
</plugins>
</build>
<!-- RiseClipse plugins needed -->
<dependencies>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.cim.util</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.cim.headerModel.edit</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.cim.cim16.util</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe-v2.4.15</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.cim.cim16.entsoe-v2.4.15.edit</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</project>
......@@ -20,7 +20,7 @@
<feature
id="fr.centralesupelec.edf.riseclipse.feature.editor"
label="%featureName"
version="1.0.2.qualifier"
version="1.0.3.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
......
......@@ -4,13 +4,13 @@
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.editor</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
</parent>
<build>
......
......@@ -20,7 +20,7 @@
<feature
id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor"
label="%featureName"
version="1.0.2.qualifier"
version="1.0.3.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
......
......@@ -4,13 +4,13 @@
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
</parent>
<build>
......@@ -33,13 +33,13 @@
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.editor</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -20,7 +20,7 @@
<feature
id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl"
label="%featureName"
version="1.0.2.qualifier"
version="1.0.3.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
......
......@@ -4,13 +4,13 @@
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
</parent>
<build>
......
......@@ -3,28 +3,29 @@
<description name="Update site for RiseClipse" url="http://wdi.supelec.fr/riseclipse-update-site/1.0/">
RiseClipse is an umbrella name for tools based on Model Driven Engineering (MDE) technologies and dedicated to IEC standards. These tools are developed in the context of RISEGrid and used within or based on Eclipse or its plugins.
</description>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor_1.0.2.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor" version="1.0.2.qualifier">
<category name="RiseClipseSCLEditor"/>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.iec61850.scl_1.0.3.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl" version="1.0.3.qualifier">
<category name="RiseClipseMetamodels"/>
</feature>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.iec61850.scl_1.0.2.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl" version="1.0.2.qualifier">
<category name="RiseClipseSCL"/>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe_1.0.1.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe" version="1.0.1.qualifier">
<category name="RiseClipseMetamodels"/>
</feature>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.editor_1.0.2.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.editor" version="1.0.2.qualifier">
<category name="RiseClipseEditor"/>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.editor_1.0.3.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.editor" version="1.0.3.qualifier">
<category name="RiseClipseEditors"/>
</feature>
<category-def name="RiseClipseSCLEditor" label="RiseClipse">
<description>
RiseClipse Editor with metamodel for IEC 61850-6 SCL language Edition 2
</description>
</category-def>
<category-def name="RiseClipseEditor" label="RiseClipse Editor">
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor_1.0.3.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor" version="1.0.3.qualifier">
<category name="RiseClipseEditors"/>
</feature>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.editor_1.0.1.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.editor" version="1.0.1.qualifier">
<category name="RiseClipseEditors"/>
</feature>
<category-def name="RiseClipseEditors" label="RiseClipse Editor">
<description>
Specific RiseClipse Editor (based on generic EMF editor)
</description>
</category-def>
<category-def name="RiseClipseSCL" label="RiseClipse SCL support">
<category-def name="RiseClipseMetamodels" label="RiseClipse SCL support">
<description>
RiseClipse metamodel for IEC 61850-6 SCL language Edition 2
RiseClipse metamodels
</description>
</category-def>
</site>
......@@ -4,13 +4,13 @@
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.update-site</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
</parent>
<build>
......@@ -33,19 +33,31 @@
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.editor</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.editor</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
<relativePath>fr.centralesupelec.edf.riseclipse.developer.maven/pom.xml</relativePath>
</parent>
......@@ -24,6 +24,8 @@
<module>fr.centralesupelec.edf.riseclipse.feature.editor</module>
<module>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</module>
<module>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</module>
<module>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe</module>
<module>fr.centralesupelec.edf.riseclipse.feature.cim.cim16.entsoe.editor</module>
<module>fr.centralesupelec.edf.riseclipse.update-site</module>
</modules>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment