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 #772

Merged
merged 4 commits into from
May 12, 2021
Merged

Bug 572650 upgrade licenses domain model #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
976c0f0
Bug 572650 upgrade `licenses` domain model
eparovyshnaya May 12, 2021
18d0738
Bug 572650 upgrade `licenses` domain model
eparovyshnaya May 12, 2021
680c5bf
Bug 572650 upgrade `licenses` domain model
eparovyshnaya May 12, 2021
3cc3bcb
Bug 572650 upgrade `licenses` domain model
eparovyshnaya May 12, 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
24 changes: 18 additions & 6 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 @@ -24,6 +24,18 @@
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="ValidityPeriodClosedDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="FloatingLicensePackDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.FloatingLicensePackDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="FloatingServerDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.FloatingServerDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="UserGrantDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.UserGrantDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="FeatureGrantDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.FeatureGrantDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="EvaluationInstructionsDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.EvaluationInstructionsDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="VersionMatchDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.VersionMatchDescriptor"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="LicensePlan" eSuperTypes="#//LicensePlanDescriptor">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
iD="true"/>
Expand Down Expand Up @@ -85,7 +97,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="licensePack" lowerBound="1"
eType="#//LicensePack" eOpposite="#//LicensePack/licenseGrants"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FloatingLicensePack">
<eClassifiers xsi:type="ecore:EClass" name="FloatingLicensePack" eSuperTypes="#//FloatingLicensePackDescriptor">
<eStructuralFeatures xsi:type="ecore:EReference" name="license" lowerBound="1"
eType="#//FloatingLicenseRequisites" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="host" lowerBound="1" eType="#//FloatingServer"
Expand Down Expand Up @@ -119,18 +131,18 @@
<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">
<eClassifiers xsi:type="ecore:EClass" name="FloatingServer" eSuperTypes="#//FloatingServerDescriptor">
<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">
<eClassifiers xsi:type="ecore:EClass" name="UserGrant" eSuperTypes="#//UserGrantDescriptor">
<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">
<eClassifiers xsi:type="ecore:EClass" name="FeatureGrant" eSuperTypes="#//FeatureGrantDescriptor">
<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"
Expand All @@ -153,12 +165,12 @@
<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">
<eClassifiers xsi:type="ecore:EClass" name="EvaluationInstructions" eSuperTypes="#//EvaluationInstructionsDescriptor">
<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">
<eClassifiers xsi:type="ecore:EClass" name="VersionMatch" eSuperTypes="#//VersionMatchDescriptor">
<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"/>
Expand Down
6 changes: 6 additions & 0 deletions bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,9 @@ _UI_PersonalLicenseRequisitesDescriptor_type = Personal License Requisites Descr
_UI_FloatingLicenseRequisitesDescriptor_type = Floating License Requisites Descriptor
_UI_ValidityPeriodDescriptor_type = Validity Period Descriptor
_UI_ValidityPeriodClosedDescriptor_type = Validity Period Closed Descriptor
_UI_FloatingLicensePackDescriptor_type = Floating License Pack Descriptor
_UI_FloatingServerDescriptor_type = Floating Server Descriptor
_UI_UserGrantDescriptor_type = User Grant Descriptor
_UI_FeatureGrantDescriptor_type = Feature Grant Descriptor
_UI_EvaluationInstructionsDescriptor_type = Evaluation Instructions Descriptor
_UI_VersionMatchDescriptor_type = Version Match Descriptor
Expand Down
115 changes: 0 additions & 115 deletions bundles/org.eclipse.passage.lic.licenses.model/.settings/.api_filters
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions bundles/org.eclipse.passage.lic.licenses.model/model/licenses.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//FloatingLicenseRequisitesDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//ValidityPeriodDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//ValidityPeriodClosedDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//FloatingLicensePackDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//FloatingServerDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//UserGrantDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//FeatureGrantDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//EvaluationInstructionsDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//VersionMatchDescriptor"/>
<genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePlan">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePlan/identifier"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePlan/name"/>
Expand Down
8 changes: 6 additions & 2 deletions ...nses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/EvaluationInstructions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import org.eclipse.emf.ecore.EObject;

import org.eclipse.passage.lic.licenses.EvaluationInstructionsDescriptor;

