Commit eda02e7f authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '28-remove-feature-all' into 'master'

Resolve "Remove feature.all"

Closes #28

See merge request RiseClipseGroup/RiseClipseDeveloper!34
parents 424f598c 663797b4
......@@ -9,7 +9,7 @@
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
......
......@@ -19,9 +19,7 @@ featureName=RiseClipse Editor feature
providerName=CentraleSuplec & EDF
descriptionURL=http://wdi.supelec.fr/software/RiseClipse/
description=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 (http://www.centralesupelec.fr/fr/risegrid-institute-research-institute-smarter-electric-grids) and used within or based on Eclipse or its plugins. \
This feature contains the specialized editor (based on the EMF generic editor).
description=This feature contains the specialized RiseClipse editor (based on the EMF generic editor).
copyright=Copyright (c) 2018 CentraleSuplec & EDF.
......
......@@ -20,7 +20,7 @@
<feature
id="fr.centralesupelec.edf.riseclipse.feature.editor"
label="%featureName"
version="1.0.1.qualifier"
version="1.0.2.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.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</parent>
<build>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>fr.centralesupelec.edf.riseclipse.feature.all</name>
<name>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</name>
<comment></comment>
<projects>
</projects>
......
......@@ -15,13 +15,11 @@
# Web site:
# http://wdi.supelec.fr/software/RiseClipse/
featureName=RiseClipse IEC61850 SCL feature
featureName=RiseClipse IEC61850 SCL with editor feature
providerName=CentraleSuplec & EDF
descriptionURL=http://wdi.supelec.fr/software/RiseClipse/
description=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 (http://www.centralesupelec.fr/fr/risegrid-institute-research-institute-smarter-electric-grids) and used within or based on Eclipse or its plugins. \
This feature contains the editor and the support of the IEC 61850 SCL language (version 2003).
description=This feature contains the editor and the support of the IEC 61850 SCL language (Edition 2, version 2003).
copyright=Copyright (c) 2018 CentraleSuplec & EDF.
......
......@@ -18,9 +18,9 @@
http://wdi.supelec.fr/software/RiseClipse/
-->
<feature
id="fr.centralesupelec.edf.riseclipse.feature.all"
id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor"
label="%featureName"
version="1.0.1.qualifier"
version="1.0.2.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
......
......@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.all</artifactId>
<version>1.0.1-SNAPSHOT</version>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</artifactId>
<version>1.0.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-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.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -19,9 +19,7 @@ featureName=RiseClipse IEC61850 SCL feature
providerName=CentraleSuplec & EDF
descriptionURL=http://wdi.supelec.fr/software/RiseClipse/
description=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 (http://www.centralesupelec.fr/fr/risegrid-institute-research-institute-smarter-electric-grids) and used within or based on Eclipse or its plugins. \
This feature allow RiseClipse to support the IEC 61850 SCL language (version 2003).
description=This feature allows RiseClipse to support the IEC 61850 SCL language (Edition 2, version 2003).
copyright=Copyright (c) 2018 CentraleSuplec & EDF.
......
......@@ -20,7 +20,7 @@
<feature
id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl"
label="%featureName"
version="1.0.1.qualifier"
version="1.0.2.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.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</parent>
<build>
......
......@@ -3,6 +3,9 @@
<name>fr.centralesupelec.edf.riseclipse.update-site</name>
<comment></comment>
<projects>
<project>fr.centralesupelec.edf.riseclipse.feature.editor</project>
<project>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl</project>
<project>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</project>
</projects>
<buildSpec>
<buildCommand>
......
......@@ -3,16 +3,28 @@
<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.all_1.0.1.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.all" version="1.0.1.qualifier">
<category name="RiseClipse"/>
<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>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.iec61850.scl_1.0.1.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.iec61850.scl" version="1.0.1.qualifier">
<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>
<feature url="features/fr.centralesupelec.edf.riseclipse.feature.editor_1.0.1.qualifier.jar" id="fr.centralesupelec.edf.riseclipse.feature.editor" version="1.0.1.qualifier">
<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>
<category-def name="RiseClipse" label="RiseClipse"/>
<category-def name="RiseClipseEditor" label="RiseClipse Editor"/>
<category-def name="RiseClipseSCL" label="RiseClipse SCL support"/>
<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">
<description>
Specific RiseClipse Editor (based on generic EMF editor)
</description>
</category-def>
<category-def name="RiseClipseSCL" label="RiseClipse SCL support">
<description>
RiseClipse metamodel for IEC 61850-6 SCL language Edition 2
</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.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<parent>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>RiseClipseDeveloper</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</parent>
<build>
......@@ -32,8 +32,20 @@
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.all</artifactId>
<version>1.0.1-SNAPSHOT</version>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.editor</artifactId>
<version>1.0.2-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>
</dependency>
<dependency>
<groupId>fr.centralesupelec.edf.riseclipse</groupId>
<artifactId>fr.centralesupelec.edf.riseclipse.feature.iec61850.scl.editor</artifactId>
<version>1.0.2-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.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
<relativePath>fr.centralesupelec.edf.riseclipse.developer.maven/pom.xml</relativePath>
</parent>
......@@ -21,9 +21,9 @@
<modules>
<module>fr.centralesupelec.edf.riseclipse.developer.maven</module>
<module>fr.centralesupelec.edf.riseclipse.feature.all</module>
<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.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