Bug 475815 - Codegen plugins have a dependency on the old Papyrus UML-RT

profile

We change the dependencies on org.eclipse.papyrus.umlrt to
org.eclipse.papyrusrt.umlrt.

We also need to update the version of the tycho plugins to 0.23.0
because the codegen pom depends now on the profile pom which uses that
version.

We updated each pom's parent's version to 0.7.0.

Also updated the standalone generator.

Change-Id: I40b50d7e98811f00f5eb757485cd7a4a02b3c8dc
Signed-off-by: Ernesto Posse <eposse@gmail.com>

48 files changed, 119 insertions, 107 deletions

diff --git a/codegen/org.eclipse.papyrusrt.codegen-feature/feature.xml b/codegen/org.eclipse.papyrusrt.codegen-feature/feature.xml
index 53ce2c20c..10a167137 100644
--- a/codegen/org.eclipse.papyrusrt.codegen-feature/feature.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen-feature/feature.xml
@@ -84,7 +84,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <import plugin="org.eclipse.uml2.uml" version="4.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.uml2.uml" version="5.0.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.uml2.uml.resources" version="5.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.papyrus.umlrt" version="1.0.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.ocl" version="3.4.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.equinox.registry"/>
@@ -102,14 +101,14 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <import plugin="org.eclipse.papyrus.infra.emf"/>
       <import plugin="org.eclipse.papyrus.infra.widgets"/>
       <import plugin="org.eclipse.papyrus.uml.tools"/>
-      <import plugin="org.eclipse.papyrus.uml.properties"/>
       <import plugin="org.eclipse.papyrus.views.properties" version="1.0.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.lib" version="2.7.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase" version="2.7.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.uml2.types"/>
       <import plugin="org.eclipse.core.runtime" version="3.11.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.papyrus.extra.umlrt.feature" version="1.0.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.papyrusrt.umlrt.profile"/>
+      <import plugin="org.eclipse.papyrus.uml.properties"/>
    </requires>
 
    <plugin
diff --git a/codegen/org.eclipse.papyrusrt.codegen-feature/pom.xml b/codegen/org.eclipse.papyrusrt.codegen-feature/pom.xml
index abb5392ca..af32abc32 100644
--- a/codegen/org.eclipse.papyrusrt.codegen-feature/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen-feature/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.profile/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.cpp.profile/pom.xml
index 4d518ab02..f8678e0c4 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.profile/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.profile/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.rts/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.cpp.rts/pom.xml
index 6ba5e6aa4..529159ff5 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.rts/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.rts/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/META-INF/MANIFEST.MF
index 138338a42..c93f675a3 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Papyrus-RT State Machine C++ Generator
 Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.cpp.statemachines.flat;singleton:=true
 Bundle-Version: 0.7.0.qualifier
-Require-Bundle: org.eclipse.papyrus.umlrt;bundle-version="1.0.1",
- org.eclipse.papyrusrt.codegen,
+Require-Bundle: org.eclipse.papyrusrt.codegen,
  org.eclipse.papyrusrt.codegen.cpp.rts,
  org.eclipse.papyrusrt.codegen.cpp,
  org.eclipse.papyrusrt.codegen.lang.cpp,
@@ -14,6 +13,7 @@ Require-Bundle: org.eclipse.papyrus.umlrt;bundle-version="1.0.1",
  org.eclipse.papyrusrt.codegen.statemachines.flat,
  org.eclipse.papyrusrt.codegen.statemachines.flat.model,
  org.eclipse.papyrusrt.codegen.xtumlrt.trans,
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.xtend.lib;bundle-version="2.7.2",
  org.eclipse.xtext.xbase;bundle-version="2.7.2"
 Bundle-Vendor: Zeligsoft (2009) Limited
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/pom.xml
index 06bc17204..5d61be5de 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.statemachines.flat/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/META-INF/MANIFEST.MF
index b19c0df9e..4bccdc424 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.cpp.structure;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Zeligsoft (2009) Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.eclipse.papyrus.umlrt,
- org.eclipse.papyrusrt.codegen.lang.cpp,
+Require-Bundle: org.eclipse.papyrusrt.codegen.lang.cpp,
  org.eclipse.papyrusrt.codegen,
  org.eclipse.papyrusrt.codegen.cpp.rts,
  org.eclipse.papyrusrt.codegen.cpp,
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/pom.xml
index e68779f2b..cf2a1eac3 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.structure/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
index da3b4238d..d6a37184a 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Zeligsoft UML-RT C++ CodeGen Tests
 Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.cpp.test
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Zeligsoft (2009) Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit;bundle-version="4.11.0",
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp.test/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.cpp.test/pom.xml
index d931f68b6..34880f88e 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp.test/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp.test/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
   <artifactId>org.eclipse.papyrusrt.codegen.cpp.test</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.cpp/META-INF/MANIFEST.MF
