Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into neon

plugins/org.polarsys.chess.m2m/transformations/CHESS_CeilingAssignment.qvto

@@ -11,7 +11,7 @@
 -- 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-v20.html                         --
+-- http://www.eclipse.org/legal/epl-v10.html                         --
 -----------------------------------------------------------------------
 */
 
@@ -231,7 +231,7 @@ query InstanceSpecification::isDeployedOnSameProcesor(is : InstanceSpecification
 
 query getDeploymentProcessor(p : InstanceSpecification) : InstanceSpecification {
 	var a := assigns -> selectOne(isAssignedFrom(p));
-	var asg := a.getMetaclass(AssignQN).oclAsType(MARTE::MARTE_Foundations::Alloc::Assign);
+	var asg := a.getMetaclass(AssignQN).oclAsType(MARTE::Alloc::Assign);
 	return 	asg.to![InstanceSpecification];
 }
 
@@ -279,7 +279,7 @@ query chessmlprofile::RTComponentModel::CHRtSpecification::isSporadic() : Boolea
 }
 
 query chessmlprofile::RTComponentModel::CHRtSpecification::isProtected() : Boolean { 
-	return (not self.isDeferred()) and self.protection = MARTE::MARTE_DesignModel::HLAM::CallConcurrencyKind::guarded;
+	return (not self.isDeferred()) and self.protection = MARTE::HLAM::CallConcurrencyKind::guarded;
 }
 
 query Port::getConnectedPort() : Port {
@@ -290,6 +290,6 @@ query Port::getConnectedPort() : Port {
 
 
 query Comment::isAssignedFrom(p : InstanceSpecification) : Boolean {
-    var asg := self.getMetaclass(AssignQN).oclAsType(MARTE::MARTE_Foundations::Alloc::Assign);
+    var asg := self.getMetaclass(AssignQN).oclAsType(MARTE::Alloc::Assign);
     return asg._from![InstanceSpecification] = p;
 }