Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 572650 upgrade licenses domain model #733

Merged
merged 1 commit into from
Apr 15, 2021
Merged

Bug 572650 upgrade licenses domain model #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage 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" name="licenses" nsURI="http://www.eclipse.org/passage/lic/licenses/1.1.0"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="licenses" nsURI="http://www.eclipse.org/passage/lic/licenses/2.0.0"
nsPrefix="org.eclipse.passage.lic">
<eClassifiers xsi:type="ecore:EClass" name="LicensePlanDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.LicensePlanDescriptor"
abstract="true" interface="true"/>
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/EvaluationInstructions.view
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="EvaluationInstructions">
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//EvaluationInstructions"/>
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//EvaluationInstructions/type"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//EvaluationInstructions/expression"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//EvaluationInstructions/expression"/>
</domainModelReference>
</children>
<ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
Expand Down
12 changes: 6 additions & 6 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FeatureGrant.view
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="_4QwugBrKEeuMV_ofZRuPaw" name="FeatureGrant">
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FeatureGrant"/>
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Q0Y4hrKEeuMV_ofZRuPaw" name="Control feature" readonly="true">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Q0Y4xrKEeuMV_ofZRuPaw">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FeatureGrant/feature"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/feature"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Q0Y5BrKEeuMV_ofZRuPaw" name="Control version" readonly="true">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Q0Y5RrKEeuMV_ofZRuPaw">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FeatureGrant/version"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/version"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Q0Y5hrKEeuMV_ofZRuPaw" name="Control valid">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Q0Y5xrKEeuMV_ofZRuPaw">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FeatureGrant/valid"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/valid"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Q0Y6BrKEeuMV_ofZRuPaw" name="Control vivid">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Q0Y6RrKEeuMV_ofZRuPaw">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FeatureGrant/vivid"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/vivid"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_4Q0Y6hrKEeuMV_ofZRuPaw" name="Control capacity">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_4Q0Y6xrKEeuMV_ofZRuPaw">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FeatureGrant/capacity"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FeatureGrant/capacity"/>
</domainModelReference>
</children>
<ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicenseAccess.view
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="FloatingLicenseAccess">
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FloatingLicenseAccess"/>
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicenseAccess/user"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicenseAccess/server"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicenseAccess/originLicensePack"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicenseAccess/originLicensePack"/>
</domainModelReference>
</children>
<ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
Expand Down
10 changes: 5 additions & 5 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingLicensePack.view
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/1.1.0#//FloatingLicensePack"/>
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicensePack/license"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicensePack/host"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicensePack/users"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingLicensePack/features"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingLicensePack/features"/>
</domainModelReference>
</children>
<ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServer.view
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="FloatingServer">
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FloatingServer"/>
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingServer/identifier"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingServer/authentication"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServer/authentication"/>
</domainModelReference>
</children>
<ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/FloatingServerConnection.view
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="FloatingServerConnection">
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/1.1.0#//FloatingServerConnection"/>
<rootEClass href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingServerConnection/ip"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingServerConnection/port"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/licenses/2.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/1.1.0#//FloatingServerConnection/authentication"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/passage/lic/licenses/2.0.0#//FloatingServerConnection/authentication"/>
</domainModelReference>
</children>
<ecorePaths>/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore</ecorePaths>
Expand Down
Loading