index 907d5e1af..20d28a387 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.emf.common,
  org.eclipse.papyrus.codegen.base;bundle-version="1.0.2",
  org.eclipse.papyrus.cpp.profile,
- org.eclipse.papyrus.umlrt;bundle-version="1.0.1",
  org.eclipse.papyrusrt.codegen,
  org.eclipse.papyrusrt.codegen.cpp.rts,
  org.eclipse.papyrusrt.codegen.lang.cpp,
  org.eclipse.papyrusrt.codegen.utils,
  org.eclipse.papyrusrt.codegen.xtumlrt.trans,
+ org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.0",
  org.eclipse.papyrusrt.xtumlrt.common.model,
  org.eclipse.papyrusrt.xtumlrt.umlrt.model,
  org.eclipse.papyrusrt.xtumlrt.platform.cpp.model,
diff --git a/codegen/org.eclipse.papyrusrt.codegen.cpp/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.cpp/pom.xml
index 3f4572d31..c2edaca29 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.cpp/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.cpp/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/META-INF/MANIFEST.MF
index 7fbc3e0a0..faa9ef961 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Papyrus-RT C++ Language Model Tests
 Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.lang.cpp.test
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Zeligsoft (2009) Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.junit,
diff --git a/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/pom.xml
index 37fa0497b..30af07271 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.lang.cpp.test/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
   <artifactId>org.eclipse.papyrusrt.codegen.lang.cpp.test</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.lang.cpp/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.lang.cpp/pom.xml
index 5888c4e6f..7e524f1f5 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.lang.cpp/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.lang.cpp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.lang.test/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.lang.test/META-INF/MANIFEST.MF
index 72bcf037e..9b5cc099d 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.lang.test/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.lang.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Papyrus-RT Language Model Tests
 Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.lang.test
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Zeligsoft (2009) Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.papyrusrt.codegen.lang,
diff --git a/codegen/org.eclipse.papyrusrt.codegen.lang.test/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.lang.test/pom.xml
index 92c54246f..4a1c001c3 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.lang.test/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.lang.test/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
   <artifactId>org.eclipse.papyrusrt.codegen.lang.test</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.lang/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.lang/pom.xml
index 38981c1b9..6e0a66aad 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.lang/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.lang/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.papyrus/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.papyrus/META-INF/MANIFEST.MF
index 51a9dd939..7c252b085 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.papyrus/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.papyrus/META-INF/MANIFEST.MF
@@ -16,14 +16,13 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.widgets,
  org.eclipse.papyrus.uml.tools,
  org.eclipse.papyrus.uml.properties,
- org.eclipse.papyrus.umlrt,
  org.eclipse.papyrus.views.properties,
  org.eclipse.papyrusrt.codegen,
  org.eclipse.papyrusrt.codegen.cpp,
  org.eclipse.papyrusrt.codegen.utils,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.papyrusrt.codegen.xtumlrt.trans,
-  org.eclipse.core.resources,
+ org.eclipse.core.resources,
  org.eclipse.core.expressions,
  org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="1.1.0"
 Export-Package: org.eclipse.papyrusrt.codegen.papyrus
