[releng] Remove ease.jupyter plugin from papyrus.ease feature and create
its own feature + Rename features and categories
Change-Id: Ibf97ff7cc27099dfc8186bb85eed912a4a398582
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/features/org.eclipse.papyrus.ease.feature/feature.properties b/features/org.eclipse.papyrus.ease.feature/feature.properties
index 72a2a2a..638332e 100644
--- a/features/org.eclipse.papyrus.ease.feature/feature.properties
+++ b/features/org.eclipse.papyrus.ease.feature/feature.properties
@@ -9,13 +9,13 @@
###############################################################################
# "featureName" property - name of the feature
-featureName=EASE (Incubation)
+featureName=Papyrus Scripting (Incubation)
# "providerName" property - name of the company that provides the feature
providerName=Eclipse Modeling Project
# description property - text of the "Feature Description"
-description=EASE in Papyrus
+description=Scripting support for Papyrus
################ end of description property ##################################
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.papyrus.ease.feature/feature.xml b/features/org.eclipse.papyrus.ease.feature/feature.xml
index 2854fd2..53d9838 100644
--- a/features/org.eclipse.papyrus.ease.feature/feature.xml
+++ b/features/org.eclipse.papyrus.ease.feature/feature.xml
@@ -44,11 +44,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.papyrus.ease.lang.python.jupyter"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/features/org.eclipse.papyrus.ease.jupyter.feature/.project b/features/org.eclipse.papyrus.ease.jupyter.feature/.project
new file mode 100644
index 0000000..64de20e
--- /dev/null
+++ b/features/org.eclipse.papyrus.ease.jupyter.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.ease.jupyter.feature</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>
diff --git a/features/org.eclipse.papyrus.ease.jupyter.feature/build.properties b/features/org.eclipse.papyrus.ease.jupyter.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/org.eclipse.papyrus.ease.jupyter.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties b/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties
new file mode 100644
index 0000000..3a26561
--- /dev/null
+++ b/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2019 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+
+# "featureName" property - name of the feature
+featureName=EASE Jupyter Support (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse Modeling Project
+
+# description property - text of the "Feature Description"
+description=EASE Jupyter Support
+################ end of description property ##################################
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2019 CEA LIST.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n
+################ end of copyright property ####################################
+
diff --git a/features/org.eclipse.papyrus.ease.jupyter.feature/feature.xml b/features/org.eclipse.papyrus.ease.jupyter.feature/feature.xml
new file mode 100644
index 0000000..751ff16
--- /dev/null
+++ b/features/org.eclipse.papyrus.ease.jupyter.feature/feature.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.papyrus.ease.jupyter.feature"
+ version="0.7.0.qualifier"
+ label="%featureName"
+ provider-name="%providerName"
+ license-feature="org.eclipse.license"
+ license-feature-version="2.0.0">
+
+ <description url="http://www.example.com/description">
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.eclipse.papyrus.ease.feature" version="0.7.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.13.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.12.50" match="compatible"/>
+ <import plugin="org.eclipse.e4.core.services"/>
+ <import plugin="org.eclipse.ease" version="0.7.0" match="compatible"/>
+ <import plugin="org.eclipse.ease.lang.python.py4j" version="0.7.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.109.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.workbench"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.papyrus.ease.lang.python.jupyter"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.papyrus.ease.jupyter.feature/pom.xml b/features/org.eclipse.papyrus.ease.jupyter.feature/pom.xml
new file mode 100644
index 0000000..c41e733
--- /dev/null
+++ b/features/org.eclipse.papyrus.ease.jupyter.feature/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <!-- Parent POM (Tools) -->
+ <parent>
+ <groupId>org.eclipse.papyrus.ease</groupId>
+ <artifactId>org.eclipse.papyrus.ease.feature.root</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- POM description -->
+ <artifactId>org.eclipse.papyrus.ease.jupyter.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+ <name>org.eclipse.papyrus.ease.jupyter.feature</name>
+</project>
diff --git a/features/pom.xml b/features/pom.xml
index cd380fd..65cb225 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -19,6 +19,7 @@
<!-- Children modules to build -->
<modules>
<module>org.eclipse.papyrus.ease.feature</module>
+ <module>org.eclipse.papyrus.ease.jupyter.feature</module>
</modules>
</project>
diff --git a/releng/org.eclipse.papyrus.ease.p2/category.xml b/releng/org.eclipse.papyrus.ease.p2/category.xml
index 99d65a3..ddb4047 100644
--- a/releng/org.eclipse.papyrus.ease.p2/category.xml
+++ b/releng/org.eclipse.papyrus.ease.p2/category.xml
@@ -3,9 +3,12 @@
<feature url="org.eclipse.papyrus.ease.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.ease.feature" version="0.7.0.qualifier">
<category name="org.eclipse.papyrus.ease"/>
</feature>
- <category-def name="org.eclipse.papyrus.ease" label="Papyrus EASE (Incubation)">
+ <feature url="org.eclipse.papyrus.ease.jupyter.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.ease.jupyter.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.papyrus.ease"/>
+ </feature>
+ <category-def name="org.eclipse.papyrus.ease" label="Papyrus Scripting (Incubation)">
<description>
- Papyrus EASE Tools
+ Papyrus Scripting Tools
</description>
</category-def>
</site>
