From d50995c13d7473910686845507e0fc7b4c5f9490 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Wed, 1 May 2024 20:39:13 +0300
Subject: [PATCH] [#1346] Remove RO descriptors layer

Apply to Licenses domain

Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 .../plugin.xml                                |  4 +-
 .../plugin.xml                                |  4 +-
 .../viewmodels/AgreementData.view             | 12 ++--
 .../viewmodels/EvaluationInstructions.view    |  6 +-
 .../viewmodels/FeatureGrant.view              | 32 +++++------
 .../viewmodels/FloatingLicenseAccess.view     |  8 +--
 .../viewmodels/FloatingLicensePack.view       | 10 ++--
 .../viewmodels/FloatingLicenseRequisites.view | 16 +++---
 .../viewmodels/FloatingServer.view            |  6 +-
 .../viewmodels/FloatingServerConnection.view  |  8 +--
 .../viewmodels/LicensePlan.view               | 10 ++--
 .../viewmodels/LicensePlanFeature.view        | 18 +++---
 .../viewmodels/PersonalFeatureGrant.view      | 38 ++++++-------
 .../viewmodels/PersonalLicensePack.view       | 56 +++++++++----------
 .../viewmodels/ProductRef.view                |  6 +-
 .../viewmodels/UserGrant.view                 | 12 ++--
 .../viewmodels/ValidityPeriodClosed.view      |  6 +-
 .../viewmodels/VersionMatch.view              |  6 +-
 18 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
index c41d5515e..2fa7f0461 100644
--- a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
+++ b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 
 <!--
-	Copyright (c) 2018, 2020 ArSysOp and others
+	Copyright (c) 2018, 2024 ArSysOp and others
 
 	This program and the accompanying materials are made available under the
 	terms of the Eclipse Public License 2.0 which is available at
@@ -19,7 +19,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated licenses. -->
       <factory
-            uri="http://www.eclipse.org/passage/lic/licenses/2.0.0"
+            uri="http://www.eclipse.org/passage/lic/licenses/3.0.0"
             class="org.eclipse.passage.lic.licenses.edit.providers.LicensesItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/plugin.xml b/bundles/org.eclipse.passage.lic.licenses.model/plugin.xml
index eb1536f05..f22823b44 100644
--- a/bundles/org.eclipse.passage.lic.licenses.model/plugin.xml
+++ b/bundles/org.eclipse.passage.lic.licenses.model/plugin.xml
@@ -16,9 +16,9 @@
 <plugin>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated licenses. -->
+      <!-- @generated licenses -->
       <package
-            uri="http://www.eclipse.org/passage/lic/licenses/2.0.0"
+            uri="http://www.eclipse.org/passage/lic/licenses/3.0.0"
             class="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage"
             genModel="model/licenses.genmodel"/>
    </extension>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/AgreementData.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/AgreementData.view
index 67d713c7f..6e54a8326 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/AgreementData.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/AgreementData.view
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_3eWQYPdeEe6WL-f-ggxVOQ" name="AgreementData" readonly="true">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//AgreementData"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//AgreementData"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_3e9UYvdeEe6WL-f-ggxVOQ" name="Control name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3e9UY_deEe6WL-f-ggxVOQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//AgreementData/name"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//AgreementData/name"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_3e9UYPdeEe6WL-f-ggxVOQ" name="Control identifier">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3e9UYfdeEe6WL-f-ggxVOQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//AgreementData/identifier"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//AgreementData/identifier"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_3e9UZPdeEe6WL-f-ggxVOQ" name="Control file">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3e9UZfdeEe6WL-f-ggxVOQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//AgreementData/file"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//AgreementData/file"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_3e9UZvdeEe6WL-f-ggxVOQ" name="Control hashAlgo">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3e9UZ_deEe6WL-f-ggxVOQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//AgreementData/hashAlgo"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//AgreementData/hashAlgo"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_3e9UbPdeEe6WL-f-ggxVOQ" name="Control contentType">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3e9UbfdeEe6WL-f-ggxVOQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//AgreementData/contentType"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//AgreementData/contentType"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
index 1d5138398..9fa6da328 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4ROBgBrKEeuMV_ofZRuPaw" name="Evaluation Instructions">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RRE0BrKEeuMV_ofZRuPaw" name="Control type">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RRE0RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions/type"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RRE0hrKEeuMV_ofZRuPaw" name="Control expression">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RRE0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions/expression"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
index b62e844ca..54b95e130 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="__u4qcL-xEeuw7f5-0ea7hA" name="Feature Grant">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant"/>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_QYRzYMEXEeuw7f5-0ea7hA" name="General" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u874L-xEeuw7f5-0ea7hA" name="identifier" readonly="true">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u874b-xEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/identifier"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/identifier"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u876L-xEeuw7f5-0ea7hA" name="capacity">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u876b-xEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/capacity"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/capacity"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u875r-xEeuw7f5-0ea7hA" name="vivid">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u8757-xEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/vivid"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/vivid"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_TrvvQMEXEeuw7f5-0ea7hA" name="Feature" groupType="Collapsible" collapsed="true">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u874r-xEeuw7f5-0ea7hA" name="identifier" readonly="true">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_qYmhsMEXEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/identifier"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/feature"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_q7vD8MEXEeuw7f5-0ea7hA" name="version" readonly="true">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vVU6YMEXEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/version"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/feature"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/versionMatch"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_rXTloMEXEeuw7f5-0ea7hA" name="rule" readonly="true">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_xua4sMEXEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/rule"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/feature"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/versionMatch"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_cESukMEXEeuw7f5-0ea7hA" name="Valid" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__u875L-xEeuw7f5-0ea7hA" name="from">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__u875b-xEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/from"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/valid"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_iLlc8MEXEeuw7f5-0ea7hA" name="until">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ju_JYMEXEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/until"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureGrant/valid"/>
       </domainModelReference>
     </children>
   </children>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
index 16f9fa335..7d6beec8e 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RiKkBrKEeuMV_ofZRuPaw" name="Floating License Access">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicenseAccess"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm0BrKEeuMV_ofZRuPaw" name="Control user">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm0RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/user"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicenseAccess/user"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm0hrKEeuMV_ofZRuPaw" name="Control server">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/server"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicenseAccess/server"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Rkm1BrKEeuMV_ofZRuPaw" name="Control originLicensePack">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Rkm1RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/originLicensePack"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicenseAccess/originLicensePack"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicensePack.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicensePack.view
index 770160886..c25fce821 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicensePack.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicensePack.view
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4NW1MBrKEeuMV_ofZRuPaw" name="Floating License Pack">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicensePack"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicensePack"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4P8PIBrKEeuMV_ofZRuPaw" name="License Information">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4P8PIRrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicensePack/license"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicensePack/license"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4P8PIhrKEeuMV_ofZRuPaw" name="Floating Server">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4P8PIxrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicensePack/host"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicensePack/host"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4P8PJBrKEeuMV_ofZRuPaw" name="Users">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4P8PJRrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicensePack/users"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicensePack/users"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4P8PJhrKEeuMV_ofZRuPaw" name="Features Grants">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4P8PJxrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicensePack/features"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicensePack/features"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view
index 7c37755b5..81e3460ba 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseRequisites.view
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_EpDbML-uEeuw7f5-0ea7hA" name="Floating License Requisites">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseRequisites"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicenseRequisites"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpUg8L-uEeuw7f5-0ea7hA" name="Control identifier">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIAL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/identifier"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/identifier"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIAb-uEeuw7f5-0ea7hA" name="Control issueDate">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIAr-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/issueDate"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/issueDate"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIA7-uEeuw7f5-0ea7hA" name="Control plan">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIBL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/plan"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/plan"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIBb-uEeuw7f5-0ea7hA" name="Control product">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIBr-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/product"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIB7-uEeuw7f5-0ea7hA" name="Control valid">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVICL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/valid"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVICb-uEeuw7f5-0ea7hA" name="Control signature">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVICr-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/signature"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/signature"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_EpVIC7-uEeuw7f5-0ea7hA" name="Control company">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_EpVIDL-uEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseRequisites/company"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingLicenseRequisites/company"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
index b15499e71..737f7337b 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QdMgBrKEeuMV_ofZRuPaw" name="Floating Server">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServer"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qg24BrKEeuMV_ofZRuPaw" name="Name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qg24RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/identifier"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServer/identifier"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qg24hrKEeuMV_ofZRuPaw" name="Authentication expression">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qg24xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/authentication"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServer/authentication"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
index 43394f8b2..4acae8b11 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RrUgBrKEeuMV_ofZRuPaw" name="Floating Server Connection">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServerConnection"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX0BrKEeuMV_ofZRuPaw" name="Control ip">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX0RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/ip"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServerConnection/ip"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX0hrKEeuMV_ofZRuPaw" name="Control port">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/port"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServerConnection/port"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RuX1BrKEeuMV_ofZRuPaw" name="Control authentication">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RuX1RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/authentication"/>
+      <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FloatingServerConnection/authentication"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view
index 08500d1aa..5d2c0e5ba 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_PPv1MIdmEemHgffLhDrdUQ" name="License Plan">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlan"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i4IdmEemHgffLhDrdUQ" name="Identifier">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i4YdmEemHgffLhDrdUQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/identifier"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlan/identifier"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i4odmEemHgffLhDrdUQ" name="Name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i44dmEemHgffLhDrdUQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/name"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlan/name"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_PP2i5IdmEemHgffLhDrdUQ" name="Description">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_PP2i5YdmEemHgffLhDrdUQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/description"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlan/description"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_9cX1gP6MEeuGytDyYvaNeQ" name="Agreements">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_DSQq0P6NEeuGytDyYvaNeQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlan/agreements"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlan/agreements"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view
index b4fd5bd8a..734c83334 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_PmBwAL-3Eeuw7f5-0ea7hA" name="Licens Plan Feature">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlanFeature"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_ATqWwMBHEeuw7f5-0ea7hA" name="FeatureRef Identifier">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_C-tnwMBHEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/identifier"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlanFeature/feature"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Ga8eEMBHEeuw7f5-0ea7hA" name="VersionMatch version">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_IltFcMBHEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/version"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlanFeature/feature"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/versionMatch"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OdTyAMBHEeuw7f5-0ea7hA" name="VersionMathc rule">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_QQBFwMBHEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicensePlanFeature/feature"/>
-      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/rule"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicensePlanFeature/feature"/>
+      <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/versionMatch"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view
index b6c587f41..e93efcd8e 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalFeatureGrant.view
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_Aa4foMB0Eeuw7f5-0ea7hA" name="Personal Feature Grant">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant"/>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_WECuQMEVEeuw7f5-0ea7hA" name="General">
     <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_YKy_YMEVEeuw7f5-0ea7hA">
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YIMB0Eeuw7f5-0ea7hA" name="Control identifier" readonly="true">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YIcB0Eeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/identifier"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/identifier"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YKMB0Eeuw7f5-0ea7hA" name="Control capacity">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YKcB0Eeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/capacity"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/capacity"/>
         </domainModelReference>
       </children>
     </children>
@@ -18,23 +18,23 @@
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_aIv50MEVEeuw7f5-0ea7hA" name="Feature">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_zKrtQMEVEeuw7f5-0ea7hA" name="FeatureRef identifier" readonly="true">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_104CoMEVEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/identifier"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/identifier"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/feature"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_RezzEMEWEeuw7f5-0ea7hA">
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_IS9ukMEWEeuw7f5-0ea7hA" name="VersionMatch version" readonly="true">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_K1G7MMEWEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/version"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/feature"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/versionMatch"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_NWU6wMEWEeuw7f5-0ea7hA" name="VersionMatch rule">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Q2t4UMEWEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/feature"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureRef/versionMatch"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/rule"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/feature"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//FeatureRef/versionMatch"/>
         </domainModelReference>
       </children>
     </children>
@@ -42,28 +42,28 @@
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_aKyEsMEWEeuw7f5-0ea7hA" name="Valid">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Aa9YJMB0Eeuw7f5-0ea7hA" name="from">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Aa9YJcB0Eeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/valid"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/from"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/valid"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_1TJZIMEWEeuw7f5-0ea7hA" name="to">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_3hrGMMEWEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/valid"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/until"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/valid"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_gHHgQMEWEeuw7f5-0ea7hA" name="User Authentication">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mkmhEMEWEeuw7f5-0ea7hA" name="EvaluationInstrutions type">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_oNXOoMEWEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/userAuthentication"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions/type"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/userAuthentication"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_sOmPcMEWEeuw7f5-0ea7hA" name="EvaluationInstrutions expression">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vdLEQMEWEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalFeatureGrant/userAuthentication"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions/expression"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalFeatureGrant/userAuthentication"/>
       </domainModelReference>
     </children>
   </children>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view
index 45d644972..9287a71a3 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/PersonalLicensePack.view
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.horizontal.model="http://org/eclipse/emf/ecp/view/horizontal/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_h7uaUL_KEeuw7f5-0ea7hA" name="Personal License Pack">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack"/>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_K-c2wMBNEeuw7f5-0ea7hA" name="General">
     <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_gPNeoMBNEeuw7f5-0ea7hA">
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__QurYMBMEeuw7f5-0ea7hA" name="identifier">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_JuzMwMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/identifier"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/identifier"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_No1ZYMBNEeuw7f5-0ea7hA" name="issueDate">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Pr42QMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/issueDate"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/issueDate"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Z0gsEMBNEeuw7f5-0ea7hA" name="plan">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_bd0MMMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/plan"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/plan"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
         </domainModelReference>
       </children>
     </children>
@@ -27,16 +27,16 @@
     <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_h1Cw0MBJEeuw7f5-0ea7hA">
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_gHVPEL_LEeuw7f5-0ea7hA" name="ProductRef identifier">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lbX7kL_LEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/identifier"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ProductRef/identifier"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/product"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pGqhkL_LEeuw7f5-0ea7hA" name="ProductRef version">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_rURooL_LEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/version"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/product"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ProductRef/version"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/product"/>
         </domainModelReference>
       </children>
     </children>
@@ -45,16 +45,16 @@
     <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_0PMX8MBJEeuw7f5-0ea7hA">
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_pu0JcMBJEeuw7f5-0ea7hA" name="ValidityPeriodOpen from">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ydaRQMBJEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/from"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/valid"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_ExIyMMBIEeuw7f5-0ea7hA" name="ValidityPeriodClosed to">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ZUruwMBIEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/valid"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/until"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/valid"/>
         </domainModelReference>
       </children>
     </children>
@@ -63,16 +63,16 @@
     <children xsi:type="org.eclipse.emf.ecp.view.horizontal.model:HorizontalLayout" xmi:id="_22plkMBNEeuw7f5-0ea7hA">
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_0MzOcMBNEeuw7f5-0ea7hA" name="UserRef identifier">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_5MfbkMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserRef/identifier"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicenseRequisites/user"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//UserRef/identifier"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicenseRequisites/user"/>
         </domainModelReference>
       </children>
       <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7G22gMBNEeuw7f5-0ea7hA" name="UserRef name">
         <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_9IunoMBNEeuw7f5-0ea7hA">
-          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserRef/name"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
-          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicenseRequisites/user"/>
+          <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//UserRef/name"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
+          <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicenseRequisites/user"/>
         </domainModelReference>
       </children>
     </children>
@@ -80,15 +80,15 @@
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_XCODQMBQEeuw7f5-0ea7hA" name="Grants">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_XJB2EMB1Eeuw7f5-0ea7hA" labelAlignment="None">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Zz5g4MB1Eeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/grants"/>
+        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/grants"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_WPwy8MBNEeuw7f5-0ea7hA" name="Signature">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_h064MMBNEeuw7f5-0ea7hA" name="Signature">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kryiMMBOEeuw7f5-0ea7hA">
-        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//LicenseRequisites/signature"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//PersonalLicensePack/license"/>
+        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//LicenseRequisites/signature"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//PersonalLicensePack/license"/>
       </domainModelReference>
     </children>
   </children>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view
index b7804a86e..36df192b5 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ProductRef.view
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QTbgBrKEeuMV_ofZRuPaw" name="Product Reference">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ProductRef"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4QWe0BrKEeuMV_ofZRuPaw" name="Control product" readonly="true">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_hSdHwL-yEeuw7f5-0ea7hA">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/identifier"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ProductRef/identifier"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4QWe0hrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4QWe0xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ProductRef/version"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ProductRef/version"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view
index a10a5af04..d2051babf 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/UserGrant.view
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4QnkkBrKEeuMV_ofZRuPaw" name="User Grant">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//UserGrant"/>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_fH8eQOR7Ee66ErHQg5rqcg" name="User" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Qqn4BrKEeuMV_ofZRuPaw" name="user" readonly="true">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Qqn4RrKEeuMV_ofZRuPaw">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/user"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//UserGrant/user"/>
       </domainModelReference>
     </children>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.group.model:Group" xmi:id="_iJHJMOR7Ee66ErHQg5rqcg" name="Authentication" groupType="Collapsible">
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_iJHJMeR7Ee66ErHQg5rqcg" name="type">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lMTNYOR7Ee66ErHQg5rqcg">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/type"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/authentication"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions/type"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//UserGrant/authentication"/>
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_nFzssOR7Ee66ErHQg5rqcg" name="expression">
       <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_pbvCQOR7Ee66ErHQg5rqcg">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
-        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//UserGrant/authentication"/>
+        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//EvaluationInstructions/expression"/>
+        <domainModelEReferencePath href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//UserGrant/authentication"/>
       </domainModelReference>
     </children>
   </children>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view
index 511f15a10..20d40df96 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/ValidityPeriodClosed.view
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4REQgBrKEeuMV_ofZRuPaw" name="Validity Period">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RGswBrKEeuMV_ofZRuPaw" name="Control from">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RGswRrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/from"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/from"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4RGswhrKEeuMV_ofZRuPaw" name="Control until">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4RGswxrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//ValidityPeriodClosed/until"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//ValidityPeriodClosed/until"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view
index 880bffd90..14c0127fd 100644
--- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view
+++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/VersionMatch.view
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_4RXygBrKEeuMV_ofZRuPaw" name="Version Match">
-  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch"/>
+  <rootEClass href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch"/>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Ra10BrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Ra10RrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/version"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/version"/>
     </domainModelReference>
   </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Ra10hrKEeuMV_ofZRuPaw" name="Control rule">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Ra10xrKEeuMV_ofZRuPaw">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//VersionMatch/rule"/>
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/3.0.0#//VersionMatch/rule"/>
     </domainModelReference>
   </children>
   <ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>