diff --git a/codegen/org.eclipse.papyrusrt.codegen.papyrus/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.papyrus/pom.xml
index 35f88f596..6ff41a077 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.papyrus/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.papyrus/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.standalone/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.standalone/META-INF/MANIFEST.MF
index d1b14679f..d12844964 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.standalone/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.standalone/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Vendor: Zeligsoft (2009) Limited
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.apache.commons.cli;bundle-version="1.2.0",
  org.eclipse.emf.ecore,
- org.eclipse.papyrus.umlrt,
  org.eclipse.emf.common,
  org.eclipse.equinox.registry,
  org.eclipse.papyrus.cpp.profile,
@@ -19,6 +18,7 @@ Require-Bundle: org.apache.commons.cli;bundle-version="1.2.0",
  org.eclipse.papyrusrt.codegen.utils,
  org.eclipse.papyrusrt.codegen.xtumlrt.trans,
  org.eclipse.papyrusrt.rts,
+ org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.0",
  org.eclipse.papyrusrt.xtumlrt.common.model,
  org.eclipse.uml2.uml;bundle-version="5.0.1",
  org.eclipse.uml2.uml.resources,
diff --git a/codegen/org.eclipse.papyrusrt.codegen.standalone/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.standalone/pom.xml
index fe0892252..426c3ab1b 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.standalone/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.standalone/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/RegisteredPackageMetadata.java b/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/RegisteredPackageMetadata.java
index 603eb7c51..251ff07ad 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/RegisteredPackageMetadata.java
+++ b/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/RegisteredPackageMetadata.java
@@ -27,7 +27,7 @@ public abstract class RegisteredPackageMetadata
     public abstract String getPackageSubdirectory();
     public abstract String getPackageModel();
 
