bug 579069 - Make papyrus Req compatible with SysML1.6

Change-Id: I7cf680c5f0a0504d0291f80b252127d84c622195
Signed-off-by: Patrick <Patrick.Tessier@cea.fr>
diff --git a/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml b/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml
index 5bad134..921b3d3 100644
--- a/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml
+++ b/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml
@@ -32,7 +32,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.papyrus.requirements.sysml14.traceability.assistant"
+         id="org.eclipse.papyrus.requirements.sysml.traceability.assistant"
          download-size="0"
          install-size="0"
          version="0"
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.classpath b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.classpath
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.classpath
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.classpath
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.project b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.project
similarity index 88%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.project
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.project
index 3ace4e7..1f9c39d 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.project
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.requirements.sysml14.traceability.assistant</name>
+	<name>org.eclipse.papyrus.requirements.sysml.traceability.assistant</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.settings/org.eclipse.jdt.core.prefs
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/META-INF/MANIFEST.MF b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/META-INF/MANIFEST.MF
similarity index 88%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/META-INF/MANIFEST.MF
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/META-INF/MANIFEST.MF
index ee32a4f..dd27e77 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/META-INF/MANIFEST.MF
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.papyrus.requirements.sysml14.traceability.assistant;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.requirements.sysml.traceability.assistant;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.requirements.sysml14.traceability.assistant.Activator
 Bundle-Vendor: %Bundle-Vendor
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/about.html b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/about.html
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/about.html
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/about.html
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/build.properties b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/build.properties
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/build.properties
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/build.properties
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/plugin.properties b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/plugin.properties
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/plugin.properties
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/plugin.properties
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/pom.xml b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/pom.xml
similarity index 92%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/pom.xml
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/pom.xml
index fe4edb7..fddc3cf 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/pom.xml
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/pom.xml
@@ -28,7 +28,7 @@
 	</parent>
 	
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.requirements.sysml14.traceability.assistant</artifactId>
+	<artifactId>org.eclipse.papyrus.requirements.sysml.traceability.assistant</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<version>0.7.0-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/Activator.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/Activator.java
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/Activator.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/Activator.java
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/AbstractionRule.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/AbstractionRule.java
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/AbstractionRule.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/AbstractionRule.java
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/DeriveReqRule.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/DeriveReqRule.java
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/DeriveReqRule.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/DeriveReqRule.java
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/ITracabilityRule.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/ITracabilityRule.java
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/ITracabilityRule.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/ITracabilityRule.java
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/SatisfyRule.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/SatisfyRule.java
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/SatisfyRule.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/SatisfyRule.java
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/TracabilityAnalyzer.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/TracabilityAnalyzer.java
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/TracabilityAnalyzer.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.traceability.assistant/src/org/eclipse/papyrus/requirements/sysml14/traceability/assistant/analysis/TracabilityAnalyzer.java
diff --git a/plugins/sysml14/controler/pom.xml b/plugins/sysml14/controler/pom.xml
index 351020d..cd7bad4 100644
--- a/plugins/sysml14/controler/pom.xml
+++ b/plugins/sysml14/controler/pom.xml
@@ -37,7 +37,7 @@
 	<modules>
 		 <module>org.eclipse.papyrus.requirements.sysml14.common</module>
          <module>org.eclipse.papyrus.requirements.sysml14.assistant.commands</module>
-         <module>org.eclipse.papyrus.requirements.sysml14.traceability.assistant</module>
+         <module>org.eclipse.papyrus.requirements.sysml.traceability.assistant</module>
          <module>org.eclipse.papyrus.requirements.sysml14.traceability.commands</module>
          <module>org.eclipse.papyrus.requirements.sysml.verification</module>
          <module>org.eclipse.papyrus.requirements.sysml14.preferences</module>
diff --git a/plugins/sysml14/gui/org.eclipse.papyrus.requirements.sysml.traceability.handlers/META-INF/MANIFEST.MF b/plugins/sysml14/gui/org.eclipse.papyrus.requirements.sysml.traceability.handlers/META-INF/MANIFEST.MF
index 32e688e..e5b80af 100644
--- a/plugins/sysml14/gui/org.eclipse.papyrus.requirements.sysml.traceability.handlers/META-INF/MANIFEST.MF
+++ b/plugins/sysml14/gui/org.eclipse.papyrus.requirements.sysml.traceability.handlers/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
  org.eclipse.papyrus.uml.tools;bundle-version="1.2.0";resolution:=optional,
- org.eclipse.papyrus.requirements.sysml14.traceability.assistant,
+ org.eclipse.papyrus.requirements.sysml.traceability.assistant,
  org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
  org.eclipse.papyrus.requirements.sysml14.common,
  org.eclipse.papyrus.requirements.sysml14.traceability.commands