From fb43f29ae68d236405099fa3f43e9a6988d07ceb Mon Sep 17 00:00:00 2001
From: Elena Parovyshnaia <elena.parovyshnaya@gmail.com>
Date: Tue, 11 May 2021 09:43:43 +0300
Subject: [PATCH 1/3] Bug 572650 upgrade `licenses` domain model

Fix label resolution for passage domain

Signed-off-by: eparovyshnaya <elena.parovyshnaya@gmail.com>
---
 .../plugin.properties                                     | 2 +-
 bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml  | 2 +-
 .../passage/loc/internal/emf/BaseDomainRegistry.java      | 7 +++++--
 .../loc/internal/features/core/FeatureDomainRegistry.java | 8 ++++++++
 .../loc/internal/licenses/core/LicenseDomainRegistry.java | 8 ++++++++
 .../loc/internal/products/core/ProductDomainRegistry.java | 8 ++++++++
 .../loc/internal/users/core/UserDomainRegistry.java       | 8 ++++++++
 7 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
index 6f12b0f2b..2b52085e9 100644
--- a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
+++ b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
@@ -77,7 +77,7 @@ _UI_LicensePlanFeature_text_pattern={0} ({1})
 _UI_FloatingLicensePack_type = Floating License Pack
 _UI_LicenseRequisites_type_detailed = License issued for {0} over product {1} of version {2}
 _UI_LicenseRequisites_type = License Requisites
-_UI_ProductRef_type = Product Ref
+_UI_ProductRef_type = Product Reference
 _UI_ProductRef_type_detailed = Product {0} version {1}
 _UI_FloatingServer_type = Floating Server
 _UI_UserGrant_type = User Grant
diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
index cc21fe95d..c41d5515e 100644
--- a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
+++ b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
@@ -19,7 +19,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated licenses. -->
       <factory
