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 572623 redesign license containment #712

Merged
merged 3 commits into from
Apr 6, 2021
+101 −2
Merged

Bug 572623 redesign license containment #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ed1e85
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
7f894ca
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
0165a07
Bug 572623 redesign license containment
eparovyshnaya Apr 6, 2021
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/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.lic.licenses.ecore
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.lic.licenses.ecore
Bundle-Version: 0.5.300.qualifier
Bundle-Version: 0.5.301.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand Down
99 changes: 99 additions & 0 deletions 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
Expand Up @@ -17,6 +17,10 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="licensePlanFeatures" upperBound="-1"
eType="#//LicensePlanFeatureDescriptor" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="personal" upperBound="-1"
eType="#//LicensePack" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="floating" upperBound="-1"
eType="#//FloatingLicensePack" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LicensePlanFeature" eSuperTypes="#//LicensePlanFeatureDescriptor">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="featureIdentifier" lowerBound="1"
Expand Down Expand Up @@ -67,4 +71,99 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="licensePack" lowerBound="1"
eType="#//LicensePack" eOpposite="#//LicensePack/licenseGrants"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingLicensePack">
<eStructuralFeatures xsi:type="ecore:EReference" name="license" lowerBound="1"
eType="#//LicenseRequisites" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="host" lowerBound="1" eType="#//FloatingServer"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="users" lowerBound="1" upperBound="-1"
eType="#//UserGrant" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="features" lowerBound="1"
upperBound="-1" eType="#//FeatureGrant" containment="true" eOpposite="#//FeatureGrant/pack"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LicenseRequisites">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="issueDate" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="company" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="plan" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="product" lowerBound="1"
eType="#//ProductRef" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="valid" lowerBound="1" eType="#//ValidityPeriod"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ProductRef">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="product" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingServer">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="authentication" ordered="false"
unique="false" lowerBound="1" eType="#//EvaluationInstructions" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="UserGrant">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="user" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="authentication" lowerBound="1"
eType="#//EvaluationInstructions" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeatureGrant">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="feature" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="version" lowerBound="1"
eType="#//VersionMatch" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="valid" lowerBound="1" eType="#//ValidityPeriod"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="vivid" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="capacity" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="pack" lowerBound="1" eType="#//FloatingLicensePack"
eOpposite="#//FloatingLicensePack/features"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ValidityPeriod" abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="ValidityPeriodClosed" eSuperTypes="#//ValidityPeriod">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="from" ordered="false" unique="false"
lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="until" ordered="false"
unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EvaluationInstructions">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="expression" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VersionMatch">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="rule" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingLicenseAccess">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="user" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="server" lowerBound="1"
eType="#//FloatingServerConnection" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="originLicensePack" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingServerConnection">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ip" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="port" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="authentication" ordered="false"
unique="false" lowerBound="1" eType="#//EvaluationInstructions" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GrantAcqisition">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="feature" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="grant" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="user" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="created" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
</eClassifiers>
</ecore:EPackage>
2 changes: 1 addition & 1 deletion features/org.eclipse.passage.lic.licenses.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lic.licenses.feature"
label="%featureName"
version="1.0.100.qualifier"
version="1.0.101.qualifier"
provider-name="%providerName"
plugin="org.eclipse.passage.lic.licenses"
license-feature="org.eclipse.license"
Expand Down