-    private static final PluginFinder pluginFinder = new PluginFinder();
+    public static final PluginFinder pluginFinder = new PluginFinder();
 
     public void registerProfile( ResourceSet resourceSet )
     {
@@ -70,7 +70,7 @@ public abstract class RegisteredPackageMetadata
         for (String pkgId : pkgIds)
             pluginFinder.addRequiredPlugin( pkgId );
         pluginFinder.resolve();
-        //pluginFinder.printResolvedMappings();
+        pluginFinder.logResolvedMappings();
     }
 
     /**
diff --git a/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/StandaloneUMLRTCodeGenerator.java b/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/StandaloneUMLRTCodeGenerator.java
index 4025477ab..30f1a7759 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/StandaloneUMLRTCodeGenerator.java
+++ b/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/StandaloneUMLRTCodeGenerator.java
@@ -187,7 +187,7 @@ public class StandaloneUMLRTCodeGenerator
                     System.getProperty( PLUGINS_PATHS_PROPERTY )
                 )
             );
-        PluginFinder.addSearchPaths(getPluginsPaths());
+        if (pluginsPaths != null) PluginFinder.addSearchPaths( pluginsPaths );
         top =
             clargs.getOptionValue
             (
@@ -288,7 +288,7 @@ public class StandaloneUMLRTCodeGenerator
 
     private static void init()
     {
-        //printPaths();
+        logPaths();
         //updateClassPath();
         // Create the resource set
         resourceSet = new ResourceSetImpl();
@@ -410,23 +410,23 @@ public class StandaloneUMLRTCodeGenerator
         if (eobj instanceof Element)
         {
             Element el = (Element) eobj;
-            System.out.println(indent( depth ) + "* " + el );
+            CodeGenPlugin.info(indent( depth ) + "* " + el );
             EList<Stereotype> as = el.getAppliedStereotypes();
             if (as.size() > 0)
             {
-                System.out.println(indent( depth ) + "  - Applied stereotypes:");
+                CodeGenPlugin.info(indent( depth ) + "  - Applied stereotypes:");
                 for (Stereotype s: as)
                 {
-                    System.out.println(indent( depth ) + "      " + s);
+                    CodeGenPlugin.info(indent( depth ) + "      " + s);
                 }
             }
             EList<EObject> sas = el.getStereotypeApplications();
             if (sas.size() > 0)
             {
-                System.out.println(indent( depth ) + "  - Stereotype applications:");
+                CodeGenPlugin.info(indent( depth ) + "  - Stereotype applications:");
                 for (EObject sa : sas)
                 {
-                    System.out.println(indent( depth ) + "      " + sa);
+                    CodeGenPlugin.info(indent( depth ) + "      " + sa);
                 }
             }
             EList<Element> contents = el.getOwnedElements();
@@ -444,15 +444,14 @@ public class StandaloneUMLRTCodeGenerator
         return r;
     }
 
-    static void printPaths()
+    static void logPaths()
     {
         String mp = modelPath.toString();
         String op = outputPath.toString();
         String pp = pluginsPaths;
-        System.out.println("model path:   '" + mp + "'");
-        System.out.println("output path:  '" + op + "'");
-        System.out.println("plugins path: '" + pp + "'");
-        System.out.flush();
+        CodeGenPlugin.info( "model path:   '" + mp + "'");
+        CodeGenPlugin.info("output path:  '" + op + "'");
+        CodeGenPlugin.info("plugins path: '" + pp + "'");
     }
 
 }
diff --git a/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/UMLRTProfileMetadata.java b/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/UMLRTProfileMetadata.java
index 8d64fea5c..a88108942 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/UMLRTProfileMetadata.java
+++ b/codegen/org.eclipse.papyrusrt.codegen.standalone/src/org/eclipse/papyrusrt/codegen/standalone/UMLRTProfileMetadata.java
@@ -8,12 +8,12 @@
 package org.eclipse.papyrusrt.codegen.standalone;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.umlrt.UMLRealTime.UMLRealTimePackage;
+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.UMLRealTimePackage;
 
 public class UMLRTProfileMetadata extends RegisteredPackageMetadata
 {
     public static final UMLRTProfileMetadata INSTANCE = new UMLRTProfileMetadata();
-    private static final String UMLRT_PROFILE_ID        = "org.eclipse.papyrus.umlrt";
+    private static final String UMLRT_PROFILE_ID        = "org.eclipse.papyrusrt.umlrt.profile";
     private static final String UMLRT_NS_URI            = UMLRealTimePackage.eNS_URI; //"http://www.eclipse.org/papyrus/umlrt"
     private static final UMLRealTimePackage UMLRT_PKG   = UMLRealTimePackage.eINSTANCE;
     private static final String UMLRT_PATHMAP           = "pathmap://UML_RT_PROFILE/uml-rt.profile.uml";
diff --git a/codegen/org.eclipse.papyrusrt.codegen.standalone/umlrtgen.sh b/codegen/org.eclipse.papyrusrt.codegen.standalone/umlrtgen.sh
index 065230104..79b82e3a4 100755
--- a/codegen/org.eclipse.papyrusrt.codegen.standalone/umlrtgen.sh
+++ b/codegen/org.eclipse.papyrusrt.codegen.standalone/umlrtgen.sh
@@ -62,12 +62,23 @@ find_jar_for() {
     fi
 }
 
+# Use the list of base paths to find the full path to the given plugin dir.
+find_plugindir_for() {
+
+    # Look for a plugin dir in the reference plugins folder.  Allow for the
+    # _<version>, e.g., org.eclipse.papyrusrt.codegen.standalone_0.7.0.v201508261544
+    plugindir=`find $SRC_DIR $PLUGIN_DIR -name ${1}_\*`
+    if [ -n "$plugindir" -a -d $plugindir ]; then
+        update_classpath $plugindir
+    fi
+}
+
 # The XtUMLRT dependencies
+
 find_jar_for org.eclipse.papyrusrt.xtumlrt.common.model
 find_jar_for org.eclipse.papyrusrt.xtumlrt.platform.cpp.model
 find_jar_for org.eclipse.papyrusrt.xtumlrt.platform.model
 find_jar_for org.eclipse.papyrusrt.xtumlrt.umlrt.model
-find_jar_for org.eclipse.papyrusrt.xtumlrt.xtuml.model
 
 # The UML-RT plugins
 find_jar_for org.eclipse.papyrusrt.codegen
@@ -81,16 +92,15 @@ find_jar_for org.eclipse.papyrusrt.codegen.statemachines.flat
 find_jar_for org.eclipse.papyrusrt.codegen.statemachines.flat.model
 find_jar_for org.eclipse.papyrusrt.codegen.utils
 find_jar_for org.eclipse.papyrusrt.codegen.xtumlrt.trans
-find_jar_for org.eclipse.papyrusrt.papyrus
+find_jar_for org.eclipse.papyrusrt.codegen.papyrus
 find_jar_for org.eclipse.papyrusrt.releng
-find_jar_for org.eclipse.papyrusrt.standalone
+find_jar_for org.eclipse.papyrusrt.umlrt.profile
 find_jar_for org.eclipse.papyrusrt.rts
-
+find_plugindir_for org.eclipse.papyrusrt.codegen.standalone
 
 # The dependencies
 find_jar_for org.eclipse.uml2.uml
 find_jar_for org.eclipse.uml2.uml.resources
-find_jar_for org.eclipse.papyrus.umlrt
 find_jar_for org.eclipse.emf.ecore
 find_jar_for org.eclipse.emf.common
 find_jar_for org.eclipse.ocl
@@ -109,6 +119,7 @@ find_jar_for com.google.guava
 find_jar_for org.apache.commons.cli
 
 update_classpath ./bin
+update_classpath $PLUGIN_DIR
 
-echo $JAVA_VM -cp $cp org.eclipse.papyrusrt.codegen.standalone.StandaloneUMLRTCodeGenerator $@
-$JAVA_VM -cp $cp org.eclipse.papyrusrt.codegen.standalone.StandaloneUMLRTCodeGenerator $@
+echo $JAVA_VM -cp $cp org.eclipse.papyrusrt.codegen.standalone.StandaloneUMLRTCodeGenerator -p $PLUGIN_DIR $@
+$JAVA_VM -cp $cp org.eclipse.papyrusrt.codegen.standalone.StandaloneUMLRTCodeGenerator -p $PLUGIN_DIR $@
diff --git a/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat.model/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat.model/pom.xml
index 3e6f20e73..587a6b174 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat.model/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat.model/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/META-INF/MANIFEST.MF
index e40be18e1..557e70e33 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: Papyrus-RT State Machine Generator
 Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.statemachines.flat;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Export-Package: org.eclipse.papyrusrt.codegen.statemachines.transformations
-Require-Bundle: org.eclipse.papyrus.umlrt;bundle-version="1.0.1",
- org.eclipse.papyrusrt.codegen,
+Require-Bundle: org.eclipse.papyrusrt.codegen,
  org.eclipse.papyrusrt.codegen.cpp.rts,
  org.eclipse.papyrusrt.codegen.cpp,
  org.eclipse.papyrusrt.codegen.lang.cpp,
@@ -14,6 +13,7 @@ Require-Bundle: org.eclipse.papyrus.umlrt;bundle-version="1.0.1",
  org.eclipse.papyrusrt.xtumlrt.umlrt.model,
  org.eclipse.papyrusrt.codegen.statemachines.flat.model,
  org.eclipse.papyrusrt.codegen.xtumlrt.trans,
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.xtend.lib;bundle-version="2.7.2",
  org.eclipse.xtext.xbase;bundle-version="2.7.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/pom.xml
index ee1f8eed5..0227c0f1f 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.statemachines.flat/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.utils/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.utils/META-INF/MANIFEST.MF
index 1cf2afd38..dac958cb2 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.utils/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.utils/META-INF/MANIFEST.MF
@@ -4,14 +4,16 @@ Bundle-Name: Papyrus-RT Utilities
 Bundle-SymbolicName: org.eclipse.papyrusrt.codegen.utils
 Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Zeligsoft (2009) Limited
-Require-Bundle: org.eclipse.papyrus.umlrt,
- org.eclipse.uml2.uml,
- org.eclipse.xtend.lib;bundle-version="2.7.2",
+Require-Bundle: org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources;bundle-version="5.0.0",
+ org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.0",
  org.eclipse.papyrusrt.xtumlrt.common.model,
  org.eclipse.papyrusrt.xtumlrt.platform.model,
  org.eclipse.papyrusrt.xtumlrt.platform.cpp.model,
- org.eclipse.papyrusrt.xtumlrt.umlrt.model
+ org.eclipse.papyrusrt.xtumlrt.umlrt.model,
+ org.eclipse.xtend.lib;bundle-version="2.7.2",
+ org.eclipse.equinox.registry
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.papyrusrt.codegen.utils
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: org.eclipse.papyrusrt.codegen
diff --git a/codegen/org.eclipse.papyrusrt.codegen.utils/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.utils/pom.xml
index 35d7d1168..27678cfbd 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.utils/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.utils/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/PluginFinder.java b/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/PluginFinder.java
index c8339e640..7b3b9f742 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/PluginFinder.java
+++ b/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/PluginFinder.java
@@ -25,6 +25,7 @@ import java.util.jar.Manifest;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.eclipse.papyrusrt.codegen.CodeGenPlugin;
 import org.w3c.dom.Document;
 
 /**
@@ -395,15 +396,14 @@ public class PluginFinder
         return containsProject || dotProject != null;
     }
 
-    public void printResolvedMappings()
+    public void logResolvedMappings()
     {
-        System.out.println("resolved mapping start");
+        CodeGenPlugin.info("resolved mapping start");
         for (Map.Entry<PluginData, String> entry : resolvedMappings.entrySet())
         {
-            System.out.println(entry.getKey() + " |-> " + entry.getValue());
+            CodeGenPlugin.info(entry.getKey() + " |-> " + entry.getValue());
         }
-        System.out.println("resolved mapping end");
-        System.out.flush();
+        CodeGenPlugin.info("resolved mapping end");
     }
 
     static String indent( int n )
diff --git a/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeProfileUtil.java b/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeProfileUtil.java
index dc6ab7813..8fd0d886a 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeProfileUtil.java
+++ b/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeProfileUtil.java
@@ -11,14 +11,14 @@ import java.util.ArrayList;
 import java.util.List;

 import java.util.TreeSet;

 

-import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule;

-import org.eclipse.papyrus.umlrt.UMLRealTime.CapsulePart;

-import org.eclipse.papyrus.umlrt.UMLRealTime.Protocol;

-import org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer;

-import org.eclipse.papyrus.umlrt.UMLRealTime.RTConnector;

-import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageSet;

-import org.eclipse.papyrus.umlrt.UMLRealTime.RTPort;

-import org.eclipse.papyrus.umlrt.UMLRealTime.RTRedefinedElement;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.Capsule;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.CapsulePart;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.Protocol;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.ProtocolContainer;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTConnector;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTMessageSet;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTPort;

+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTRedefinedElement;

 //import org.eclipse.papyrus.umlrt.UMLRealTime.RTRExcludedElement;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Collaboration;

diff --git a/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeStateMachProfileUtil.xtend b/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeStateMachProfileUtil.xtend
index 7b5d54e6d..d47f9dff9 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeStateMachProfileUtil.xtend
+++ b/codegen/org.eclipse.papyrusrt.codegen.utils/src/org/eclipse/papyrusrt/codegen/utils/UMLRealTimeStateMachProfileUtil.xtend
@@ -7,7 +7,7 @@
  *******************************************************************************/
 package org.eclipse.papyrusrt.codegen.utils
 