-            uri="http://www.eclipse.org/passage/lic/licenses/1.1.0"
+            uri="http://www.eclipse.org/passage/lic/licenses/2.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.loc.api/src/org/eclipse/passage/loc/internal/emf/BaseDomainRegistry.java b/bundles/org.eclipse.passage.loc.api/src/org/eclipse/passage/loc/internal/emf/BaseDomainRegistry.java
index d02c44afb..2a9d60aa5 100644
--- a/bundles/org.eclipse.passage.loc.api/src/org/eclipse/passage/loc/internal/emf/BaseDomainRegistry.java
+++ b/bundles/org.eclipse.passage.loc.api/src/org/eclipse/passage/loc/internal/emf/BaseDomainRegistry.java
@@ -113,8 +113,9 @@ public EditingDomain getEditingDomain() {
 
 	public ServiceInvocationResult<Boolean> loadSource(String source) {
 		URI uri = createURI(source);
-		ResourceSet resourceSet = editingDomain.getResourceSet();
-		Resource resource = resourceSet.createResource(uri);
+		ResourceSet set = editingDomain.getResourceSet();
+		Resource resource = createResource(uri);
+		set.getResources().add(resource);
 		try {
 			resource.load(getLoadOptions());
 			return new BaseServiceInvocationResult<>(true);
@@ -124,6 +125,8 @@ public ServiceInvocationResult<Boolean> loadSource(String source) {
 		}
 	}
 
+	protected abstract Resource createResource(URI uri);
+
 	public void unloadSource(String source) {
 		URI uri = createURI(source);
 		ResourceSet resourceSet = editingDomain.getResourceSet();
diff --git a/bundles/org.eclipse.passage.loc.features.core/src/org/eclipse/passage/loc/internal/features/core/FeatureDomainRegistry.java b/bundles/org.eclipse.passage.loc.features.core/src/org/eclipse/passage/loc/internal/features/core/FeatureDomainRegistry.java
index cc11c206c..56a45fcc5 100644
--- a/bundles/org.eclipse.passage.loc.features.core/src/org/eclipse/passage/loc/internal/features/core/FeatureDomainRegistry.java
+++ b/bundles/org.eclipse.passage.loc.features.core/src/org/eclipse/passage/loc/internal/features/core/FeatureDomainRegistry.java
@@ -22,13 +22,16 @@
 import java.util.Map;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.passage.lic.features.FeatureDescriptor;
 import org.eclipse.passage.lic.features.FeatureSetDescriptor;
 import org.eclipse.passage.lic.features.FeatureVersionDescriptor;
 import org.eclipse.passage.lic.features.model.meta.FeaturesPackage;
+import org.eclipse.passage.lic.features.model.util.FeaturesResourceImpl;
 import org.eclipse.passage.lic.internal.equinox.events.EquinoxEvent;
 import org.eclipse.passage.lic.internal.equinox.io.InstallationPath;
 import org.eclipse.passage.loc.internal.emf.BaseDomainRegistry;
@@ -278,4 +281,9 @@ protected Path getResourceSetPath() throws Exception {
 		return passagePath.resolve(domainName);
 	}
 
+	@Override
+	protected final Resource createResource(URI uri) {
+		return new FeaturesResourceImpl(uri);
+	}
+
 }
diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java
index 11d9162c8..2e4af2531 100644
--- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java
+++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseDomainRegistry.java
@@ -19,13 +19,16 @@
 import java.util.Map;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.passage.lic.internal.equinox.events.EquinoxEvent;
 import org.eclipse.passage.lic.internal.equinox.io.InstallationPath;
 import org.eclipse.passage.lic.licenses.LicensePlanDescriptor;
 import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage;
+import org.eclipse.passage.lic.licenses.model.util.LicensesResourceImpl;
 import org.eclipse.passage.loc.internal.emf.BaseDomainRegistry;
 import org.eclipse.passage.loc.internal.emf.DomainContentAdapter;
 import org.eclipse.passage.loc.internal.emf.EditingDomainRegistry;
@@ -152,4 +155,9 @@ protected Path getResourceSetPath() throws Exception {
 		return passagePath.resolve(domainName);
 	}
 
+	@Override
+	protected final Resource createResource(URI uri) {
+		return new LicensesResourceImpl(uri);
+	}
+
 }
diff --git a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java
index 718b8b6ef..6b6a6a807 100644
--- a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java
+++ b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductDomainRegistry.java
@@ -22,8 +22,10 @@
 import java.util.Map;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.passage.lic.internal.equinox.events.EquinoxEvent;
 import org.eclipse.passage.lic.internal.equinox.io.InstallationPath;
@@ -32,6 +34,7 @@
 import org.eclipse.passage.lic.products.ProductVersionDescriptor;
 import org.eclipse.passage.lic.products.ProductVersionFeatureDescriptor;
 import org.eclipse.passage.lic.products.model.meta.ProductsPackage;
+import org.eclipse.passage.lic.products.model.util.ProductsResourceImpl;
 import org.eclipse.passage.loc.internal.emf.BaseDomainRegistry;
 import org.eclipse.passage.loc.internal.emf.DomainContentAdapter;
 import org.eclipse.passage.loc.internal.emf.EditingDomainRegistry;
@@ -338,4 +341,9 @@ protected Path getResourceSetPath() throws Exception {
 		return passagePath.resolve(domainName);
 	}
 
+	@Override
+	protected final Resource createResource(URI uri) {
+		return new ProductsResourceImpl(uri);
+	}
+
 }
diff --git a/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java b/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java
index 5794ecc8a..2ffc79e0b 100644
--- a/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java
+++ b/bundles/org.eclipse.passage.loc.users.core/src/org/eclipse/passage/loc/internal/users/core/UserDomainRegistry.java
@@ -20,8 +20,10 @@
 import java.util.Map;
 
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.passage.lic.internal.equinox.events.EquinoxEvent;
 import org.eclipse.passage.lic.internal.equinox.io.InstallationPath;
@@ -29,6 +31,7 @@
 import org.eclipse.passage.lic.users.UserLicenseDescriptor;
 import org.eclipse.passage.lic.users.UserOriginDescriptor;
 import org.eclipse.passage.lic.users.model.meta.UsersPackage;
+import org.eclipse.passage.lic.users.model.util.UsersResourceImpl;
 import org.eclipse.passage.loc.internal.emf.BaseDomainRegistry;
 import org.eclipse.passage.loc.internal.emf.DomainContentAdapter;
 import org.eclipse.passage.loc.internal.emf.EditingDomainRegistry;
