Bug 529135 - [Layers] Rewire the build architecture post refactoring
Change-Id: If780df8808d6af4229c767311aa26b5077321190
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/.project b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/.project
similarity index 84%
rename from layers/features/org.eclipse.papyrus.layers.feature/.project
rename to layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/.project
index dffc49c..edeb3ba 100755
--- a/layers/features/org.eclipse.papyrus.layers.feature/.project
+++ b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.layers.feature</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.layers.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/build.properties b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/build.properties
similarity index 100%
rename from layers/features/org.eclipse.papyrus.layers.feature/build.properties
rename to layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/build.properties
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/epl-v10.html b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/epl-v10.html
similarity index 100%
rename from layers/features/org.eclipse.papyrus.layers.feature/epl-v10.html
rename to layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/epl-v10.html
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/feature.properties b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/feature.properties
similarity index 100%
rename from layers/features/org.eclipse.papyrus.layers.feature/feature.properties
rename to layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/feature.properties
diff --git a/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/feature.xml b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/feature.xml
new file mode 100755
index 0000000..1311bc4
--- /dev/null
+++ b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/feature.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<feature id="org.eclipse.papyrus.infra.gmfdiag.layers.feature"
+ label="%featureName"
+ provider-name="%providerName"
+ version="0.7.0.qualifier">
+
+ <description url="http://www.eclipse.com/papyrus">
+ This plugins add Layers capapbilities to Papyrus diagrams.
+ </description>
+
+ <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ Copyright (c) 2013 CEA LIST.
+ 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.
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <!-- need to update this as soon as the tool has been cleansed -->
+ </requires>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.model"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.model.edit"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.model.editor"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.diagram"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.ui"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.runtime"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+ <plugin download-size="0"
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit"
+ install-size="0"
+ unpack="false"
+ version="0.0.0"/>
+
+
+</feature>
\ No newline at end of file
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/license.html b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/license.html
similarity index 100%
rename from layers/features/org.eclipse.papyrus.layers.feature/license.html
rename to layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/license.html
diff --git a/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/pom.xml b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/pom.xml
new file mode 100755
index 0000000..78aaeee
--- /dev/null
+++ b/layers/features/org.eclipse.papyrus.infra.gmfdiag.layers.feature/pom.xml
@@ -0,0 +1,15 @@
+<?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>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.features</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+</project>
\ No newline at end of file
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/feature.xml b/layers/features/org.eclipse.papyrus.layers.feature/feature.xml
deleted file mode 100755
index 76e690d..0000000
--- a/layers/features/org.eclipse.papyrus.layers.feature/feature.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.layers.feature" label="%featureName" provider-name="%providerName" version="1.2.0.qualifier">
-
- <description url="http://www.eclipse.com/papyrus">
- This plugins add Layers capapbilities to Papyrus diagrams.
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2013 CEA LIST.
-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.
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import match="greaterOrEqual" plugin="org.eclipse.gmf.runtime.notation" version="1.5.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.gmf.runtime.notation.edit" version="1.4.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.gmf.runtime.notation.providers" version="1.7.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf.edit" version="2.9.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf.ecore.edit" version="2.8.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf.ecore" version="2.9.0"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.papyrus.infra.core"/>
- <import match="greaterOrEqual" plugin="org.eclipse.core.resources" version="3.8.100"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.gmfdiag.common" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf.ecore.xmi" version="2.9.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.uml2.uml" version="4.1.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.emf" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.emf.diagram.common" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.editor" version="1.0.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf.transaction" version="1.4.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.core.log" version="0.10.0"/>
- <import plugin="org.eclipse.core.expressions"/>
- <import plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/>
- <import match="greaterOrEqual" plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.7.0"/>
- <import plugin="org.eclipse.uml2.common.edit"/>
- <import plugin="org.eclipse.emf.edit.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.core.sasheditor" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.ui.forms" version="3.5.200"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf" version="2.6.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.core" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.layers.runtime" version="0.10.0"/>
- <import plugin="org.eclipse.core.databinding"/>
- <import plugin="org.eclipse.core.databinding.beans"/>
- <import plugin="org.eclipse.core.databinding.observable"/>
- <import plugin="org.eclipse.core.databinding.property"/>
- <import plugin="com.ibm.icu"/>
- <import plugin="org.eclipse.emf.databinding"/>
- <import match="greaterOrEqual" plugin="org.eclipse.uml2.uml.edit" version="4.0.100"/>
- <import match="greaterOrEqual" plugin="org.eclipse.emf.databinding.edit" version="1.3.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.jface.databinding" version="1.6.200"/>
- <import plugin="org.eclipse.gmf.runtime.diagram.ui.properties"/>
- <import match="greaterOrEqual" plugin="org.eclipse.ui.ide" version="3.9.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor" version="1.7.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.core.expressions" version="3.4.500"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.layers.notationmodel.edit" version="0.11.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.views.modelexplorer" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.views.properties" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.widgets" version="0.10.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.ui.navigator" version="3.5.300"/>
- <import match="greaterOrEqual" plugin="org.eclipse.gmf.runtime.notation.edit" version="1.7.0"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.services.labelprovider" version="0.10.1"/>
- <import match="greaterOrEqual" plugin="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="0.10.1"/>
- </requires>
-
- <plugin download-size="0" id="org.eclipse.papyrus.layers.notationmodel.edit" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.layers.runtime" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.diagram" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.edit" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.editor" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.layers.ui" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file
diff --git a/layers/features/org.eclipse.papyrus.layers.feature/pom.xml b/layers/features/org.eclipse.papyrus.layers.feature/pom.xml
deleted file mode 100755
index ce3ba75..0000000
--- a/layers/features/org.eclipse.papyrus.layers.feature/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.features</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.papyrus.layers.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-
-</project>
\ No newline at end of file
diff --git a/layers/features/pom.xml b/layers/features/pom.xml
index f58cb68..c3c72e1 100755
--- a/layers/features/pom.xml
+++ b/layers/features/pom.xml
@@ -4,16 +4,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.parent</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.incubation.layers.features</artifactId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.features</artifactId>
<packaging>pom</packaging>
<modules>
- <module>org.eclipse.papyrus.layers.feature</module>
+ <module>org.eclipse.papyrus.infra.gmfdiag.layers.feature</module>
</modules>
</project>
\ No newline at end of file
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/META-INF/MANIFEST.MF
index 21ce92a..848e084 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/META-INF/MANIFEST.MF
@@ -6,20 +6,20 @@
org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",
org.eclipse.emf.ecore;bundle-version="2.9.0",
org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.layers.model.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.layers.model.editor;bundle-version="0.7.0",
org.eclipse.emf.transaction;bundle-version="1.4.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
org.eclipse.core.expressions,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.papyrus.infra.gmfdiag.layers.runtime;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.layers.runtime;bundle-version="0.7.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
org.eclipse.ui.ide;bundle-version="3.10.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.layers.model;bundle-version="1.3.0"
+ org.eclipse.papyrus.infra.gmfdiag.layers.model;bundle-version="0.7.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/pom.xml
index 9a3bc4e..0d4b18c 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.diagram/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.diagram</artifactId>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF
index da32a0d..0946336 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/pom.xml
index 857e798..3304918 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.model.edit</artifactId>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF
index 8536ecf..6e8a8ec 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/pom.xml
index 9fbc933..9550c0e 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.model.editor</artifactId>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/META-INF/MANIFEST.MF
index e9a0c3a..b1d17de 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/pom.xml
index 1cfec8b..69e7e4d 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/pom.xml
@@ -4,13 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.model</artifactId>
- <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.classpath b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.classpath
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.classpath
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.classpath
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.project b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.project
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.project
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.project
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/META-INF/MANIFEST.MF
similarity index 95%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/META-INF/MANIFEST.MF
index 6cdca6d..b3b9b8d 100755
--- a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Export-Package: org.eclipse.papyrus.internal.infra.gmfdiag.layers.notationmodel.edit
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/about.html b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/about.html
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/about.html
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/about.html
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/build.properties b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/build.properties
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/build.properties
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/build.properties
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/plugin.properties
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/plugin.properties
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/plugin.properties
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/pom.xml
similarity index 69%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/pom.xml
index 52ae140..23c0c1f 100755
--- a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit</artifactId>
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/Activator.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/Activator.java
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/Activator.java
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/Activator.java
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ConnectorItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ConnectorItemProvider.java
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ConnectorItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ConnectorItemProvider.java
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/DiagramItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/DiagramItemProvider.java
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/DiagramItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/DiagramItemProvider.java
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NodeItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NodeItemProvider.java
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NodeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NodeItemProvider.java
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/NotationItemProviderAdapterFactory.java
diff --git a/layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ShapeItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ShapeItemProvider.java
similarity index 100%
rename from layers/plugins/org.eclipse.papyrus.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ShapeItemProvider.java
rename to layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/notationmodel/edit/ShapeItemProvider.java
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/META-INF/MANIFEST.MF
index 45b0f79..f8a1755 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.layers.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.layers.model;bundle-version="0.7.0",
org.eclipse.emf.ecore;bundle-version="2.9.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.core.resources;bundle-version="3.8.100",
@@ -15,7 +15,7 @@
org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.service
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/pom.xml
index 83f8dbd..a16407d 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.runtime</artifactId>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/META-INF/MANIFEST.MF
index 11cab70..ca0f678 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",
org.eclipse.emf;bundle-version="2.6.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.layers.runtime;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.layers.runtime;bundle-version="0.7.0",
org.eclipse.core.databinding,
org.eclipse.core.databinding.beans,
org.eclipse.core.databinding.observable,
@@ -21,7 +21,7 @@
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
org.eclipse.core.expressions;bundle-version="3.4.500",
- org.eclipse.papyrus.infra.gmfdiag.layers.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.layers.model;bundle-version="0.7.0",
org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
@@ -31,12 +31,12 @@
org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.layers.model.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.layers.model.edit;bundle-version="0.7.0",
org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit,
org.eclipse.papyrus.infra.gmfdiag.css.properties
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/build.properties b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/build.properties
index 8ef443f..f9283b7 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/build.properties
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/build.properties
@@ -6,6 +6,6 @@
about.html,\
plugin.properties,\
plugin.xml,\
- OLD_properties/
+ properties/
jars.compile.order = .
src.includes = about.html
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/pom.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/pom.xml
index 7d43523..0635201 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/pom.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.layers.ui</artifactId>
diff --git a/layers/plugins/pom.xml b/layers/plugins/pom.xml
index 3bae0eb..326516e 100755
--- a/layers/plugins/pom.xml
+++ b/layers/plugins/pom.xml
@@ -4,27 +4,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.parent</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.incubation.layers.plugins</artifactId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.plugins</artifactId>
<packaging>pom</packaging>
<modules>
- <module>org.eclipse.papyrus.layers.notationmodel.edit</module>
+ <module>org.eclipse.papyrus.infra.gmfdiag.layers.notationmodel.edit</module>
<module>org.eclipse.papyrus.infra.gmfdiag.layers.runtime</module>
<module>org.eclipse.papyrus.infra.gmfdiag.layers.model</module>
<module>org.eclipse.papyrus.infra.gmfdiag.layers.model.edit</module>
<module>org.eclipse.papyrus.infra.gmfdiag.layers.model.editor</module>
<module>org.eclipse.papyrus.infra.gmfdiag.layers.ui</module>
<module>org.eclipse.papyrus.infra.gmfdiag.layers.diagram</module>
-
- <!-- FIXME present in Papyrus core repo but not in the build
- org.eclipse.papyrus.layers.dev.ui
- org.eclipse.papyrus.layers.updatesite
- -->
</modules>
</project>
\ No newline at end of file
diff --git a/layers/pom.xml b/layers/pom.xml
index 844a30c..30f531d 100755
--- a/layers/pom.xml
+++ b/layers/pom.xml
@@ -9,9 +9,9 @@
<version>3.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.parent</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -25,9 +25,9 @@
<id>layers</id>
<properties>
- <targetplatform.groupId>org.eclipse.papyrus.incubation.layers</targetplatform.groupId>
- <targetplatform.artifactId>org.eclipse.papyrus.incubation.layers.targetplatform</targetplatform.artifactId>
- <targetplatform.version>1.2.0-SNAPSHOT</targetplatform.version>
+ <targetplatform.groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</targetplatform.groupId>
+ <targetplatform.artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform</targetplatform.artifactId>
+ <targetplatform.version>0.7.0-SNAPSHOT</targetplatform.version>
</properties>
<modules>
diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project b/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/.project
similarity index 72%
rename from layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
rename to layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/.project
index 0a79233..6427d98 100755
--- a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
+++ b/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.incubation.p2</name>
+ <name>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2</name>
<comment></comment>
<projects>
</projects>
diff --git a/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/category.xml b/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/category.xml
new file mode 100755
index 0000000..cc82c5c
--- /dev/null
+++ b/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/category.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.papyrus.infra.gmfdiag.layers.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.layers.feature" version="0.7.0.qualifier">
+ <category name="org.eclipse.papyrus.incubation.category"/>
+ </feature>
+ <feature url="features/org.eclipse.papyrus.infra.gmfdiag.layers.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.layers.feature.source" version="0.7.0.qualifier">
+ <category name="org.eclipse.papyrus.incubation.category"/>
+ </feature>
+
+ <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
+ <description>
+ Papyrus Incubation features
+ </description>
+ </category-def>
+</site>
diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml b/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/pom.xml
similarity index 69%
rename from layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml
rename to layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/pom.xml
index 9e35bbc..b8ca8a3 100755
--- a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml
+++ b/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/pom.xml
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.incubation.layers.p2</artifactId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2</artifactId>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml
deleted file mode 100755
index 04687f7..0000000
--- a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.papyrus.layers.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.layers.feature" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.incubation.category"/>
- </feature>
- <feature url="features/org.eclipse.papyrus.layers.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.layers.feature.source" version="1.2.0.qualifier">
- <category name="org.eclipse.papyrus.incubation.category"/>
- </feature>
-
- <category-def name="org.eclipse.papyrus.incubation.category" label="Papyrus Incubation">
- <description>
- Papyrus Incubation features
- </description>
- </category-def>
-</site>
diff --git a/layers/releng/pom.xml b/layers/releng/pom.xml
index 7cc8a44..ee4a7a3 100755
--- a/layers/releng/pom.xml
+++ b/layers/releng/pom.xml
@@ -3,17 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.parent</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.incubation.layers.releng</artifactId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.releng</artifactId>
<packaging>pom</packaging>
<modules>
<module>targetplatform</module>
- <module>org.eclipse.papyrus.incubation.layers.p2</module>
+ <module>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2</module>
</modules>
</project>
\ No newline at end of file
diff --git a/layers/releng/promote/dsmlvalidation.sh b/layers/releng/promote/layers.sh
similarity index 100%
rename from layers/releng/promote/dsmlvalidation.sh
rename to layers/releng/promote/layers.sh
diff --git a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
similarity index 82%
rename from layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
rename to layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
index da0fb89..df83c8d 100755
--- a/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.layers.targetplatform.target
+++ b/layers/releng/targetplatform/eclipse/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Layers - Oxygen" sequenceNumber="1504350732">
+<target name="Layers - Oxygen" sequenceNumber="1513937936">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ui" version="0.0.0"/>
@@ -23,6 +23,10 @@
<unit id="org.eclipse.papyrus.infra.emf.diagram.common" version="0.0.0"/>
<unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css.properties" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css.model" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css.model.edit" version="0.0.0"/>
<repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
</location>
</locations>
diff --git a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/.project
similarity index 66%
copy from layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
copy to layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/.project
index 0a79233..f1784bb 100755
--- a/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.incubation.p2</name>
+ <name>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.oxygen</name>
<comment></comment>
<projects>
</projects>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
similarity index 81%
rename from layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
rename to layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
index 2a84888..0747d2f 100755
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.target
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Layers - Oxygen" sequenceNumber="1504350732">
+<target name="Layers - Oxygen" sequenceNumber="1513937936">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ui" version="0.0.0"/>
@@ -23,6 +23,10 @@
<unit id="org.eclipse.papyrus.infra.emf.diagram.common" version="0.0.0"/>
<unit id="org.eclipse.papyrus.views.modelexplorer" version="0.0.0"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css.properties" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css.model" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.css.model.edit" version="0.0.0"/>
<repository id="Papyrus-Oxygen" location="https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen/lastSuccessfulBuild/artifact/repository/"/>
</location>
</locations>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd
similarity index 80%
rename from layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
rename to layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd
index 594bd39..17f13c8 100755
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform.tpd
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform.tpd
@@ -22,6 +22,9 @@
org.eclipse.papyrus.infra.emf.diagram.common lazy
org.eclipse.papyrus.views.modelexplorer lazy
org.eclipse.papyrus.infra.gmfdiag.hyperlink lazy
- org.eclipse.papyrus.integrationtests.editor lazy
+ org.eclipse.papyrus.infra.gmfdiag.css lazy
+ org.eclipse.papyrus.infra.gmfdiag.css.properties lazy
+ org.eclipse.papyrus.infra.gmfdiag.css.model lazy
+ org.eclipse.papyrus.infra.gmfdiag.css.model.edit lazy
}
\ No newline at end of file
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/pom.xml b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/pom.xml
new file mode 100755
index 0000000..0515113
--- /dev/null
+++ b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform/pom.xml
@@ -0,0 +1,14 @@
+<?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>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.releng.targetplatform</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+
+</project>
\ No newline at end of file
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/.project b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/.project
deleted file mode 100755
index 7477ea0..0000000
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.incubation.targetplatform.oxygen</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/pom.xml b/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/pom.xml
deleted file mode 100755
index ed515f8..0000000
--- a/layers/releng/targetplatform/org.eclipse.papyrus.incubation.layers.targetplatform/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.releng.targetplatform</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.papyrus.incubation.layers.targetplatform</artifactId>
- <packaging>eclipse-target-definition</packaging>
-
-</project>
\ No newline at end of file
diff --git a/layers/releng/targetplatform/pom.xml b/layers/releng/targetplatform/pom.xml
index eecb890..1717adb 100755
--- a/layers/releng/targetplatform/pom.xml
+++ b/layers/releng/targetplatform/pom.xml
@@ -3,16 +3,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.releng</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.incubation.layers.releng.targetplatform</artifactId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.releng.targetplatform</artifactId>
<packaging>pom</packaging>
<modules>
- <module>org.eclipse.papyrus.incubation.layers.targetplatform</module>
+ <module>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.targetplatform</module>
</modules>
</project>
\ No newline at end of file
diff --git a/layers/tests/pom.xml b/layers/tests/pom.xml
index 662953f..53d5600 100755
--- a/layers/tests/pom.xml
+++ b/layers/tests/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus.incubation.layers</groupId>
- <artifactId>org.eclipse.papyrus.incubation.layers.parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers</groupId>
+ <artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.parent</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.incubation.layers.tests</artifactId>