-import org.eclipse.papyrus.umlrt.statemachine.UMLRealTimeStateMach.RTTrigger
+import org.eclipse.papyrusrt.umlrt.profile.statemachine.UMLRealTimeStateMach.RTTrigger
 import org.eclipse.uml2.uml.Element
 import org.eclipse.uml2.uml.Pseudostate
 import org.eclipse.uml2.uml.State
diff --git a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/META-INF/MANIFEST.MF b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/META-INF/MANIFEST.MF
index c3e8909b7..eef42e571 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/META-INF/MANIFEST.MF
+++ b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: Zeligsoft (2009) Limited
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
  org.eclipse.papyrus.cpp.profile,
- org.eclipse.papyrus.umlrt;bundle-version="1.0.1",
  org.eclipse.papyrusrt.codegen,
  org.eclipse.papyrusrt.codegen.cpp.rts,
- org.eclipse.papyrusrt.codegen.utils,
  org.eclipse.papyrusrt.codegen.statemachines.flat.model,
+ org.eclipse.papyrusrt.codegen.utils,
+ org.eclipse.papyrusrt.umlrt.profile;bundle-version="0.7.0",
  org.eclipse.papyrusrt.xtumlrt.common.model,
  org.eclipse.papyrusrt.xtumlrt.umlrt.model,
  org.eclipse.papyrusrt.xtumlrt.platform.cpp.model,
