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.

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

[#1346] Remove RO descriptors layer #1358

Merged
merged 2 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions bundles/org.eclipse.passage.lic.licenses.edit/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.passage.lic.licenses.model/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="ASCII"?>
<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="_SUWLYAbBEemNz8l9BTvo0A" name="FeatureSet">
<rootEClass href="http://www.eclipse.org/passage/lic/features/2.0.0#//FeatureSet"/>
<rootEClass href="http://www.eclipse.org/passage/lic/features/3.0.0#//FeatureSet"/>
<ecorePaths>/org.eclipse.passage.lic.features.ecore/model/features.ecore</ecorePaths>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_SW6XMAbBEemNz8l9BTvo0A" name="Control identifier">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_SW6-QAbBEemNz8l9BTvo0A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/features/2.0.0#//FeatureSet/identifier"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/features/3.0.0#//FeatureSet/identifier"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_SW6-QQbBEemNz8l9BTvo0A" name="Control name">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_SW6-QgbBEemNz8l9BTvo0A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/features/2.0.0#//FeatureSet/name"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/features/3.0.0#//FeatureSet/name"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_SW6-QwbBEemNz8l9BTvo0A" name="Control description">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_SW6-RAbBEemNz8l9BTvo0A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/features/2.0.0#//FeatureSet/description"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/passage/lic/features/3.0.0#//FeatureSet/description"/>
</domainModelReference>
</children>
</org.eclipse.emf.ecp.view.model:View>
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="_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>
Expand Down
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="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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
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="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>
Expand Down
Loading
Loading