Skip to content

Commit

Permalink
[releng] Allow Migration from 6 to 7
Browse files Browse the repository at this point in the history 
Fix class that wasn't bumped correctly to 7.0.0

Change-Id: If64d79e61885ca890cf3006eef0e9fdcc1edd5f6
Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>
  • Loading branch information
@etraisnel2 @pdulth
etraisnel2 authored and pdulth committed Jul 17, 2023
1 parent b4ba425 commit 1e3c3eb
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 56 deletions.
76 changes: 51 additions & 25 deletions ....core.data.migration/src/org/polarsys/capella/core/data/migration/MigrationConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,57 @@ public class MigrationConstants {
public static final String LIBRARIES_PREFIX = SHARED_PREFIX + "libraries";
public static final String RE_PREFIX = SHARED_PREFIX + "re";

public static final String CAPELLA_COMMON_OLD_NSURI = "http://www.polarsys.org/capella/core/common/5.0.0";
public static final String CAPELLA_CORE_OLD_NSURI = "http://www.polarsys.org/capella/core/core/5.0.0";
public static final String COMPOSITE_STRUCTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/cs/5.0.0";
public static final String CONTEXT_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/ctx/5.0.0";
public static final String EPBS_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/epbs/5.0.0";
public static final String FUNCTIONAL_ANALYSIS_OLD_NSURI = "http://www.polarsys.org/capella/core/fa/5.0.0";
public static final String INFORMATION_OLD_NSURI = "http://www.polarsys.org/capella/core/information/5.0.0";
public static final String INFORMATION_COMMUNICATION_OLD_NSURI = "http://www.polarsys.org/capella/core/information/communication/5.0.0";
public static final String INFORMATION_DATATYPE_OLD_NSURI = "http://www.polarsys.org/capella/core/information/datatype/5.0.0";
public static final String INFORMATION_DATAVALUE_OLD_NSURI = "http://www.polarsys.org/capella/core/information/datavalue/5.0.0";
public static final String INTERACTION_OLD_NSURI = "http://www.polarsys.org/capella/core/interaction/5.0.0";
public static final String LOGICAL_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/la/5.0.0";
public static final String CAPELLA_MODELLER_OLD_NSURI = "http://www.polarsys.org/capella/core/modeller/5.0.0";
public static final String OPERATIONAL_ANALYSIS_OLD_NSURI = "http://www.polarsys.org/capella/core/oa/5.0.0";
public static final String PHYSICAL_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/pa/5.0.0";
public static final String PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_NSURI = "http://www.polarsys.org/capella/core/pa/deployment/5.0.0";
public static final String REQUIREMENT_OLD_NSURI = "http://www.polarsys.org/capella/core/requirement/5.0.0";
public static final String SHARED_MODEL_OLD_NSURI = "http://www.polarsys.org/capella/core/sharedmodel/5.0.0";

public static final String ACTIVITY_OLD_NSURI = "http://www.polarsys.org/capella/common/activity/5.0.0";
public static final String BEHAVIOR_OLD_NSURI = "http://www.polarsys.org/capella/common/behavior/5.0.0";
public static final String MODELLING_CORE_OLD_NSURI = "http://www.polarsys.org/capella/common/core/5.0.0";

public static final String LIBRARIES_OLD_NSURI = "http://www.polarsys.org/capella/common/libraries/5.0.0";
public static final String RE_OLD_NSURI = "http://www.polarsys.org/capella/common/re/5.0.0";
public static final String CAPELLA_COMMON_OLD_6_NSURI = "http://www.polarsys.org/capella/core/common/6.0.0";
public static final String CAPELLA_CORE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/core/6.0.0";
public static final String COMPOSITE_STRUCTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/cs/6.0.0";
public static final String CONTEXT_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/ctx/6.0.0";
public static final String EPBS_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/epbs/6.0.0";
public static final String FUNCTIONAL_ANALYSIS_OLD_6_NSURI = "http://www.polarsys.org/capella/core/fa/6.0.0";
public static final String INFORMATION_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/6.0.0";
public static final String INFORMATION_COMMUNICATION_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/communication/6.0.0";
public static final String INFORMATION_DATATYPE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/datatype/6.0.0";
public static final String INFORMATION_DATAVALUE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/datavalue/6.0.0";
public static final String INTERACTION_OLD_6_NSURI = "http://www.polarsys.org/capella/core/interaction/6.0.0";
public static final String LOGICAL_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/la/6.0.0";
public static final String CAPELLA_MODELLER_OLD_6_NSURI = "http://www.polarsys.org/capella/core/modeller/6.0.0";
public static final String OPERATIONAL_ANALYSIS_OLD_6_NSURI = "http://www.polarsys.org/capella/core/oa/6.0.0";
public static final String PHYSICAL_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/pa/6.0.0";
public static final String PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_6_NSURI = "http://www.polarsys.org/capella/core/pa/deployment/6.0.0";
public static final String REQUIREMENT_OLD_6_NSURI = "http://www.polarsys.org/capella/core/requirement/6.0.0";
public static final String SHARED_MODEL_OLD_6_NSURI = "http://www.polarsys.org/capella/core/sharedmodel/6.0.0";

public static final String ACTIVITY_OLD_6_NSURI = "http://www.polarsys.org/capella/common/activity/6.0.0";
public static final String BEHAVIOR_OLD_6_NSURI = "http://www.polarsys.org/capella/common/behavior/6.0.0";
public static final String MODELLING_CORE_OLD_6_NSURI = "http://www.polarsys.org/capella/common/core/6.0.0";

public static final String LIBRARIES_OLD_6_NSURI = "http://www.polarsys.org/capella/common/libraries/6.0.0";
public static final String RE_OLD_6_NSURI = "http://www.polarsys.org/capella/common/re/6.0.0";

public static final String CAPELLA_COMMON_OLD_5_NSURI = "http://www.polarsys.org/capella/core/common/5.0.0";
public static final String CAPELLA_CORE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/core/5.0.0";
public static final String COMPOSITE_STRUCTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/cs/5.0.0";
public static final String CONTEXT_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/ctx/5.0.0";
public static final String EPBS_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/epbs/5.0.0";
public static final String FUNCTIONAL_ANALYSIS_OLD_5_NSURI = "http://www.polarsys.org/capella/core/fa/5.0.0";
public static final String INFORMATION_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/5.0.0";
public static final String INFORMATION_COMMUNICATION_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/communication/5.0.0";
public static final String INFORMATION_DATATYPE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/datatype/5.0.0";
public static final String INFORMATION_DATAVALUE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/datavalue/5.0.0";
public static final String INTERACTION_OLD_5_NSURI = "http://www.polarsys.org/capella/core/interaction/5.0.0";
public static final String LOGICAL_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/la/5.0.0";
public static final String CAPELLA_MODELLER_OLD_5_NSURI = "http://www.polarsys.org/capella/core/modeller/5.0.0";
public static final String OPERATIONAL_ANALYSIS_OLD_5_NSURI = "http://www.polarsys.org/capella/core/oa/5.0.0";
public static final String PHYSICAL_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/pa/5.0.0";
public static final String PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_5_NSURI = "http://www.polarsys.org/capella/core/pa/deployment/5.0.0";
public static final String REQUIREMENT_OLD_5_NSURI = "http://www.polarsys.org/capella/core/requirement/5.0.0";
public static final String SHARED_MODEL_OLD_5_NSURI = "http://www.polarsys.org/capella/core/sharedmodel/5.0.0";

public static final String ACTIVITY_OLD_5_NSURI = "http://www.polarsys.org/capella/common/activity/5.0.0";
public static final String BEHAVIOR_OLD_5_NSURI = "http://www.polarsys.org/capella/common/behavior/5.0.0";
public static final String MODELLING_CORE_OLD_5_NSURI = "http://www.polarsys.org/capella/common/core/5.0.0";

public static final String LIBRARIES_OLD_5_NSURI = "http://www.polarsys.org/capella/common/libraries/5.0.0";
public static final String RE_OLD_5_NSURI = "http://www.polarsys.org/capella/common/re/5.0.0";

public static final String CAPELLA_COMMON_OLD_1_4_NSURI = "http://www.polarsys.org/capella/core/common/1.4.0";
public static final String CAPELLA_CORE_OLD_1_4_NSURI = "http://www.polarsys.org/capella/core/core/1.4.0";
Expand Down
72 changes: 48 additions & 24 deletions ...on/src/org/polarsys/capella/core/data/migration/capella/CapellaMigrationContribution.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,30 +87,54 @@ public class CapellaMigrationContribution extends AbstractMigrationContribution
public static HashMap<String, EPackage> pkgs = new HashMap<String, EPackage>();

static {
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_NSURI, CsPackage.eINSTANCE);
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_NSURI, CtxPackage.eINSTANCE);
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_NSURI, EpbsPackage.eINSTANCE);
pkgs.put(MigrationConstants.FUNCTIONAL_ANALYSIS_OLD_NSURI, FaPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_OLD_NSURI, InformationPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_COMMUNICATION_OLD_NSURI, CommunicationPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_DATATYPE_OLD_NSURI, DatatypePackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_DATAVALUE_OLD_NSURI, DatavaluePackage.eINSTANCE);
pkgs.put(MigrationConstants.INTERACTION_OLD_NSURI, InteractionPackage.eINSTANCE);
pkgs.put(MigrationConstants.LOGICAL_ARCHITECTURE_OLD_NSURI, LaPackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_COMMON_OLD_NSURI, CapellacommonPackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_CORE_OLD_NSURI, CapellacorePackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_MODELLER_OLD_NSURI, CapellamodellerPackage.eINSTANCE);
pkgs.put(MigrationConstants.OPERATIONAL_ANALYSIS_OLD_NSURI, OaPackage.eINSTANCE);
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_OLD_NSURI, PaPackage.eINSTANCE);
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_NSURI, DeploymentPackage.eINSTANCE);
pkgs.put(MigrationConstants.REQUIREMENT_OLD_NSURI, RequirementPackage.eINSTANCE);
pkgs.put(MigrationConstants.SHARED_MODEL_OLD_NSURI, SharedmodelPackage.eINSTANCE);
pkgs.put(MigrationConstants.ACTIVITY_OLD_NSURI, ActivityPackage.eINSTANCE);
pkgs.put(MigrationConstants.BEHAVIOR_OLD_NSURI, BehaviorPackage.eINSTANCE);
pkgs.put(MigrationConstants.MODELLING_CORE_OLD_NSURI, ModellingcorePackage.eINSTANCE);
pkgs.put(MigrationConstants.LIBRARIES_OLD_NSURI, LibrariesPackage.eINSTANCE);
pkgs.put(MigrationConstants.RE_OLD_NSURI, RePackage.eINSTANCE);
// Add 1.4.0 NSURI as we allow migration also from 1.4.x to 6.x
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_6_NSURI, CsPackage.eINSTANCE);
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_6_NSURI, CtxPackage.eINSTANCE);
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_6_NSURI, EpbsPackage.eINSTANCE);
pkgs.put(MigrationConstants.FUNCTIONAL_ANALYSIS_OLD_6_NSURI, FaPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_OLD_6_NSURI, InformationPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_COMMUNICATION_OLD_6_NSURI, CommunicationPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_DATATYPE_OLD_6_NSURI, DatatypePackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_DATAVALUE_OLD_6_NSURI, DatavaluePackage.eINSTANCE);
pkgs.put(MigrationConstants.INTERACTION_OLD_6_NSURI, InteractionPackage.eINSTANCE);
pkgs.put(MigrationConstants.LOGICAL_ARCHITECTURE_OLD_6_NSURI, LaPackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_COMMON_OLD_6_NSURI, CapellacommonPackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_CORE_OLD_6_NSURI, CapellacorePackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_MODELLER_OLD_6_NSURI, CapellamodellerPackage.eINSTANCE);
pkgs.put(MigrationConstants.OPERATIONAL_ANALYSIS_OLD_6_NSURI, OaPackage.eINSTANCE);
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_OLD_6_NSURI, PaPackage.eINSTANCE);
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_6_NSURI, DeploymentPackage.eINSTANCE);
pkgs.put(MigrationConstants.REQUIREMENT_OLD_6_NSURI, RequirementPackage.eINSTANCE);
pkgs.put(MigrationConstants.SHARED_MODEL_OLD_6_NSURI, SharedmodelPackage.eINSTANCE);
pkgs.put(MigrationConstants.ACTIVITY_OLD_6_NSURI, ActivityPackage.eINSTANCE);
pkgs.put(MigrationConstants.BEHAVIOR_OLD_6_NSURI, BehaviorPackage.eINSTANCE);
pkgs.put(MigrationConstants.MODELLING_CORE_OLD_6_NSURI, ModellingcorePackage.eINSTANCE);
pkgs.put(MigrationConstants.LIBRARIES_OLD_6_NSURI, LibrariesPackage.eINSTANCE);
pkgs.put(MigrationConstants.RE_OLD_6_NSURI, RePackage.eINSTANCE);
// Add 5.0.0 NSURI as we allow migration also from 5.x to 7.x
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_5_NSURI, CsPackage.eINSTANCE);
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_5_NSURI, CtxPackage.eINSTANCE);
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_5_NSURI, EpbsPackage.eINSTANCE);
pkgs.put(MigrationConstants.FUNCTIONAL_ANALYSIS_OLD_5_NSURI, FaPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_OLD_5_NSURI, InformationPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_COMMUNICATION_OLD_5_NSURI, CommunicationPackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_DATATYPE_OLD_5_NSURI, DatatypePackage.eINSTANCE);
pkgs.put(MigrationConstants.INFORMATION_DATAVALUE_OLD_5_NSURI, DatavaluePackage.eINSTANCE);
pkgs.put(MigrationConstants.INTERACTION_OLD_5_NSURI, InteractionPackage.eINSTANCE);
pkgs.put(MigrationConstants.LOGICAL_ARCHITECTURE_OLD_5_NSURI, LaPackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_COMMON_OLD_5_NSURI, CapellacommonPackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_CORE_OLD_5_NSURI, CapellacorePackage.eINSTANCE);
pkgs.put(MigrationConstants.CAPELLA_MODELLER_OLD_5_NSURI, CapellamodellerPackage.eINSTANCE);
pkgs.put(MigrationConstants.OPERATIONAL_ANALYSIS_OLD_5_NSURI, OaPackage.eINSTANCE);
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_OLD_5_NSURI, PaPackage.eINSTANCE);
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_5_NSURI, DeploymentPackage.eINSTANCE);
pkgs.put(MigrationConstants.REQUIREMENT_OLD_5_NSURI, RequirementPackage.eINSTANCE);
pkgs.put(MigrationConstants.SHARED_MODEL_OLD_5_NSURI, SharedmodelPackage.eINSTANCE);
pkgs.put(MigrationConstants.ACTIVITY_OLD_5_NSURI, ActivityPackage.eINSTANCE);
pkgs.put(MigrationConstants.BEHAVIOR_OLD_5_NSURI, BehaviorPackage.eINSTANCE);
pkgs.put(MigrationConstants.MODELLING_CORE_OLD_5_NSURI, ModellingcorePackage.eINSTANCE);
pkgs.put(MigrationConstants.LIBRARIES_OLD_5_NSURI, LibrariesPackage.eINSTANCE);
pkgs.put(MigrationConstants.RE_OLD_5_NSURI, RePackage.eINSTANCE);
// Add 1.4.0 NSURI as we allow migration also from 1.4.x to 7.x
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_1_4_NSURI, CsPackage.eINSTANCE);
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_1_4_NSURI, CtxPackage.eINSTANCE);
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_1_4_NSURI, EpbsPackage.eINSTANCE);
Expand Down

0 comments on commit 1e3c3eb

Please sign in to comment.