Bug 519546 - [MARTE] separate UI aspects (palette) from static profile definition

- Rename feature form full to main
- Add main featgure to category.xml

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>

9 files changed, 13 insertions, 7 deletions

diff --git a/releng/org.eclipse.papyrus.marte.full.feature/.project b/releng/org.eclipse.papyrus.marte.main.feature/.project
index 3070465..0d86878 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/.project
+++ b/releng/org.eclipse.papyrus.marte.main.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.marte.full.feature</name>
+	<name>org.eclipse.papyrus.marte.main.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/build.properties b/releng/org.eclipse.papyrus.marte.main.feature/build.properties
index cff2bd5..cff2bd5 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/build.properties
+++ b/releng/org.eclipse.papyrus.marte.main.feature/build.properties
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/epl-v10.html b/releng/org.eclipse.papyrus.marte.main.feature/epl-v10.html
index cb1073a..cb1073a 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/epl-v10.html
+++ b/releng/org.eclipse.papyrus.marte.main.feature/epl-v10.html
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/feature.properties b/releng/org.eclipse.papyrus.marte.main.feature/feature.properties
index a1b1fe0..ed46106 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/feature.properties
+++ b/releng/org.eclipse.papyrus.marte.main.feature/feature.properties
@@ -1,7 +1,7 @@
 # NLS_MESSAGEFORMAT_VAR
 
 # "featureName" property - name of the feature
-featureName=Papyrus MARTE core (Incubation)
+featureName=Papyrus MARTE main (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Modeling Project 
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/feature.xml b/releng/org.eclipse.papyrus.marte.main.feature/feature.xml
index d651725..731fe14 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.marte.main.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.papyrus.marte.full.feature"
+      id="org.eclipse.papyrus.marte.main.feature"
       label="%featureName"
       version="1.2.2.qualifier"
       provider-name="%providerName">
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/license.html b/releng/org.eclipse.papyrus.marte.main.feature/license.html
index c3d34c3..c3d34c3 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/license.html
+++ b/releng/org.eclipse.papyrus.marte.main.feature/license.html
diff --git a/releng/org.eclipse.papyrus.marte.full.feature/pom.xml b/releng/org.eclipse.papyrus.marte.main.feature/pom.xml
index be871af..4fd6af7 100644
--- a/releng/org.eclipse.papyrus.marte.full.feature/pom.xml
+++ b/releng/org.eclipse.papyrus.marte.main.feature/pom.xml
@@ -7,8 +7,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 		<artifactId>org.eclipse.papyrus.marte.releng</artifactId>
 		<version>1.2.2-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.marte.full.feature</artifactId>
+	<artifactId>org.eclipse.papyrus.marte.main.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 	<name>MARTE profile and VSL</name>
 	<description>This feature adds a static MARTE profile and VSL support.</description>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.eclipse.papyrus.marte.p2/category.xml b/releng/org.eclipse.papyrus.marte.p2/category.xml
index 933c864..5d7f688 100644
--- a/releng/org.eclipse.papyrus.marte.p2/category.xml
+++ b/releng/org.eclipse.papyrus.marte.p2/category.xml
@@ -6,6 +6,12 @@
 	<feature id="org.eclipse.papyrus.marte.core.feature.source" url="features/org.eclipse.papyrus.marte.core.feature.source_1.2.2.qualifier.jar" version="1.2.2.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
+	<feature id="org.eclipse.papyrus.marte.main.feature" url="features/org.eclipse.papyrus.marte.main.feature_1.2.2.qualifier.jar" version="1.2.2.qualifier">
+		<category name="org.eclipse.papyrus.category"/>
+	</feature>
+	<feature id="org.eclipse.papyrus.marte.main.feature.source" url="features/org.eclipse.papyrus.marte.main.feature.source_1.2.2.qualifier.jar" version="1.2.2.qualifier">
+		<category name="org.eclipse.papyrus.category"/>
+	</feature>
 	<feature id="org.eclipse.papyrus.marte.view.feature" url="features/org.eclipse.papyrus.marte.view.feature_1.2.2.qualifier.jar" version="1.2.2.qualifier">
 		<category name="org.eclipse.papyrus.category"/>
 	</feature>
@@ -21,4 +27,4 @@
 	<category-def label="Papyrus MARTE Category" name="org.eclipse.papyrus.category">
 		<description>Papyrus MARTE Category</description>
 	</category-def>
-</site>
\ No newline at end of file
+</site>
diff --git a/releng/pom.xml b/releng/pom.xml
index cf54071..e705495 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -13,7 +13,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<description>This plug-in contains the different modules relatives to the releng of MARTE from update site, to feature, product and rcp.</description>
 	<modules>
 		<module>org.eclipse.papyrus.marte.core.feature</module>
-		<module>org.eclipse.papyrus.marte.full.feature</module>
+		<module>org.eclipse.papyrus.marte.main.feature</module>
 		<module>org.eclipse.papyrus.marte.view.feature</module>
 		<module>org.eclipse.papyrus.marte.textedit.feature</module>
 	</modules>