/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Evaluation Instructions</b></em>'.
Expand All @@ -28,10 +30,10 @@
* </ul>
*
* @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getEvaluationInstructions()
* @model
* @model superTypes="org.eclipse.passage.lic.licenses.model.api.EvaluationInstructionsDescriptor"
* @generated
*/
public interface EvaluationInstructions extends EObject {
public interface EvaluationInstructions extends EObject, EvaluationInstructionsDescriptor {
/**
* Returns the value of the '<em><b>Type</b></em>' attribute.
* <!-- begin-user-doc -->
Expand All @@ -42,6 +44,7 @@ public interface EvaluationInstructions extends EObject {
* @model required="true"
* @generated
*/
@Override
String getType();

/**
Expand All @@ -64,6 +67,7 @@ public interface EvaluationInstructions extends EObject {
* @model required="true"
* @generated
*/
@Override
String getExpression();

/**
Expand Down
13 changes: 11 additions & 2 deletions ...e.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FeatureGrant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import org.eclipse.emf.ecore.EObject;

import org.eclipse.passage.lic.licenses.FeatureGrantDescriptor;

/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Feature Grant</b></em>'.
Expand All @@ -33,10 +35,10 @@
* </ul>
*
* @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getFeatureGrant()
* @model
* @model superTypes="org.eclipse.passage.lic.licenses.model.api.FeatureGrantDescriptor"
* @generated
*/
public interface FeatureGrant extends EObject {
public interface FeatureGrant extends EObject, FeatureGrantDescriptor {
/**
* Returns the value of the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
Expand All @@ -47,6 +49,7 @@ public interface FeatureGrant extends EObject {
* @model id="true" required="true"
* @generated
*/
@Override
String getIdentifier();

/**
Expand All @@ -69,6 +72,7 @@ public interface FeatureGrant extends EObject {
* @model required="true"
* @generated
*/
@Override
String getFeature();

/**
Expand All @@ -91,6 +95,7 @@ public interface FeatureGrant extends EObject {
* @model containment="true" required="true"
* @generated
*/
@Override
VersionMatch getVersion();

/**
Expand All @@ -113,6 +118,7 @@ public interface FeatureGrant extends EObject {
* @model containment="true" required="true"
* @generated
*/
@Override
ValidityPeriod getValid();

/**
Expand All @@ -135,6 +141,7 @@ public interface FeatureGrant extends EObject {
* @model required="true"
* @generated
*/
@Override
long getVivid();

/**
Expand All @@ -157,6 +164,7 @@ public interface FeatureGrant extends EObject {
* @model required="true"
* @generated
*/
@Override
int getCapacity();

/**
Expand All @@ -181,6 +189,7 @@ public interface FeatureGrant extends EObject {
* @model opposite="features" required="true" transient="false"
* @generated
*/
@Override
FloatingLicensePack getPack();

/**
Expand Down
10 changes: 8 additions & 2 deletions ...icenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicensePack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import org.eclipse.emf.ecore.EObject;

import org.eclipse.passage.lic.licenses.FloatingLicensePackDescriptor;

/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Floating License Pack</b></em>'.
Expand All @@ -32,10 +34,10 @@
* </ul>
*
* @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getFloatingLicensePack()
* @model
* @model superTypes="org.eclipse.passage.lic.licenses.model.api.FloatingLicensePackDescriptor"
* @generated
*/
public interface FloatingLicensePack extends EObject {
public interface FloatingLicensePack extends EObject, FloatingLicensePackDescriptor {
/**
* Returns the value of the '<em><b>License</b></em>' containment reference.
* <!-- begin-user-doc -->
Expand All @@ -46,6 +48,7 @@ public interface FloatingLicensePack extends EObject {
* @model containment="true" required="true"
* @generated
*/
@Override
FloatingLicenseRequisites getLicense();

/**
Expand All @@ -68,6 +71,7 @@ public interface FloatingLicensePack extends EObject {
* @model containment="true" required="true"
* @generated
*/
@Override
FloatingServer getHost();

/**
Expand All @@ -90,6 +94,7 @@ public interface FloatingLicensePack extends EObject {
* @model containment="true" required="true"
* @generated
*/
@Override
EList<UserGrant> getUsers();

/**
Expand All @@ -104,6 +109,7 @@ public interface FloatingLicensePack extends EObject {
* @model opposite="pack" containment="true" required="true"
* @generated
*/
@Override
EList<FeatureGrant> getFeatures();

} // FloatingLicensePack
Loading