@@ -217,4 +220,9 @@ protected Path getResourceSetPath() throws Exception {
 		return passagePath.resolve(domainName);
 	}
 
+	@Override
+	protected final Resource createResource(URI uri) {
+		return new UsersResourceImpl(uri);
+	}
+
 }

From 732dd66f09110e9c329cd9e90d5081d537854a53 Mon Sep 17 00:00:00 2001
From: Elena Parovyshnaia <elena.parovyshnaya@gmail.com>
Date: Tue, 11 May 2021 13:43:35 +0300
Subject: [PATCH 2/3] Bug 572650 upgrade `licenses` domain model

Bump domain.core bundles to 2.0.0

Signed-off-by: eparovyshnaya <elena.parovyshnaya@gmail.com>
---
 .../org.eclipse.passage.loc.features.core/META-INF/MANIFEST.MF  | 2 +-
 .../org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF  | 2 +-
 .../org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF  | 2 +-
 bundles/org.eclipse.passage.loc.users.core/META-INF/MANIFEST.MF | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bundles/org.eclipse.passage.loc.features.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.features.core/META-INF/MANIFEST.MF
index e1fc4dc50..dc0506239 100644
--- a/bundles/org.eclipse.passage.loc.features.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.features.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.loc.features.core
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.loc.features.core
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
diff --git a/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF
index a6e4715a8..8cd00eb2e 100644
--- a/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.licenses.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.loc.licenses.core
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.loc.licenses.core
-Bundle-Version: 0.6.103.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
diff --git a/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF
index 4135e3d1d..22c744e2c 100644
--- a/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.products.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.loc.products.core
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.loc.products.core
-Bundle-Version: 0.6.300.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
diff --git a/bundles/org.eclipse.passage.loc.users.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.users.core/META-INF/MANIFEST.MF
index 17606a1fd..cfa8a4464 100644
--- a/bundles/org.eclipse.passage.loc.users.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.users.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.loc.users.core
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.loc.users.core
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright

From f81028825b0644816accce066d3891f2fe9cf12b Mon Sep 17 00:00:00 2001
From: Elena Parovyshnaia <elena.parovyshnaya@gmail.com>
Date: Tue, 11 May 2021 14:07:08 +0300
Subject: [PATCH 3/3] Bug 572650 upgrade `licenses` domain model

Bump domain feature versions  to 2.0.0

Signed-off-by: eparovyshnaya <elena.parovyshnaya@gmail.com>
---
 features/org.eclipse.passage.loc.features.feature/feature.xml | 2 +-
 features/org.eclipse.passage.loc.licenses.feature/feature.xml | 2 +-
 features/org.eclipse.passage.loc.products.feature/feature.xml | 2 +-
 features/org.eclipse.passage.loc.users.feature/feature.xml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/org.eclipse.passage.loc.features.feature/feature.xml b/features/org.eclipse.passage.loc.features.feature/feature.xml
index f6b6b0543..a6dace237 100644
--- a/features/org.eclipse.passage.loc.features.feature/feature.xml
+++ b/features/org.eclipse.passage.loc.features.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.passage.loc.features.feature"
       label="%featureName"
-      version="0.8.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.passage.loc.licenses.feature/feature.xml b/features/org.eclipse.passage.loc.licenses.feature/feature.xml
index f2d853e78..dda42361a 100644
--- a/features/org.eclipse.passage.loc.licenses.feature/feature.xml
+++ b/features/org.eclipse.passage.loc.licenses.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.passage.loc.licenses.feature"
       label="%featureName"
-      version="0.7.102.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.passage.loc.products.feature/feature.xml b/features/org.eclipse.passage.loc.products.feature/feature.xml
index 5788fac7b..19d65451c 100644
--- a/features/org.eclipse.passage.loc.products.feature/feature.xml
+++ b/features/org.eclipse.passage.loc.products.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.passage.loc.products.feature"
       label="%featureName"
-      version="0.7.200.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.passage.loc.users.feature/feature.xml b/features/org.eclipse.passage.loc.users.feature/feature.xml
index f53bc44ce..333a49513 100644
--- a/features/org.eclipse.passage.loc.users.feature/feature.xml
+++ b/features/org.eclipse.passage.loc.users.feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.passage.loc.users.feature"
       label="%featureName"
-      version="0.7.101.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">