Bug 572623 redesign license containment

Suspend major version upgrade demands Signed-off-by: eparovyshnaya <elena.parovyshnaya@gmail.com>
eclipse-passage · Apr 6, 2021 · 51eb259 · 51eb259
1 parent a326832
commit 51eb259
Show file tree

Hide file tree

Showing 4 changed files with 295 additions and 9 deletions.
diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/.settings/.api_filters b/bundles/org.eclipse.passage.lic.licenses.edit/.settings/.api_filters
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.passage.lic.licenses.edit" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter id="929038356">
+            <message_arguments>
+                <message_argument value="1.0.201"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicenseGrant">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicenseGrant"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicensePack">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePack"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicensePlan">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePlan"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicenseGrantImpl">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicenseGrantImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensePackImpl">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePackImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensePlanFeatureImpl">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePlanFeatureImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensesFactoryImpl">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensesFactoryImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.meta.LicensesFactory">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.meta.LicensesFactory"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.util.LicensesAdapterFactory">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.util.LicensesAdapterFactory"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.passage.lic.licenses.model.util.LicensesSwitch">
+        <filter id="305426566">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.util.LicensesSwitch"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.200"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/edit/LicensesEditPlugin.java" type="org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicenseGrantItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicenseGrantItemProvider">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicenseGrantItemProvider"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePackItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensePackItemProvider">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensePackItemProvider"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanFeatureItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanFeatureItemProvider">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanFeatureItemProvider"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanItemProvider.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanItemProvider">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensePlanItemProvider"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensesItemProviderAdapterFactory.java" type="org.eclipse.passage.lic.licenses.edit.providers.LicensesItemProviderAdapterFactory">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit.providers.LicensesItemProviderAdapterFactory"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.edit_1.0.201"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lic.licenses.edit
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lic.licenses.edit;singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Copyright: %Bundle-Copyright
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional,
- org.eclipse.passage.lic.licenses.model;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport
 Import-Package: org.osgi.framework
-Export-Package: org.eclipse.passage.lic.licenses.edit,
- org.eclipse.passage.lic.licenses.edit.providers
+Export-Package: org.eclipse.passage.lic.licenses.edit;x-internal:=true,
+ org.eclipse.passage.lic.licenses.edit.providers;x-internal:=true
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.passage.lic.licenses.edit.LicensesEditPlugin$Implementation$Activator
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/.settings/.api_filters b/bundles/org.eclipse.passage.lic.licenses.model/.settings/.api_filters
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.passage.lic.licenses.model" version="2">
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseGrant.java" type="org.eclipse.passage.lic.licenses.model.api.LicenseGrant">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicenseGrant"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePack.java" type="org.eclipse.passage.lic.licenses.model.api.LicensePack">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePack"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePlan.java" type="org.eclipse.passage.lic.licenses.model.api.LicensePlan">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePlan"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePlanFeature.java" type="org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/impl/LicenseGrantImpl.java" type="org.eclipse.passage.lic.licenses.model.impl.LicenseGrantImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicenseGrantImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePackImpl.java" type="org.eclipse.passage.lic.licenses.model.impl.LicensePackImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePackImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePlanFeatureImpl.java" type="org.eclipse.passage.lic.licenses.model.impl.LicensePlanFeatureImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePlanFeatureImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePlanImpl.java" type="org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesFactoryImpl.java" type="org.eclipse.passage.lic.licenses.model.impl.LicensesFactoryImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensesFactoryImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java" type="org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesFactory.java" type="org.eclipse.passage.lic.licenses.model.meta.LicensesFactory">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.meta.LicensesFactory"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java" type="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesAdapterFactory.java" type="org.eclipse.passage.lic.licenses.model.util.LicensesAdapterFactory">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.util.LicensesAdapterFactory"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesSwitch.java" type="org.eclipse.passage.lic.licenses.model.util.LicensesSwitch">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.passage.lic.licenses.model.util.LicensesSwitch"/>
+                <message_argument value="org.eclipse.passage.lic.licenses.model_1.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lic.licenses.model
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lic.licenses.model;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Copyright: %Bundle-Copyright
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=
  org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0",
  org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport
 Export-Package: org.eclipse.passage.lic.internal.licenses.model;x-friends:="org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.lic.licenses.migration,org.eclipse.passage.loc.licenses.core",
- org.eclipse.passage.lic.licenses.model.api,
- org.eclipse.passage.lic.licenses.model.impl,
- org.eclipse.passage.lic.licenses.model.meta,
- org.eclipse.passage.lic.licenses.model.util
+ org.eclipse.passage.lic.licenses.model.api;x-internal:=true,
+ org.eclipse.passage.lic.licenses.model.impl;x-internal:=true,
+ org.eclipse.passage.lic.licenses.model.meta;x-internal:=true,
+ org.eclipse.passage.lic.licenses.model.util;x-internal:=true
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy