Skip to content

Commit 1e3c3eb

Browse files
etraisnel2pdulth
etraisnel2
authored and
pdulth
committed
[releng] Allow Migration from 6 to 7
Fix class that wasn't bumped correctly to 7.0.0 Change-Id: If64d79e61885ca890cf3006eef0e9fdcc1edd5f6 Signed-off-by: Erwann Traisnel <[email protected]>
1 parent b4ba425 commit 1e3c3eb

File tree

3 files changed

+127
-56
lines changed

3 files changed

+127
-56
lines changed

‎core/plugins/org.polarsys.capella.core.data.migration/src/org/polarsys/capella/core/data/migration/MigrationConstants.java

+51-25
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,57 @@ public class MigrationConstants {
5050
public static final String LIBRARIES_PREFIX = SHARED_PREFIX + "libraries";
5151
public static final String RE_PREFIX = SHARED_PREFIX + "re";
5252

53-
public static final String CAPELLA_COMMON_OLD_NSURI = "http://www.polarsys.org/capella/core/common/5.0.0";
54-
public static final String CAPELLA_CORE_OLD_NSURI = "http://www.polarsys.org/capella/core/core/5.0.0";
55-
public static final String COMPOSITE_STRUCTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/cs/5.0.0";
56-
public static final String CONTEXT_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/ctx/5.0.0";
57-
public static final String EPBS_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/epbs/5.0.0";
58-
public static final String FUNCTIONAL_ANALYSIS_OLD_NSURI = "http://www.polarsys.org/capella/core/fa/5.0.0";
59-
public static final String INFORMATION_OLD_NSURI = "http://www.polarsys.org/capella/core/information/5.0.0";
60-
public static final String INFORMATION_COMMUNICATION_OLD_NSURI = "http://www.polarsys.org/capella/core/information/communication/5.0.0";
61-
public static final String INFORMATION_DATATYPE_OLD_NSURI = "http://www.polarsys.org/capella/core/information/datatype/5.0.0";
62-
public static final String INFORMATION_DATAVALUE_OLD_NSURI = "http://www.polarsys.org/capella/core/information/datavalue/5.0.0";
63-
public static final String INTERACTION_OLD_NSURI = "http://www.polarsys.org/capella/core/interaction/5.0.0";
64-
public static final String LOGICAL_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/la/5.0.0";
65-
public static final String CAPELLA_MODELLER_OLD_NSURI = "http://www.polarsys.org/capella/core/modeller/5.0.0";
66-
public static final String OPERATIONAL_ANALYSIS_OLD_NSURI = "http://www.polarsys.org/capella/core/oa/5.0.0";
67-
public static final String PHYSICAL_ARCHITECTURE_OLD_NSURI = "http://www.polarsys.org/capella/core/pa/5.0.0";
68-
public static final String PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_NSURI = "http://www.polarsys.org/capella/core/pa/deployment/5.0.0";
69-
public static final String REQUIREMENT_OLD_NSURI = "http://www.polarsys.org/capella/core/requirement/5.0.0";
70-
public static final String SHARED_MODEL_OLD_NSURI = "http://www.polarsys.org/capella/core/sharedmodel/5.0.0";
71-
72-
public static final String ACTIVITY_OLD_NSURI = "http://www.polarsys.org/capella/common/activity/5.0.0";
73-
public static final String BEHAVIOR_OLD_NSURI = "http://www.polarsys.org/capella/common/behavior/5.0.0";
74-
public static final String MODELLING_CORE_OLD_NSURI = "http://www.polarsys.org/capella/common/core/5.0.0";
75-
76-
public static final String LIBRARIES_OLD_NSURI = "http://www.polarsys.org/capella/common/libraries/5.0.0";
77-
public static final String RE_OLD_NSURI = "http://www.polarsys.org/capella/common/re/5.0.0";
53+
public static final String CAPELLA_COMMON_OLD_6_NSURI = "http://www.polarsys.org/capella/core/common/6.0.0";
54+
public static final String CAPELLA_CORE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/core/6.0.0";
55+
public static final String COMPOSITE_STRUCTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/cs/6.0.0";
56+
public static final String CONTEXT_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/ctx/6.0.0";
57+
public static final String EPBS_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/epbs/6.0.0";
58+
public static final String FUNCTIONAL_ANALYSIS_OLD_6_NSURI = "http://www.polarsys.org/capella/core/fa/6.0.0";
59+
public static final String INFORMATION_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/6.0.0";
60+
public static final String INFORMATION_COMMUNICATION_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/communication/6.0.0";
61+
public static final String INFORMATION_DATATYPE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/datatype/6.0.0";
62+
public static final String INFORMATION_DATAVALUE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/information/datavalue/6.0.0";
63+
public static final String INTERACTION_OLD_6_NSURI = "http://www.polarsys.org/capella/core/interaction/6.0.0";
64+
public static final String LOGICAL_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/la/6.0.0";
65+
public static final String CAPELLA_MODELLER_OLD_6_NSURI = "http://www.polarsys.org/capella/core/modeller/6.0.0";
66+
public static final String OPERATIONAL_ANALYSIS_OLD_6_NSURI = "http://www.polarsys.org/capella/core/oa/6.0.0";
67+
public static final String PHYSICAL_ARCHITECTURE_OLD_6_NSURI = "http://www.polarsys.org/capella/core/pa/6.0.0";
68+
public static final String PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_6_NSURI = "http://www.polarsys.org/capella/core/pa/deployment/6.0.0";
69+
public static final String REQUIREMENT_OLD_6_NSURI = "http://www.polarsys.org/capella/core/requirement/6.0.0";
70+
public static final String SHARED_MODEL_OLD_6_NSURI = "http://www.polarsys.org/capella/core/sharedmodel/6.0.0";
71+
72+
public static final String ACTIVITY_OLD_6_NSURI = "http://www.polarsys.org/capella/common/activity/6.0.0";
73+
public static final String BEHAVIOR_OLD_6_NSURI = "http://www.polarsys.org/capella/common/behavior/6.0.0";
74+
public static final String MODELLING_CORE_OLD_6_NSURI = "http://www.polarsys.org/capella/common/core/6.0.0";
75+
76+
public static final String LIBRARIES_OLD_6_NSURI = "http://www.polarsys.org/capella/common/libraries/6.0.0";
77+
public static final String RE_OLD_6_NSURI = "http://www.polarsys.org/capella/common/re/6.0.0";
78+
79+
public static final String CAPELLA_COMMON_OLD_5_NSURI = "http://www.polarsys.org/capella/core/common/5.0.0";
80+
public static final String CAPELLA_CORE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/core/5.0.0";
81+
public static final String COMPOSITE_STRUCTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/cs/5.0.0";
82+
public static final String CONTEXT_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/ctx/5.0.0";
83+
public static final String EPBS_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/epbs/5.0.0";
84+
public static final String FUNCTIONAL_ANALYSIS_OLD_5_NSURI = "http://www.polarsys.org/capella/core/fa/5.0.0";
85+
public static final String INFORMATION_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/5.0.0";
86+
public static final String INFORMATION_COMMUNICATION_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/communication/5.0.0";
87+
public static final String INFORMATION_DATATYPE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/datatype/5.0.0";
88+
public static final String INFORMATION_DATAVALUE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/information/datavalue/5.0.0";
89+
public static final String INTERACTION_OLD_5_NSURI = "http://www.polarsys.org/capella/core/interaction/5.0.0";
90+
public static final String LOGICAL_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/la/5.0.0";
91+
public static final String CAPELLA_MODELLER_OLD_5_NSURI = "http://www.polarsys.org/capella/core/modeller/5.0.0";
92+
public static final String OPERATIONAL_ANALYSIS_OLD_5_NSURI = "http://www.polarsys.org/capella/core/oa/5.0.0";
93+
public static final String PHYSICAL_ARCHITECTURE_OLD_5_NSURI = "http://www.polarsys.org/capella/core/pa/5.0.0";
94+
public static final String PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_5_NSURI = "http://www.polarsys.org/capella/core/pa/deployment/5.0.0";
95+
public static final String REQUIREMENT_OLD_5_NSURI = "http://www.polarsys.org/capella/core/requirement/5.0.0";
96+
public static final String SHARED_MODEL_OLD_5_NSURI = "http://www.polarsys.org/capella/core/sharedmodel/5.0.0";
97+
98+
public static final String ACTIVITY_OLD_5_NSURI = "http://www.polarsys.org/capella/common/activity/5.0.0";
99+
public static final String BEHAVIOR_OLD_5_NSURI = "http://www.polarsys.org/capella/common/behavior/5.0.0";
100+
public static final String MODELLING_CORE_OLD_5_NSURI = "http://www.polarsys.org/capella/common/core/5.0.0";
101+
102+
public static final String LIBRARIES_OLD_5_NSURI = "http://www.polarsys.org/capella/common/libraries/5.0.0";
103+
public static final String RE_OLD_5_NSURI = "http://www.polarsys.org/capella/common/re/5.0.0";
78104

79105
public static final String CAPELLA_COMMON_OLD_1_4_NSURI = "http://www.polarsys.org/capella/core/common/1.4.0";
80106
public static final String CAPELLA_CORE_OLD_1_4_NSURI = "http://www.polarsys.org/capella/core/core/1.4.0";

‎core/plugins/org.polarsys.capella.core.data.migration/src/org/polarsys/capella/core/data/migration/capella/CapellaMigrationContribution.java

+48-24
Original file line numberDiff line numberDiff line change
@@ -87,30 +87,54 @@ public class CapellaMigrationContribution extends AbstractMigrationContribution
8787
public static HashMap<String, EPackage> pkgs = new HashMap<String, EPackage>();
8888

8989
static {
90-
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_NSURI, CsPackage.eINSTANCE);
91-
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_NSURI, CtxPackage.eINSTANCE);
92-
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_NSURI, EpbsPackage.eINSTANCE);
93-
pkgs.put(MigrationConstants.FUNCTIONAL_ANALYSIS_OLD_NSURI, FaPackage.eINSTANCE);
94-
pkgs.put(MigrationConstants.INFORMATION_OLD_NSURI, InformationPackage.eINSTANCE);
95-
pkgs.put(MigrationConstants.INFORMATION_COMMUNICATION_OLD_NSURI, CommunicationPackage.eINSTANCE);
96-
pkgs.put(MigrationConstants.INFORMATION_DATATYPE_OLD_NSURI, DatatypePackage.eINSTANCE);
97-
pkgs.put(MigrationConstants.INFORMATION_DATAVALUE_OLD_NSURI, DatavaluePackage.eINSTANCE);
98-
pkgs.put(MigrationConstants.INTERACTION_OLD_NSURI, InteractionPackage.eINSTANCE);
99-
pkgs.put(MigrationConstants.LOGICAL_ARCHITECTURE_OLD_NSURI, LaPackage.eINSTANCE);
100-
pkgs.put(MigrationConstants.CAPELLA_COMMON_OLD_NSURI, CapellacommonPackage.eINSTANCE);
101-
pkgs.put(MigrationConstants.CAPELLA_CORE_OLD_NSURI, CapellacorePackage.eINSTANCE);
102-
pkgs.put(MigrationConstants.CAPELLA_MODELLER_OLD_NSURI, CapellamodellerPackage.eINSTANCE);
103-
pkgs.put(MigrationConstants.OPERATIONAL_ANALYSIS_OLD_NSURI, OaPackage.eINSTANCE);
104-
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_OLD_NSURI, PaPackage.eINSTANCE);
105-
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_NSURI, DeploymentPackage.eINSTANCE);
106-
pkgs.put(MigrationConstants.REQUIREMENT_OLD_NSURI, RequirementPackage.eINSTANCE);
107-
pkgs.put(MigrationConstants.SHARED_MODEL_OLD_NSURI, SharedmodelPackage.eINSTANCE);
108-
pkgs.put(MigrationConstants.ACTIVITY_OLD_NSURI, ActivityPackage.eINSTANCE);
109-
pkgs.put(MigrationConstants.BEHAVIOR_OLD_NSURI, BehaviorPackage.eINSTANCE);
110-
pkgs.put(MigrationConstants.MODELLING_CORE_OLD_NSURI, ModellingcorePackage.eINSTANCE);
111-
pkgs.put(MigrationConstants.LIBRARIES_OLD_NSURI, LibrariesPackage.eINSTANCE);
112-
pkgs.put(MigrationConstants.RE_OLD_NSURI, RePackage.eINSTANCE);
113-
// Add 1.4.0 NSURI as we allow migration also from 1.4.x to 6.x
90+
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_6_NSURI, CsPackage.eINSTANCE);
91+
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_6_NSURI, CtxPackage.eINSTANCE);
92+
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_6_NSURI, EpbsPackage.eINSTANCE);
93+
pkgs.put(MigrationConstants.FUNCTIONAL_ANALYSIS_OLD_6_NSURI, FaPackage.eINSTANCE);
94+
pkgs.put(MigrationConstants.INFORMATION_OLD_6_NSURI, InformationPackage.eINSTANCE);
95+
pkgs.put(MigrationConstants.INFORMATION_COMMUNICATION_OLD_6_NSURI, CommunicationPackage.eINSTANCE);
96+
pkgs.put(MigrationConstants.INFORMATION_DATATYPE_OLD_6_NSURI, DatatypePackage.eINSTANCE);
97+
pkgs.put(MigrationConstants.INFORMATION_DATAVALUE_OLD_6_NSURI, DatavaluePackage.eINSTANCE);
98+
pkgs.put(MigrationConstants.INTERACTION_OLD_6_NSURI, InteractionPackage.eINSTANCE);
99+
pkgs.put(MigrationConstants.LOGICAL_ARCHITECTURE_OLD_6_NSURI, LaPackage.eINSTANCE);
100+
pkgs.put(MigrationConstants.CAPELLA_COMMON_OLD_6_NSURI, CapellacommonPackage.eINSTANCE);
101+
pkgs.put(MigrationConstants.CAPELLA_CORE_OLD_6_NSURI, CapellacorePackage.eINSTANCE);
102+
pkgs.put(MigrationConstants.CAPELLA_MODELLER_OLD_6_NSURI, CapellamodellerPackage.eINSTANCE);
103+
pkgs.put(MigrationConstants.OPERATIONAL_ANALYSIS_OLD_6_NSURI, OaPackage.eINSTANCE);
104+
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_OLD_6_NSURI, PaPackage.eINSTANCE);
105+
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_6_NSURI, DeploymentPackage.eINSTANCE);
106+
pkgs.put(MigrationConstants.REQUIREMENT_OLD_6_NSURI, RequirementPackage.eINSTANCE);
107+
pkgs.put(MigrationConstants.SHARED_MODEL_OLD_6_NSURI, SharedmodelPackage.eINSTANCE);
108+
pkgs.put(MigrationConstants.ACTIVITY_OLD_6_NSURI, ActivityPackage.eINSTANCE);
109+
pkgs.put(MigrationConstants.BEHAVIOR_OLD_6_NSURI, BehaviorPackage.eINSTANCE);
110+
pkgs.put(MigrationConstants.MODELLING_CORE_OLD_6_NSURI, ModellingcorePackage.eINSTANCE);
111+
pkgs.put(MigrationConstants.LIBRARIES_OLD_6_NSURI, LibrariesPackage.eINSTANCE);
112+
pkgs.put(MigrationConstants.RE_OLD_6_NSURI, RePackage.eINSTANCE);
113+
// Add 5.0.0 NSURI as we allow migration also from 5.x to 7.x
114+
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_5_NSURI, CsPackage.eINSTANCE);
115+
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_5_NSURI, CtxPackage.eINSTANCE);
116+
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_5_NSURI, EpbsPackage.eINSTANCE);
117+
pkgs.put(MigrationConstants.FUNCTIONAL_ANALYSIS_OLD_5_NSURI, FaPackage.eINSTANCE);
118+
pkgs.put(MigrationConstants.INFORMATION_OLD_5_NSURI, InformationPackage.eINSTANCE);
119+
pkgs.put(MigrationConstants.INFORMATION_COMMUNICATION_OLD_5_NSURI, CommunicationPackage.eINSTANCE);
120+
pkgs.put(MigrationConstants.INFORMATION_DATATYPE_OLD_5_NSURI, DatatypePackage.eINSTANCE);
121+
pkgs.put(MigrationConstants.INFORMATION_DATAVALUE_OLD_5_NSURI, DatavaluePackage.eINSTANCE);
122+
pkgs.put(MigrationConstants.INTERACTION_OLD_5_NSURI, InteractionPackage.eINSTANCE);
123+
pkgs.put(MigrationConstants.LOGICAL_ARCHITECTURE_OLD_5_NSURI, LaPackage.eINSTANCE);
124+
pkgs.put(MigrationConstants.CAPELLA_COMMON_OLD_5_NSURI, CapellacommonPackage.eINSTANCE);
125+
pkgs.put(MigrationConstants.CAPELLA_CORE_OLD_5_NSURI, CapellacorePackage.eINSTANCE);
126+
pkgs.put(MigrationConstants.CAPELLA_MODELLER_OLD_5_NSURI, CapellamodellerPackage.eINSTANCE);
127+
pkgs.put(MigrationConstants.OPERATIONAL_ANALYSIS_OLD_5_NSURI, OaPackage.eINSTANCE);
128+
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_OLD_5_NSURI, PaPackage.eINSTANCE);
129+
pkgs.put(MigrationConstants.PHYSICAL_ARCHITECTURE_DEPLOYMENT_OLD_5_NSURI, DeploymentPackage.eINSTANCE);
130+
pkgs.put(MigrationConstants.REQUIREMENT_OLD_5_NSURI, RequirementPackage.eINSTANCE);
131+
pkgs.put(MigrationConstants.SHARED_MODEL_OLD_5_NSURI, SharedmodelPackage.eINSTANCE);
132+
pkgs.put(MigrationConstants.ACTIVITY_OLD_5_NSURI, ActivityPackage.eINSTANCE);
133+
pkgs.put(MigrationConstants.BEHAVIOR_OLD_5_NSURI, BehaviorPackage.eINSTANCE);
134+
pkgs.put(MigrationConstants.MODELLING_CORE_OLD_5_NSURI, ModellingcorePackage.eINSTANCE);
135+
pkgs.put(MigrationConstants.LIBRARIES_OLD_5_NSURI, LibrariesPackage.eINSTANCE);
136+
pkgs.put(MigrationConstants.RE_OLD_5_NSURI, RePackage.eINSTANCE);
137+
// Add 1.4.0 NSURI as we allow migration also from 1.4.x to 7.x
114138
pkgs.put(MigrationConstants.COMPOSITE_STRUCTURE_OLD_1_4_NSURI, CsPackage.eINSTANCE);
115139
pkgs.put(MigrationConstants.CONTEXT_ARCHITECTURE_OLD_1_4_NSURI, CtxPackage.eINSTANCE);
116140
pkgs.put(MigrationConstants.EPBS_ARCHITECTURE_OLD_1_4_NSURI, EpbsPackage.eINSTANCE);

0 commit comments

Comments
 (0)