diff --git a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/pom.xml b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/pom.xml
index a1b148e55..0f79c941e 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend
index 9074ed773..7f8c8f8c8 100644
--- a/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend
+++ b/codegen/org.eclipse.papyrusrt.codegen.xtumlrt.trans/src/org/eclipse/papyrusrt/codegen/xtumlrt/trans/UML2xtumlrtModelTranslator.xtend
@@ -13,7 +13,7 @@ import java.nio.file.Path
 
 import org.eclipse.emf.ecore.EObject
 
-import org.eclipse.papyrus.umlrt.UMLRealTime.RTMessageKind
+import org.eclipse.papyrusrt.umlrt.profile.UMLRealTime.RTMessageKind
 import org.eclipse.papyrusrt.codegen.utils.UML2CppUtil
 import org.eclipse.papyrusrt.xtumlrt.common.Attribute
 import org.eclipse.papyrusrt.xtumlrt.common.Capsule
@@ -43,7 +43,6 @@ import org.eclipse.papyrusrt.xtumlrt.common.Signal
 import org.eclipse.papyrusrt.xtumlrt.common.StateMachine
 import org.eclipse.papyrusrt.xtumlrt.common.StructuredType
 import org.eclipse.papyrusrt.xtumlrt.common.Type
-import org.eclipse.papyrusrt.xtumlrt.common.TypeDefinition
 import org.eclipse.papyrusrt.xtumlrt.common.VisibilityKind
 import org.eclipse.papyrusrt.xtumlrt.umlrt.PortRegistration
 import org.eclipse.papyrusrt.xtumlrt.umlrt.RTPassiveClass
@@ -52,7 +51,6 @@ import org.eclipse.papyrusrt.xtumlrt.umlrt.UmlrtFactory
 import static extension org.eclipse.papyrusrt.codegen.utils.UMLRealTimeProfileUtil.*
 import static extension org.eclipse.papyrusrt.codegen.utils.XTUMLRTUtil.*
 import static extension org.eclipse.papyrusrt.codegen.utils.GeneralUtil.*
-import org.eclipse.papyrusrt.codegen.cpp.rts.UMLRTRuntime
 import org.eclipse.papyrusrt.codegen.utils.XTUMLRTUtil
 import org.eclipse.uml2.uml.DataType
 import org.eclipse.uml2.uml.ParameterDirectionKind
diff --git a/codegen/org.eclipse.papyrusrt.codegen/pom.xml b/codegen/org.eclipse.papyrusrt.codegen/pom.xml
index 136f816d3..a24c8373f 100644
--- a/codegen/org.eclipse.papyrusrt.codegen/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.codegen/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.protocoleditor/pom.xml b/codegen/org.eclipse.papyrusrt.protocoleditor/pom.xml
index d7fcbdef2..be721d307 100644
--- a/codegen/org.eclipse.papyrusrt.protocoleditor/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.protocoleditor/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
   <artifactId>org.eclipse.papyrusrt.protocoleditor</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/codegen/org.eclipse.papyrusrt.releng/category.xml b/codegen/org.eclipse.papyrusrt.releng/category.xml
index 713931bc5..af1897387 100644
--- a/codegen/org.eclipse.papyrusrt.releng/category.xml
+++ b/codegen/org.eclipse.papyrusrt.releng/category.xml
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.papyrusrt.codegen-feature_0.7.0.qualifier.jar" id="org.eclipse.papyrusrt.codegen-feature" version="0.7.0.qualifier">
-      <category name="org.eclipse.papyrusrt.main"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrusrt.rts-feature_0.7.0.qualifier.jar" id="org.eclipse.papyrusrt.rts-feature" version="0.7.0.qualifier">
-      <category name="org.eclipse.papyrusrt.main"/>
-   </feature>
-   <category-def name="org.eclipse.papyrusrt.main" label="PapyrusRT">
-      <description>
-         The PapyrusRT code generator, runtime system and protocol editor.
-      </description>
-   </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>

+<site>

+   <feature url="features/org.eclipse.papyrusrt.codegen-feature_0.7.0.qualifier.jar" id="org.eclipse.papyrusrt.codegen-feature" version="0.7.0.qualifier">

+      <category name="org.eclipse.papyrusrt.main"/>

+   </feature>

+   <feature url="features/org.eclipse.papyrusrt.rts-feature_0.7.0.qualifier.jar" id="org.eclipse.papyrusrt.rts-feature" version="0.7.0.qualifier">

+      <category name="org.eclipse.papyrusrt.main"/>

+   </feature>

+   <feature url="features/org.eclipse.papyrusrt.umlrt.profile.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrusrt.umlrt.profile.feature" version="0.7.0.qualifier">

+      <category name="org.eclipse.papyrusrt.main"/>

+   </feature>

+   <category-def name="org.eclipse.papyrusrt.main" label="PapyrusRT">

+      <description>

+         The PapyrusRT code generator, runtime system and protocol editor.

+      </description>

+   </category-def>

+</site>

diff --git a/codegen/org.eclipse.papyrusrt.releng/pom.xml b/codegen/org.eclipse.papyrusrt.releng/pom.xml
index d1872612a..563d87695 100644
--- a/codegen/org.eclipse.papyrusrt.releng/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.releng/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.papyrusrt</groupId>
         <artifactId>umlrt.code-generator</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
+        <version>0.7.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.rts-feature/pom.xml b/codegen/org.eclipse.papyrusrt.rts-feature/pom.xml
index 270035a25..f927b09f4 100644
--- a/codegen/org.eclipse.papyrusrt.rts-feature/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.rts-feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.papyrusrt</groupId>
     <artifactId>umlrt.code-generator</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.rts/pom.xml b/codegen/org.eclipse.papyrusrt.rts/pom.xml
index 3a9d8922c..b8134bedc 100644
--- a/codegen/org.eclipse.papyrusrt.rts/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.rts/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.papyrusrt</groupId>
diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml
index db2cb6d5c..67e26fc39 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.common.model/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.platform.cpp.model/pom.xml b/codegen/org.eclipse.papyrusrt.xtumlrt.platform.cpp.model/pom.xml
index fbcc3bf7e..7e0e7721f 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.platform.cpp.model/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.platform.cpp.model/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.platform.model/pom.xml b/codegen/org.eclipse.papyrusrt.xtumlrt.platform.model/pom.xml
index 736566c2a..0259bb9dc 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.platform.model/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.platform.model/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/codegen/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml b/codegen/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml
index bd42b6709..2559c9438 100644
--- a/codegen/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml
+++ b/codegen/org.eclipse.papyrusrt.xtumlrt.umlrt.model/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrusrt</groupId>
 		<artifactId>umlrt.code-generator</artifactId>
-		<version>0.5.0-SNAPSHOT</version>
+		<version>0.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 14b375198..d5d2fc78d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,11 +34,13 @@
 		<module>codegen/org.eclipse.papyrusrt.xtumlrt.platform.model</module>
 		<module>codegen/org.eclipse.papyrusrt.xtumlrt.platform.cpp.model</module>
 		<module>codegen/org.eclipse.papyrusrt.xtumlrt.umlrt.model</module>
+		<module>features/profile/org.eclipse.papyrusrt.umlrt.profile.feature</module>
+		<module>plugins/umlrt/profile/org.eclipse.papyrusrt.umlrt.profile</module>
 	</modules>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho.version>0.21.0</tycho.version>
+		<tycho.version>0.23.0</tycho.version>
 		<mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>
 		<orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20150428165605/repository/</orbit-repo.url>
 		<papyrus-repo.url>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars</papyrus-repo.url>