From 0de8c5fcfd03fa917882768ad7af805c13103e93 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 12:57:20 +0300 Subject: [PATCH 1/5] Bug 572897 lic api goes out from the shadows publish - `lic.api.requirements` - `base` implementation of core structures - `equinox implementation of requirement resolution services move `lic.equinox` requirements resolution services tests from `internal` to keep access to the corresponding package local structures Signed-off-by: eparovyshnaya --- .../lac/internal/gear/RuntimeConfiguration.java | 8 ++++---- .../fls/seal/BaseAccessCycleConfiguration.java | 8 ++++---- .../pde/core/templates/DefaultProductRequirement.java | 6 +++--- .../pde/ui/templates/BaseLicensedProductSection.java | 4 ++-- .../e3/LicensedE3ProductTemplateSection.java | 2 +- .../e4/LicensedE4ProductTemplateSection.java | 2 +- .../AntimagicShieldFeatureLicRequirement.java | 6 +++--- .../LicensedE4FullFeatherProductTemplateSection.java | 2 +- .../org.eclipse.passage.lic.api/META-INF/MANIFEST.MF | 8 +------- .../passage/lic/api/registry/RuntimeRegistry.java | 3 +++ .../lic/{internal => }/api/requirements/Feature.java | 5 +++-- .../{internal => }/api/requirements/Requirement.java | 5 +++-- .../api/requirements/ResolvedRequirements.java | 5 +++-- .../requirements/ResolvedRequirementsRegistry.java | 7 +++++-- .../lic/internal/api/AccessCycleConfiguration.java | 2 +- .../org/eclipse/passage/lic/internal/api/Passage.java | 2 +- .../lic/internal/api/conditions/MatchingRule.java | 2 +- .../api/restrictions/ExaminationCertificate.java | 2 +- .../restrictions/PermissionsExaminationService.java | 2 +- .../lic/internal/api/restrictions/Restriction.java | 2 +- .../org.eclipse.passage.lic.base/META-INF/MANIFEST.MF | 2 +- .../org/eclipse/passage/lic/base/access/Access.java | 2 ++ .../org/eclipse/passage/lic/base/access/Cycle.java | 2 +- .../eclipse/passage/lic/base/access/CycleFilter.java | 4 ++-- .../src/org/eclipse/passage/lic/base/access/Lock.java | 2 +- .../eclipse/passage/lic/base/access/Requirements.java | 6 +++--- .../eclipse/passage/lic/base/access/Restrictions.java | 2 +- .../passage/lic/base/access/SumOfCertificates.java | 2 +- .../{internal => }/base/requirements/BaseFeature.java | 6 +++--- .../base/requirements/BaseRequirement.java | 8 ++++---- .../base/requirements/RequirementsFeatureFilter.java | 6 +++--- .../base/requirements/UnsatisfiableRequirement.java | 8 ++++---- .../conditions/RequiredVersionVsAllowedVersion.java | 2 +- .../internal/base/diagnostic/RequirementStatus.java | 4 ++-- .../base/restrictions/BaseExaminationCertificate.java | 2 +- .../BasePermissionsExaminationService.java | 2 +- .../internal/base/restrictions/BaseRestriction.java | 2 +- .../base/restrictions/ExaminationExplained.java | 2 +- .../restrictions/RequirementDemandsExecutionStop.java | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../equinox/requirements/BundleManifest.java | 4 ++-- .../equinox/requirements/BundleName.java | 4 ++-- .../equinox/requirements/BundleRequirements.java | 7 ++++--- .../equinox/requirements/BundleVendor.java | 4 ++-- .../equinox/requirements/CapabilityLicFeatureId.java | 7 ++++--- .../requirements/CapabilityLicFeatureInfo.java | 4 ++-- .../requirements/CapabilityLicFeatureLevel.java | 7 ++++--- .../requirements/CapabilityLicFeatureName.java | 7 ++++--- .../requirements/CapabilityLicFeatureProvider.java | 7 ++++--- .../requirements/CapabilityLicFeatureVersion.java | 7 ++++--- .../equinox/requirements/ComponentLicFeatureId.java | 5 +++-- .../requirements/ComponentLicFeatureLevel.java | 5 +++-- .../equinox/requirements/ComponentLicFeatureName.java | 5 +++-- .../requirements/ComponentLicFeatureProvider.java | 5 +++-- .../requirements/ComponentLicFeatureVersion.java | 5 +++-- .../equinox/requirements/ComponentRequirements.java | 7 ++++--- .../LicCapabilityAttributesFromDeclaration.java | 6 +++--- .../equinox/requirements/LicCapabilityNamespace.java | 4 ++-- .../LicensingFeatureCapabilitiesFromBundle.java | 4 ++-- .../ProvidedCapabilitiesFromManifest.java | 4 ++-- .../requirements/RequirementFromAttributes.java | 10 +++++----- .../requirements/RequirementFromCapability.java | 6 +++--- .../requirements/RequirementFromComponent.java | 10 +++++----- .../equinox/requirements/RequirementToCapability.java | 7 ++++--- .../equinox/requirements/RequirementsFromBundle.java | 6 +++--- .../requirements/RequirementsFromManifest.java | 6 +++--- .../equinox/requirements/RequirementsToBundle.java | 7 ++++--- .../internal/json/AcquiredExaminationCertificate.java | 4 ++-- .../org/eclipse/passage/lic/internal/json/Json.java | 8 ++++---- .../passage/lic/internal/json/JsonObjectMapper.java | 4 ++-- .../lic/internal/json/RequirementSerializer.java | 4 ++-- .../loc/internal/licenses/core/LicenseSignature.java | 2 +- .../licenses/core/LicensingOperatorRequirement.java | 2 +- .../seal/OperatorAccessCycleConfiguration.java | 8 ++++---- .../internal/demo/BaseAccessCycleConfiguration.java | 8 ++++---- .../api/tests/ResolvedRequirementsContractTest.java | 6 +++--- .../lic/api/tests/fakes/requirements/FakeFeature.java | 4 ++-- .../api/tests/fakes/requirements/FakeRequirement.java | 6 +++--- .../fakes/requirements/FakeResolvedRequirements.java | 6 +++--- .../base/tests/requirements/RequirementsTest.java | 4 ++-- .../base/tests/requirements/SabotagedFramework.java | 2 +- .../BasePermissionsExaminationServiceTest.java | 4 ++-- .../tests/restrictions/ExaminationExplainedTest.java | 4 ++-- .../internal/base/tests/restrictions/TestState.java | 8 ++++---- .../equinox/requirements/BundleManifestTest.java | 5 +++-- .../equinox/requirements/BundleNameTest.java | 5 +++-- .../equinox/requirements/BundleRequirementsTest.java | 9 +++++---- .../equinox/requirements/BundleVendorTest.java | 5 +++-- .../requirements/CapabilityLicFeatureIdTest.java | 5 +++-- .../requirements/CapabilityLicFeatureInfoTest.java | 2 +- .../requirements/CapabilityLicFeatureNameTest.java | 5 +++-- .../CapabilityLicFeatureProviderTest.java | 5 +++-- .../CapabilityLicFeatureRestrictionTest.java | 5 +++-- .../requirements/CapabilityLicFeatureVersionTest.java | 5 +++-- .../requirements/ComponentRequirementsTest.java | 9 +++++---- .../equinox/requirements/DataBundle.java | 11 ++++++----- .../LicCapabilityAttributesFromDeclarationTest.java | 5 +++-- .../LicensingFeatureCapabilitiesFromBundleTest.java | 6 ++++-- .../ProvidedCapabilitiesFromManifestTest.java | 6 ++++-- .../requirements/RequirementsFromManifestTest.java | 7 ++++--- .../requirements/ResolvedRequirementsServiceTest.java | 8 ++++---- .../equinox/requirements/WriteLicCapablitiesTest.java | 7 ++++--- .../seal/demo/tests/DemoFrameworkContentTest.java | 10 +++++----- .../seal/demo/tests/access/AccessAssessmentTest.java | 6 +++--- 104 files changed, 281 insertions(+), 244 deletions(-) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/requirements/Feature.java (90%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/requirements/Requirement.java (93%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/requirements/ResolvedRequirements.java (95%) rename bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/{internal => }/api/requirements/ResolvedRequirementsRegistry.java (87%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/requirements/BaseFeature.java (93%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/requirements/BaseRequirement.java (90%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/requirements/RequirementsFeatureFilter.java (87%) rename bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/{internal => }/base/requirements/UnsatisfiableRequirement.java (90%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleManifest.java (95%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleName.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleRequirements.java (92%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleVendor.java (93%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureId.java (86%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureInfo.java (94%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureLevel.java (86%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureName.java (86%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureProvider.java (86%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureVersion.java (86%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentLicFeatureId.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentLicFeatureLevel.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentLicFeatureName.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentLicFeatureProvider.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentLicFeatureVersion.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentRequirements.java (93%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/LicCapabilityAttributesFromDeclaration.java (94%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/LicCapabilityNamespace.java (87%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java (94%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ProvidedCapabilitiesFromManifest.java (93%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementFromAttributes.java (91%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementFromCapability.java (92%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementFromComponent.java (90%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementToCapability.java (93%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementsFromBundle.java (95%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementsFromManifest.java (94%) rename bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementsToBundle.java (91%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleManifestTest.java (87%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleNameTest.java (84%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleRequirementsTest.java (78%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/BundleVendorTest.java (84%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureIdTest.java (86%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureInfoTest.java (96%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureNameTest.java (86%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureProviderTest.java (86%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureRestrictionTest.java (86%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/CapabilityLicFeatureVersionTest.java (85%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ComponentRequirementsTest.java (78%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/DataBundle.java (89%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java (93%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java (87%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java (95%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/RequirementsFromManifestTest.java (87%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/ResolvedRequirementsServiceTest.java (88%) rename tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/{internal => }/equinox/requirements/WriteLicCapablitiesTest.java (87%) diff --git a/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java b/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java index f855ed60c..e21230ddd 100644 --- a/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java +++ b/bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java @@ -27,9 +27,13 @@ import org.eclipse.passage.lic.api.io.StreamCodecRegistry; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.base.io.PathKeyKeeper; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; +import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; +import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; @@ -51,8 +55,6 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry; import org.eclipse.passage.lic.internal.base.acquire.PathLicenseAcquisitionService; @@ -61,8 +63,6 @@ import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpressionEvaluationService; import org.eclipse.passage.lic.internal.base.conditions.mining.PathResidentConditions; import org.eclipse.passage.lic.internal.base.conditions.mining.PersonalLicenseMiningEquipment; -import org.eclipse.passage.lic.internal.equinox.requirements.BundleRequirements; -import org.eclipse.passage.lic.internal.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.json.JsonConditionTransport; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.UserFilteringConditionTransport; import org.eclipse.passage.lic.internal.net.api.handle.NetRequest; diff --git a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java index 68656ac84..f09e418a3 100644 --- a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java @@ -26,9 +26,13 @@ import org.eclipse.passage.lic.api.io.StreamCodecRegistry; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper; +import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; +import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; @@ -45,8 +49,6 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry; import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermissionEmittingService; @@ -54,8 +56,6 @@ import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpressionEvaluationService; import org.eclipse.passage.lic.internal.base.conditions.mining.PersonalLicenseMiningEquipment; import org.eclipse.passage.lic.internal.base.restrictions.BasePermissionsExaminationService; -import org.eclipse.passage.lic.internal.equinox.requirements.BundleRequirements; -import org.eclipse.passage.lic.internal.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; import org.eclipse.passage.lic.oshi.HardwareAssessmentService; import org.eclipse.passage.lic.oshi.HardwareEnvironment; diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java b/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java index 5060acd20..9d692dd15 100644 --- a/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java @@ -14,10 +14,10 @@ import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; @SuppressWarnings("restriction") public final class DefaultProductRequirement implements Supplier { diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java index 8e0b3ae02..5038b3dbe 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java @@ -27,8 +27,8 @@ import org.eclipse.passage.ldc.internal.pde.core.templates.products.ProductIdentifierOptionId; import org.eclipse.passage.ldc.internal.pde.core.templates.products.ProductNameOptionId; import org.eclipse.passage.ldc.internal.pde.core.templates.products.ProductVersionVersionOptionId; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.equinox.requirements.RequirementsToBundle; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.equinox.requirements.RequirementsToBundle; import org.eclipse.pde.core.plugin.IMatchRules; import org.eclipse.pde.core.plugin.IPluginBase; import org.eclipse.pde.core.plugin.IPluginElement; diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java index 514dc0449..96dde50f4 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java @@ -25,7 +25,7 @@ import org.eclipse.passage.ldc.internal.pde.ui.templates.BaseLicensedProductSection; import org.eclipse.passage.ldc.internal.pde.ui.templates.HelpContexts; import org.eclipse.passage.ldc.internal.pde.ui.templates.i18n.PdeUiTemplatesMessages; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.pde.core.plugin.IPluginBase; import org.eclipse.pde.core.plugin.IPluginElement; import org.eclipse.pde.core.plugin.IPluginExtension; diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java index 0ce0b879a..671e8e200 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java @@ -25,7 +25,7 @@ import org.eclipse.passage.ldc.internal.pde.ui.templates.BaseLicensedProductSection; import org.eclipse.passage.ldc.internal.pde.ui.templates.HelpContexts; import org.eclipse.passage.ldc.internal.pde.ui.templates.i18n.PdeUiTemplatesMessages; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.pde.core.plugin.IPluginBase; import org.eclipse.pde.core.plugin.IPluginElement; import org.eclipse.pde.core.plugin.IPluginExtension; diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java index f6ddb6699..a206b0f9f 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java @@ -14,10 +14,10 @@ import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; @SuppressWarnings("restriction") public final class AntimagicShieldFeatureLicRequirement implements Supplier { diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java index e93dd04d9..87c53c768 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/src/org/eclipse/passage/ldc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java @@ -26,7 +26,7 @@ import org.eclipse.passage.ldc.internal.pde.ui.templates.BaseLicensedProductSection; import org.eclipse.passage.ldc.internal.pde.ui.templates.HelpContexts; import org.eclipse.passage.ldc.internal.pde.ui.templates.i18n.PdeUiTemplatesMessages; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.pde.core.plugin.IPluginBase; import org.eclipse.pde.core.plugin.IPluginElement; import org.eclipse.pde.core.plugin.IPluginExtension; diff --git a/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF index 9ed6f49a8..a922b730f 100644 --- a/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Export-Package: org.eclipse.passage.lic.api.access, org.eclipse.passage.lic.api.inspection, org.eclipse.passage.lic.api.io, org.eclipse.passage.lic.api.registry, + org.eclipse.passage.lic.api.requirements, org.eclipse.passage.lic.internal.api; x-friends:="org.eclipse.passage.lac, org.eclipse.passage.lac.gear, @@ -113,13 +114,6 @@ Export-Package: org.eclipse.passage.lic.api.access, org.eclipse.passage.lic.jetty, org.eclipse.passage.lbc.jetty", org.eclipse.passage.lic.internal.api.observatory;x-friends:="org.eclipse.passage.lic.base", - org.eclipse.passage.lic.internal.api.requirements; - x-friends:="org.eclipse.passage.lic.base, - org.eclipse.passage.lic.equinox, - org.eclipse.passage.lic.equinox.tests, - org.eclipse.passage.lic.json, - org.eclipse.passage.seal.demo.tests, - org.eclipse.passage.lic.jface", org.eclipse.passage.lic.internal.api.restrictions; x-friends:="org.eclipse.passage.lbc.api, org.eclipse.passage.lbc.base, diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/registry/RuntimeRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/registry/RuntimeRegistry.java index 76028a72e..23602a096 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/registry/RuntimeRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/registry/RuntimeRegistry.java @@ -12,6 +12,9 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.registry; +/** + * @since 1.1 + */ public interface RuntimeRegistry> extends Registry { void register(S service); diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/Feature.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/Feature.java similarity index 90% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/Feature.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/Feature.java index 67c7c1a48..84510eeea 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/Feature.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/Feature.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.requirements; +package org.eclipse.passage.lic.api.requirements; /** *

@@ -22,6 +22,7 @@ * * @see Requirement * @see org.eclipse.passage.lic.api + * @since 1.1 */ public interface Feature { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/Requirement.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/Requirement.java similarity index 93% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/Requirement.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/Requirement.java index 1f9c8f922..6417270a8 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/Requirement.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/Requirement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.requirements; +package org.eclipse.passage.lic.api.requirements; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; @@ -21,6 +21,7 @@ * {@link ResolvedRequirements}s. * * @see ResolvedRequirements + * @since 1.1 */ public interface Requirement { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirements.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/ResolvedRequirements.java similarity index 95% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirements.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/ResolvedRequirements.java index c8582e080..2f1c50d1c 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirements.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/ResolvedRequirements.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.requirements; +package org.eclipse.passage.lic.api.requirements; import java.util.Collection; @@ -42,6 +42,7 @@ * * @see Requirement * @see org.eclipse.passage.lic.api + * @since 1.1 */ public interface ResolvedRequirements extends Service { diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirementsRegistry.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/ResolvedRequirementsRegistry.java similarity index 87% rename from bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirementsRegistry.java rename to bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/ResolvedRequirementsRegistry.java index 0eaf84289..88d422fd5 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/requirements/ResolvedRequirementsRegistry.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/requirements/ResolvedRequirementsRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.api.requirements; +package org.eclipse.passage.lic.api.requirements; import java.util.function.Supplier; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +/** + * @since 1.1 + */ public interface ResolvedRequirementsRegistry extends Supplier> { } diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java index b064b7e9e..399ab4e10 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java @@ -16,6 +16,7 @@ import org.eclipse.passage.lic.api.io.HashesRegistry; import org.eclipse.passage.lic.api.io.KeyKeeperRegistry; import org.eclipse.passage.lic.api.io.StreamCodecRegistry; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.acquire.LicenseAcquisitionServicesRegistry; import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry; import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionPasringRegistry; @@ -24,7 +25,6 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry; /** diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java index 25ae8f404..773115206 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java @@ -13,8 +13,8 @@ package org.eclipse.passage.lic.internal.api; import org.eclipse.passage.lic.api.access.GrantLockAttempt; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java index bf5f38a2d..87a55507d 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.api.conditions; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; /** *

diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java index 80a4beab1..b13fd6722 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java @@ -15,8 +15,8 @@ import java.time.ZonedDateTime; import java.util.Collection; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; /** *

diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java index 3b15a574b..d2f977359 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java @@ -16,9 +16,9 @@ import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; /** *

diff --git a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java index 8c1e39ca4..451fb5819 100644 --- a/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java +++ b/bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java @@ -12,10 +12,10 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.api.restrictions; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; /** *

diff --git a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF index afdca45c5..e9675b2b8 100644 --- a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.passage.lic.api;bundle-version="1.0.0";visibility:=r Export-Package: org.eclipse.passage.lic.base.access, org.eclipse.passage.lic.base.io, org.eclipse.passage.lic.base.registry, + org.eclipse.passage.lic.base.requirements, org.eclipse.passage.lic.internal.base; x-friends:="org.eclipse.passage.lac, org.eclipse.passage.lbc.base, @@ -69,7 +70,6 @@ Export-Package: org.eclipse.passage.lic.base.access, org.eclipse.passage.lic.internal.base.inspection.hardware;x-friends:="org.eclipse.passage.loc.licenses.core,org.eclipse.passage.lic.oshi", org.eclipse.passage.lic.internal.base.logging;x-friends:="org.eclipse.passage.lic.jetty", org.eclipse.passage.lic.internal.base.observatory;x-internal:=true, - org.eclipse.passage.lic.internal.base.requirements;x-friends:="org.eclipse.passage.lic.equinox,org.eclipse.passage.lic.json", org.eclipse.passage.lic.internal.base.restrictions; x-friends:="org.eclipse.passage.lic.jface, org.eclipse.passage.lic.equinox, diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Access.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Access.java index a616e99de..802b3ed1d 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Access.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Access.java @@ -26,6 +26,8 @@ /** * Top-level access cycle + * + * @since 1.1 */ public final class Access { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java index 859f4043f..9ef172a14 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java @@ -20,12 +20,12 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java index 0bb083393..3c570c5f5 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java @@ -15,11 +15,11 @@ import java.util.Collection; import java.util.function.Function; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.RequirementsFeatureFilter; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.conditions.ConditionsFeatureFilter; -import org.eclipse.passage.lic.internal.base.requirements.RequirementsFeatureFilter; final class CycleFilter { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java index 489258f1d..f8df7b232 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Lock.java @@ -16,6 +16,7 @@ import java.util.stream.Collectors; import org.eclipse.passage.lic.api.access.GrantLockAttempt; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition; @@ -25,7 +26,6 @@ import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Requirements.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Requirements.java index 884903e23..b20fb0fad 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Requirements.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Requirements.java @@ -22,17 +22,17 @@ import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.base.requirements.RequirementsFeatureFilter; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.internal.base.diagnostic.code.NoRequirements; import org.eclipse.passage.lic.internal.base.diagnostic.code.NoServicesOfType; import org.eclipse.passage.lic.internal.base.i18n.BaseMessages; -import org.eclipse.passage.lic.internal.base.requirements.RequirementsFeatureFilter; /** * @since 1.1 diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java index 468934716..efe56818d 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Restrictions.java @@ -17,11 +17,11 @@ import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java index 0a9e51ff8..b93c4482c 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/SumOfCertificates.java @@ -17,8 +17,8 @@ import java.util.function.Function; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.base.SumOfCollections; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/BaseFeature.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java similarity index 93% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/BaseFeature.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java index dcc8fcc3b..79e53d6a9 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/BaseFeature.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseFeature.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.requirements; +package org.eclipse.passage.lic.base.requirements; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Feature; /** * Base data driven implementation of a {@linkplain Feature} descriptor. diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/BaseRequirement.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java similarity index 90% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/BaseRequirement.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java index a395c125d..7cf35e812 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/BaseRequirement.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/BaseRequirement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,12 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.requirements; +package org.eclipse.passage.lic.base.requirements; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; /** diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/RequirementsFeatureFilter.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java similarity index 87% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/RequirementsFeatureFilter.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java index ce649b898..e6548cd72 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/RequirementsFeatureFilter.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/RequirementsFeatureFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,12 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.requirements; +package org.eclipse.passage.lic.base.requirements; import java.util.Optional; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.FeatureFilter; public final class RequirementsFeatureFilter implements Supplier> { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/UnsatisfiableRequirement.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java similarity index 90% rename from bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/UnsatisfiableRequirement.java rename to bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java index 8ebb75ed1..70a4260af 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/requirements/UnsatisfiableRequirement.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/requirements/UnsatisfiableRequirement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.base.requirements; +package org.eclipse.passage.lic.base.requirements; import java.util.Objects; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; /** diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java index 441dec492..73f6d95b2 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/RequiredVersionVsAllowedVersion.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Objects; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.version.DefaultVersion; import org.eclipse.passage.lic.internal.base.version.NumericalVersion; import org.eclipse.passage.lic.internal.base.version.SafeVersion; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/RequirementStatus.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/RequirementStatus.java index 32797e90a..f025d313a 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/RequirementStatus.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/RequirementStatus.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.passage.lic.internal.base.diagnostic; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.base.i18n.ExaminationExplanedMessages; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java index 745b2e273..22f262b8e 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseExaminationCertificate.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Objects; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java index 93b559507..c7268fef8 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BasePermissionsExaminationService.java @@ -19,9 +19,9 @@ import java.util.stream.Collectors; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseRestriction.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseRestriction.java index 6760a2178..3f644bba0 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseRestriction.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/BaseRestriction.java @@ -14,9 +14,9 @@ import java.util.Objects; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; public final class BaseRestriction implements Restriction { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java index e27850302..05c929ab6 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/ExaminationExplained.java @@ -20,9 +20,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.base.diagnostic.SumOfLists; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/RequirementDemandsExecutionStop.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/RequirementDemandsExecutionStop.java index ea958338c..044e5c92c 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/RequirementDemandsExecutionStop.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/restrictions/RequirementDemandsExecutionStop.java @@ -14,7 +14,7 @@ import java.util.function.Predicate; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevelComparator; diff --git a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF index 326f2b471..40488b3b1 100644 --- a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.equinox Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.equinox -Bundle-Version: 2.0.2.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.base;bundle-version="1.0.0";visibility:=reexport, org.apache.logging.log4j;bundle-version="2.8.2" Export-Package: org.eclipse.passage.lic.equinox.io, + org.eclipse.passage.lic.equinox.requirements, org.eclipse.passage.lic.internal.equinox; x-friends:="org.eclipse.passage.lac, org.eclipse.passage.lic.e4.ui, @@ -37,8 +38,7 @@ Export-Package: org.eclipse.passage.lic.equinox.io, org.eclipse.passage.loc.products.core, org.eclipse.passage.loc.licenses.core, org.eclipse.passage.loc.users.core, - org.eclipse.passage.lbc.jetty", - org.eclipse.passage.lic.internal.equinox.requirements;x-internal:=true + org.eclipse.passage.lbc.jetty" Bundle-ActivationPolicy: lazy Provide-Capability: licensing.management;licensing.management="equinox";version="1.0.0" diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleManifest.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleManifest.java similarity index 95% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleManifest.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleManifest.java index 520b2285a..0dff51a00 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleManifest.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleManifest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.io.IOException; import java.io.InputStreamReader; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleName.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleName.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleName.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleName.java index 2517dff27..d0037e320 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleName.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleName.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Objects; import java.util.function.Supplier; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleRequirements.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java similarity index 92% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleRequirements.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java index 32aa3344e..c2a94ad13 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleRequirements.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.Collection; @@ -18,10 +18,10 @@ import java.util.Optional; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceCannotOperate; @@ -38,6 +38,7 @@ * * @see Requirement * @see ResolvedRequirements + * @since 2.0 */ public final class BundleRequirements implements ResolvedRequirements { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleVendor.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleVendor.java similarity index 93% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleVendor.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleVendor.java index 47364df70..3e629ae25 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleVendor.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleVendor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Objects; import java.util.Optional; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureId.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java similarity index 86% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureId.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java index 8d090a190..272e403d8 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureId.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; /** @@ -22,6 +22,7 @@ * {@code Capability}'s attributes. * * @see NamedData + * @since 2.0 */ public final class CapabilityLicFeatureId extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureInfo.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfo.java similarity index 94% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureInfo.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfo.java index 932913413..d16440a7d 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureInfo.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureLevel.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java similarity index 86% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureLevel.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java index 642ce95ea..6af27cab9 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureLevel.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; /** @@ -22,6 +22,7 @@ * licensing from a {@code Capability}'s attributes. * * @see NamedData + * @since 2.0 */ public final class CapabilityLicFeatureLevel extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureName.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java similarity index 86% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureName.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java index a5d27f73a..3e2fd1efc 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureName.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; /** @@ -22,6 +22,7 @@ * {@code Capability}'s attributes. * * @see NamedData + * @since 2.0 */ public final class CapabilityLicFeatureName extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureProvider.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java similarity index 86% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureProvider.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java index c3909c848..9cfe37c9e 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureProvider.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; /** @@ -22,6 +22,7 @@ * licensing from a {@code Capability}'s attributes. * * @see NamedData + * @since 2.0 */ public final class CapabilityLicFeatureProvider extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureVersion.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java similarity index 86% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureVersion.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java index e62d258ad..d1243b271 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureVersion.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; /** @@ -22,6 +22,7 @@ * licensing from a {@code Capability}'s attributes. * * @see NamedData + * @since 2.0 */ public final class CapabilityLicFeatureVersion extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureId.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureId.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java index b65433340..d57a34a58 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureId.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; @@ -22,6 +22,7 @@ * {@code OSGi component}'s properties. * * @see NamedData + * @since 2.0 */ public final class ComponentLicFeatureId extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureLevel.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureLevel.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java index c69d9cc55..8b5a31f81 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureLevel.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; @@ -23,6 +23,7 @@ * {@code OSGi component}'s properties for the requirement under construction. * * @see NamedData + * @since 2.0 */ public final class ComponentLicFeatureLevel extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureName.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureName.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java index b54abb648..a0ff92bd0 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureName.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; @@ -22,6 +22,7 @@ * {@code OSGi component}'s properties. * * @see NamedData + * @since 2.0 */ public final class ComponentLicFeatureName extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureProvider.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureProvider.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java index 1a4b6853a..32554c39d 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureProvider.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; @@ -22,6 +22,7 @@ * properties. * * @see NamedData + * @since 2.0 */ public final class ComponentLicFeatureProvider extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureVersion.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureVersion.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java index 222290f2c..c182fa3d4 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentLicFeatureVersion.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; @@ -22,6 +22,7 @@ * licensing from a {@code OSGi component}'s properties. * * @see NamedData + * @since 2.0 */ public final class ComponentLicFeatureVersion extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentRequirements.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java similarity index 93% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentRequirements.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java index c0c44b0cb..7ad9e9fe1 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentRequirements.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java @@ -10,17 +10,17 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collection; import java.util.Optional; import java.util.stream.Collectors; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceCannotOperate; import org.eclipse.passage.lic.internal.equinox.i18n.EquinoxMessages; @@ -34,6 +34,7 @@ * * @see Requirement * @see ResolvedRequirements + * @since 2.0 */ public final class ComponentRequirements implements ResolvedRequirements { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityAttributesFromDeclaration.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclaration.java similarity index 94% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityAttributesFromDeclaration.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclaration.java index 4a14bc31e..862694c91 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityAttributesFromDeclaration.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclaration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.ArrayList; import java.util.Arrays; @@ -22,8 +22,8 @@ import java.util.function.Function; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensingException; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.KeyValuePairs; /** diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityNamespace.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityNamespace.java similarity index 87% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityNamespace.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityNamespace.java index 33f841a76..7c0f8b5b4 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityNamespace.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityNamespace.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.function.Supplier; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java similarity index 94% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java index d2f957209..11c1d208d 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collections; import java.util.List; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ProvidedCapabilitiesFromManifest.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifest.java similarity index 93% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ProvidedCapabilitiesFromManifest.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifest.java index 163022558..15e468e20 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/ProvidedCapabilitiesFromManifest.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Objects; import java.util.Optional; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromAttributes.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromAttributes.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromAttributes.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromAttributes.java index 770981b28..80a3e742f 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromAttributes.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromAttributes.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collection; import java.util.Collections; @@ -19,14 +19,14 @@ import java.util.function.Supplier; import org.eclipse.osgi.util.NLS; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnMorsel; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.base.restrictions.DefaultRestrictionLevel; import org.eclipse.passage.lic.internal.base.version.DefaultVersion; import org.eclipse.passage.lic.internal.base.version.SafeVersion; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromCapability.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromCapability.java similarity index 92% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromCapability.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromCapability.java index db531f38a..7c60c2c4e 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromCapability.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromCapability.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collection; import java.util.Map; @@ -18,9 +18,9 @@ import java.util.function.Supplier; import org.eclipse.osgi.util.NLS; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnMorsel; import org.eclipse.passage.lic.internal.equinox.i18n.EquinoxMessages; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromComponent.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromComponent.java similarity index 90% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromComponent.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromComponent.java index eb1228b44..1143ad564 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementFromComponent.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementFromComponent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Map; import java.util.Optional; import java.util.function.Supplier; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.base.restrictions.DefaultRestrictionLevel; import org.eclipse.passage.lic.internal.base.version.DefaultVersion; import org.eclipse.passage.lic.internal.base.version.SafeVersion; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementToCapability.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java similarity index 93% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementToCapability.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java index 5c7c7b010..9d4584559 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementToCapability.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementToCapability.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.Optional; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; import org.eclipse.passage.lic.internal.base.StringNamedData; @@ -33,6 +33,7 @@ * RequirementToCapability(requirement)).write(target); * * @see NamedData.Writable + * @since 2.0 */ public final class RequirementToCapability implements NamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromBundle.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromBundle.java similarity index 95% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromBundle.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromBundle.java index 8d8e775db..c87c859e2 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromBundle.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromBundle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,16 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Optional; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.BaseNamedData; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromManifest.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifest.java similarity index 94% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromManifest.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifest.java index 56cf475b6..418d030ce 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromManifest.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.ArrayList; import java.util.Collection; @@ -18,10 +18,10 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.SumOfCollections; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnMorsel; diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsToBundle.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java similarity index 91% rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsToBundle.java rename to bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java index 551906d46..1a36598c5 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsToBundle.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.NamedData; /** @@ -33,6 +33,7 @@ * � * * @see NamedData.Writable + * @since 2.0 */ public final class RequirementsToBundle implements NamedData> { diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java index 2a44a6157..0546e0d90 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/AcquiredExaminationCertificate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Objects; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java index b8f11c651..0721653a9 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/Json.java @@ -16,6 +16,10 @@ import java.time.format.DateTimeFormatter; import java.util.function.Function; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.conditions.Condition; @@ -23,8 +27,6 @@ import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel.Of; @@ -37,8 +39,6 @@ import org.eclipse.passage.lic.internal.base.conditions.BaseVersionMatch; import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleForIdentifier; import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.base.restrictions.BaseRestriction; import com.fasterxml.jackson.databind.JsonNode; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java index 993f0a270..9710b28a0 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/JsonObjectMapper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -16,8 +16,8 @@ import java.util.function.Function; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.conditions.Condition; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.core.JsonParser; diff --git a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequirementSerializer.java b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequirementSerializer.java index 05b9929fb..3befe1957 100644 --- a/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequirementSerializer.java +++ b/bundles/org.eclipse.passage.lic.json/src/org/eclipse/passage/lic/internal/json/RequirementSerializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ import java.io.IOException; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java index 4cf972a63..60cdcb692 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseSignature.java @@ -17,12 +17,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.Framework; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; import org.eclipse.passage.lic.internal.api.conditions.ConditionOrigin; import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.internal.base.diagnostic.DiagnosticExplained; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java index aab91db5c..7c8ffd528 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicensingOperatorRequirement.java @@ -15,8 +15,8 @@ import java.util.Optional; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.LicensedProduct; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorAccessCycleConfiguration.java b/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorAccessCycleConfiguration.java index 27a23627a..5d52a3512 100644 --- a/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.loc.operator.seal/src/org/eclipse/passage/loc/operator/seal/OperatorAccessCycleConfiguration.java @@ -25,9 +25,13 @@ import org.eclipse.passage.lic.api.io.StreamCodecRegistry; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper; +import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; +import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; @@ -49,8 +53,6 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditions; import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry; import org.eclipse.passage.lic.internal.base.acquire.UserHomeLicenseAcquisitionService; @@ -64,8 +66,6 @@ import org.eclipse.passage.lic.internal.equinox.acquire.InstallationLicenseAcquisitionService; import org.eclipse.passage.lic.internal.equinox.conditions.ConfigurationResidentConditions; import org.eclipse.passage.lic.internal.equinox.conditions.InstallationResidentConditions; -import org.eclipse.passage.lic.internal.equinox.requirements.BundleRequirements; -import org.eclipse.passage.lic.internal.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; import org.eclipse.passage.lic.oshi.HardwareAssessmentService; import org.eclipse.passage.lic.oshi.HardwareEnvironment; diff --git a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/BaseAccessCycleConfiguration.java b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/BaseAccessCycleConfiguration.java index 6d3131e77..728f2d0ba 100644 --- a/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/BaseAccessCycleConfiguration.java +++ b/bundles/org.eclipse.passage.seal.demo/src/org/eclipse/passage/seal/internal/demo/BaseAccessCycleConfiguration.java @@ -23,9 +23,13 @@ import org.eclipse.passage.lic.api.io.StreamCodecRegistry; import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.bc.BcStreamCodec; import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper; +import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; +import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; @@ -42,8 +46,6 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.ContentType; import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry; import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermissionEmittingService; @@ -51,8 +53,6 @@ import org.eclipse.passage.lic.internal.base.conditions.evaluation.SimpleMapExpressionEvaluationService; import org.eclipse.passage.lic.internal.base.conditions.mining.PersonalLicenseMiningEquipment; import org.eclipse.passage.lic.internal.base.restrictions.BasePermissionsExaminationService; -import org.eclipse.passage.lic.internal.equinox.requirements.BundleRequirements; -import org.eclipse.passage.lic.internal.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.json.JsonConditionTransport; import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport; import org.eclipse.passage.lic.oshi.HardwareAssessmentService; diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java index 87805a220..b38305d27 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ResolvedRequirementsContractTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -15,9 +15,9 @@ import java.util.Collection; import java.util.function.Supplier; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.api.tests.fakes.requirements.FakeRequirement; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; /** * Each requirement resolution service must follow the contract. diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java index 18e051bac..bbe27693a 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeFeature.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.fakes.requirements; -import org.eclipse.passage.lic.internal.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Feature; @SuppressWarnings("restriction") public final class FakeFeature implements Feature { diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java index 0bac24c64..f8361050f 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeRequirement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.api.tests.fakes.requirements; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java index e7f42c943..07e2d0b9a 100644 --- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java +++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/fakes/requirements/FakeResolvedRequirements.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -16,10 +16,10 @@ import java.util.Collections; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.api.tests.fakes.FakeServiceInvocationResult; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; @SuppressWarnings("restriction") public final class FakeResolvedRequirements implements ResolvedRequirements { diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/RequirementsTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/RequirementsTest.java index 1c877a811..9c1f6817f 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/RequirementsTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/RequirementsTest.java @@ -19,12 +19,12 @@ import java.util.Collection; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.api.tests.fakes.requirements.FakeResolvedRequirements; import org.eclipse.passage.lic.base.access.Requirements; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; import org.eclipse.passage.lic.internal.base.diagnostic.code.NoRequirements; import org.eclipse.passage.lic.internal.base.diagnostic.code.NoServicesOfType; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java index db2a93e02..e090ac17e 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/requirements/SabotagedFramework.java @@ -21,6 +21,7 @@ import org.eclipse.passage.lic.api.registry.Registry; import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.api.registry.ServiceId; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry; import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration; import org.eclipse.passage.lic.internal.api.Framework; @@ -33,7 +34,6 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransportRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.MinedConditionsRegistry; import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationServicesRegistry; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java index 4cb933293..c38685131 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/BasePermissionsExaminationServiceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -21,11 +21,11 @@ import java.util.Collections; import java.util.Optional; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.api.tests.fakes.conditions.FakeLicensedProduct; import org.eclipse.passage.lic.api.tests.resrictions.PermissionsExaminationServiceContractTest; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.api.restrictions.PermissionsExaminationService; import org.eclipse.passage.lic.internal.api.restrictions.Restriction; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java index c3e1083e3..a30a1ce27 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/ExaminationExplainedTest.java @@ -18,6 +18,8 @@ import java.time.ZonedDateTime; import java.util.Collections; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; @@ -31,8 +33,6 @@ import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleCompatible; import org.eclipse.passage.lic.internal.base.conditions.UnknownConditionOrigin; import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.base.restrictions.BaseExaminationCertificate; import org.eclipse.passage.lic.internal.base.restrictions.BaseRestriction; import org.eclipse.passage.lic.internal.base.restrictions.ExaminationExplained; diff --git a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java index 924ccdc33..adeac0b79 100644 --- a/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java +++ b/tests/org.eclipse.passage.lic.base.tests/src/org/eclipse/passage/lic/internal/base/tests/restrictions/TestState.java @@ -14,12 +14,14 @@ import java.time.ZonedDateTime; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; import org.eclipse.passage.lic.internal.api.EvaluationType; import org.eclipse.passage.lic.internal.api.LicensedProduct; import org.eclipse.passage.lic.internal.api.conditions.Condition; import org.eclipse.passage.lic.internal.api.conditions.evaluation.Permission; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.base.BaseLicensedProduct; import org.eclipse.passage.lic.internal.base.conditions.BaseCondition; @@ -30,8 +32,6 @@ import org.eclipse.passage.lic.internal.base.conditions.MatchingRuleEquivalent; import org.eclipse.passage.lic.internal.base.conditions.UnknownConditionOrigin; import org.eclipse.passage.lic.internal.base.conditions.evaluation.BasePermission; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; @SuppressWarnings("restriction") final class TestState { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleManifestTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java similarity index 87% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleManifestTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java index 40faa463e..04977a7ef 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleManifestTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleManifestTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,11 +10,12 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; +import org.eclipse.passage.lic.equinox.requirements.BundleManifest; import org.eclipse.passage.lic.internal.api.LicensingException; import org.junit.Test; import org.osgi.framework.Bundle; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleNameTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java similarity index 84% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleNameTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java index 3d93d659d..2e5748616 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleNameTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleNameTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,10 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; +import org.eclipse.passage.lic.equinox.requirements.BundleName; import org.junit.Test; public final class BundleNameTest { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleRequirementsTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java similarity index 78% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleRequirementsTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java index 68b0799e0..8937cc1cc 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleRequirementsTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirementsTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Set; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; /** * Integration test: requires OSGi running diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleVendorTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java similarity index 84% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleVendorTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java index 2c2880fc4..0e1383bca 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/BundleVendorTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/BundleVendorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,10 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; +import org.eclipse.passage.lic.equinox.requirements.BundleVendor; import org.junit.Test; public final class BundleVendorTest { diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureIdTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java similarity index 86% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureIdTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java index d5cca292e..f1b0c822c 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureIdTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureIdTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureId; import org.eclipse.passage.lic.internal.base.StringNamedData; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureInfoTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java similarity index 96% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureInfoTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java index 607c9c9ba..d990c4e90 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureInfoTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureInfoTest.java @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureNameTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java similarity index 86% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureNameTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java index 1cedcc722..a98bf1932 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureNameTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureNameTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureName; import org.eclipse.passage.lic.internal.base.StringNamedData; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureProviderTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java similarity index 86% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureProviderTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java index e50ed0703..8371191dc 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureProviderTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProviderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Collections; import java.util.Map; import java.util.Set; +import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureProvider; import org.eclipse.passage.lic.internal.base.StringNamedData; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureRestrictionTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java similarity index 86% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureRestrictionTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java index d4b11b23d..8dee102cb 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureRestrictionTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureRestrictionTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureLevel; import org.eclipse.passage.lic.internal.base.StringNamedData; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureVersionTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java similarity index 85% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureVersionTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java index 472f908d4..dfb93cc97 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/CapabilityLicFeatureVersionTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersionTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,13 +10,14 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureVersion; import org.eclipse.passage.lic.internal.base.StringNamedData; @SuppressWarnings("restriction") diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentRequirementsTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java similarity index 78% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentRequirementsTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java index d3e02b60c..edeacc01c 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ComponentRequirementsTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirementsTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,12 +10,13 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Set; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; /** * Integration test: requires OSGi running diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/DataBundle.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java similarity index 89% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/DataBundle.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java index 91bd9bae1..fde01f9b3 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/DataBundle.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/DataBundle.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import java.util.Arrays; import java.util.HashSet; @@ -18,11 +18,12 @@ import java.util.Set; import org.eclipse.core.runtime.Platform; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.base.requirements.BaseFeature; +import org.eclipse.passage.lic.base.requirements.BaseRequirement; +import org.eclipse.passage.lic.equinox.requirements.LicensingFeatureCapabilitiesFromBundle; import org.eclipse.passage.lic.internal.api.restrictions.RestrictionLevel; import org.eclipse.passage.lic.internal.base.Cached; -import org.eclipse.passage.lic.internal.base.requirements.BaseFeature; -import org.eclipse.passage.lic.internal.base.requirements.BaseRequirement; import org.osgi.framework.Bundle; import org.osgi.framework.wiring.BundleCapability; import org.osgi.framework.wiring.BundleWiring; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java similarity index 93% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java index 8cf1a5f6f..b51dbda2f 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicCapabilityAttributesFromDeclarationTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Optional; +import org.eclipse.passage.lic.equinox.requirements.LicCapabilityAttributesFromDeclaration; import org.eclipse.passage.lic.internal.api.LicensingException; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java similarity index 87% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java index 5c6307d01..a2d9dbb51 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/LicensingFeatureCapabilitiesFromBundleTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -22,6 +22,8 @@ import java.util.Optional; import java.util.stream.Collectors; +import org.eclipse.passage.lic.equinox.requirements.CapabilityLicFeatureId; +import org.eclipse.passage.lic.equinox.requirements.LicensingFeatureCapabilitiesFromBundle; import org.junit.Test; import org.osgi.framework.wiring.BundleCapability; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java similarity index 95% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java index 31921192d..c928746ff 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ProvidedCapabilitiesFromManifestTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -18,6 +18,8 @@ import java.util.Optional; +import org.eclipse.passage.lic.equinox.requirements.BundleManifest; +import org.eclipse.passage.lic.equinox.requirements.ProvidedCapabilitiesFromManifest; import org.eclipse.passage.lic.internal.api.LicensingException; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromManifestTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java similarity index 87% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromManifestTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java index 94c64b7de..dc343f0c0 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/RequirementsFromManifestTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/RequirementsFromManifestTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,15 +10,16 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Collection; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.equinox.requirements.RequirementsFromManifest; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.base.diagnostic.NoErrors; import org.eclipse.passage.lic.internal.base.diagnostic.NoSevereErrors; import org.junit.Test; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ResolvedRequirementsServiceTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ResolvedRequirementsServiceTest.java similarity index 88% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ResolvedRequirementsServiceTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ResolvedRequirementsServiceTest.java index 2db6c93e1..e457cff60 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/ResolvedRequirementsServiceTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/ResolvedRequirementsServiceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -21,10 +21,10 @@ import java.util.Set; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.api.tests.ResolvedRequirementsContractTest; +import org.eclipse.passage.lic.base.requirements.RequirementsFeatureFilter; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; -import org.eclipse.passage.lic.internal.base.requirements.RequirementsFeatureFilter; import org.junit.Test; import org.osgi.framework.InvalidSyntaxException; diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/WriteLicCapablitiesTest.java b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java similarity index 87% rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/WriteLicCapablitiesTest.java rename to tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java index 5572cfab0..d64a3c073 100644 --- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/requirements/WriteLicCapablitiesTest.java +++ b/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/equinox/requirements/WriteLicCapablitiesTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,14 +10,15 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.equinox.requirements; +package org.eclipse.passage.lic.equinox.requirements; import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; +import org.eclipse.passage.lic.api.requirements.Requirement; +import org.eclipse.passage.lic.equinox.requirements.RequirementsToBundle; import org.eclipse.passage.lic.internal.base.NamedData; import org.junit.Test; diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java index 0c6f617e6..38bc7f357 100644 --- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java +++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/DemoFrameworkContentTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -23,11 +23,11 @@ import org.eclipse.passage.lic.api.registry.Service; import org.eclipse.passage.lic.api.registry.ServiceId; import org.eclipse.passage.lic.api.registry.StringServiceId; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirements; +import org.eclipse.passage.lic.api.requirements.ResolvedRequirementsRegistry; +import org.eclipse.passage.lic.equinox.requirements.BundleRequirements; +import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements; import org.eclipse.passage.lic.internal.api.Framework; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirements; -import org.eclipse.passage.lic.internal.api.requirements.ResolvedRequirementsRegistry; -import org.eclipse.passage.lic.internal.equinox.requirements.BundleRequirements; -import org.eclipse.passage.lic.internal.equinox.requirements.ComponentRequirements; import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier; import org.junit.Test; diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/access/AccessAssessmentTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/access/AccessAssessmentTest.java index c0b2f9140..efded81a7 100644 --- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/access/AccessAssessmentTest.java +++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/access/AccessAssessmentTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 ArSysOp + * Copyright (c) 2020, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -20,10 +20,10 @@ import java.util.Set; import java.util.stream.Collectors; +import org.eclipse.passage.lic.api.requirements.Feature; +import org.eclipse.passage.lic.api.requirements.Requirement; import org.eclipse.passage.lic.base.access.Access; import org.eclipse.passage.lic.internal.api.ServiceInvocationResult; -import org.eclipse.passage.lic.internal.api.requirements.Feature; -import org.eclipse.passage.lic.internal.api.requirements.Requirement; import org.eclipse.passage.lic.internal.api.restrictions.ExaminationCertificate; import org.eclipse.passage.lic.internal.base.diagnostic.NoSevereErrors; import org.junit.Test; From 9bc2b28cd14d35a295eef3404a723137ac6412f0 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 13:03:18 +0300 Subject: [PATCH 2/5] Bug 572897 lic api goes out from the shadows bump service version for affected plug-in Signed-off-by: eparovyshnaya --- .../src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java | 3 +++ .../src/org/eclipse/passage/lic/base/io/Settings.java | 1 + .../eclipse/passage/lic/base/io/UserHomeProductResidence.java | 3 +++ bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java index 1152d44cf..7e71a6baa 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java @@ -23,6 +23,9 @@ import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.base.i18n.AccessCycleMessages; +/** + * @since 1.1 + */ public final class PathKeyKeeper implements KeyKeeper { private final LicensedProduct product; diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java index f30e46c57..8a2784c47 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java @@ -40,6 +40,7 @@ *

* * @see PassageFileExtension.Settings + * @since 1.1 */ public final class Settings { diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/UserHomeProductResidence.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/UserHomeProductResidence.java index dc8ad29ac..afe1f64ca 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/UserHomeProductResidence.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/UserHomeProductResidence.java @@ -17,6 +17,9 @@ import org.eclipse.passage.lic.internal.api.LicensedProduct; +/** + * @since 1.1 + */ public final class UserHomeProductResidence implements Supplier { private final Supplier residence; diff --git a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF index 40488b3b1..58e0bad54 100644 --- a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.equinox Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.equinox -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright From c4c6b3495c4db055ac7e808bed8a4f9f702ec1e1 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 13:04:37 +0300 Subject: [PATCH 3/5] Bug 572897 lic api goes out from the shadows bump service version for affected plug-in Signed-off-by: eparovyshnaya --- .../src/org/eclipse/passage/lic/equinox/io/BundleKeyKeeper.java | 2 +- .../passage/lic/equinox/requirements/BundleRequirements.java | 2 +- .../lic/equinox/requirements/CapabilityLicFeatureId.java | 2 +- .../lic/equinox/requirements/CapabilityLicFeatureLevel.java | 2 +- .../lic/equinox/requirements/CapabilityLicFeatureName.java | 2 +- .../lic/equinox/requirements/CapabilityLicFeatureProvider.java | 2 +- .../lic/equinox/requirements/CapabilityLicFeatureVersion.java | 2 +- .../passage/lic/equinox/requirements/ComponentLicFeatureId.java | 2 +- .../lic/equinox/requirements/ComponentLicFeatureLevel.java | 2 +- .../lic/equinox/requirements/ComponentLicFeatureName.java | 2 +- .../lic/equinox/requirements/ComponentLicFeatureProvider.java | 2 +- .../lic/equinox/requirements/ComponentLicFeatureVersion.java | 2 +- .../passage/lic/equinox/requirements/ComponentRequirements.java | 2 +- .../passage/lic/equinox/requirements/RequirementsToBundle.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/BundleKeyKeeper.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/BundleKeyKeeper.java index 475940a06..d35eb3524 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/BundleKeyKeeper.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/BundleKeyKeeper.java @@ -34,7 +34,7 @@ * Look for the product's public key into OSGI-INF folder of the configured * bundle. * - * @since 2.0 + * @since 2.1 */ public final class BundleKeyKeeper implements KeyKeeper { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java index c2a94ad13..aaba59f2b 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/BundleRequirements.java @@ -38,7 +38,7 @@ * * @see Requirement * @see ResolvedRequirements - * @since 2.0 + * @since 2.1 */ public final class BundleRequirements implements ResolvedRequirements { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java index 272e403d8..9f7e5b9e6 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureId.java @@ -22,7 +22,7 @@ * {@code Capability}'s attributes. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class CapabilityLicFeatureId extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java index 6af27cab9..f9d7c87b6 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureLevel.java @@ -22,7 +22,7 @@ * licensing from a {@code Capability}'s attributes. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class CapabilityLicFeatureLevel extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java index 3e2fd1efc..53bee0e91 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureName.java @@ -22,7 +22,7 @@ * {@code Capability}'s attributes. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class CapabilityLicFeatureName extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java index 9cfe37c9e..4f4aba6f1 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureProvider.java @@ -22,7 +22,7 @@ * licensing from a {@code Capability}'s attributes. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class CapabilityLicFeatureProvider extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java index d1243b271..bf2f6bfee 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/CapabilityLicFeatureVersion.java @@ -22,7 +22,7 @@ * licensing from a {@code Capability}'s attributes. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class CapabilityLicFeatureVersion extends CapabilityLicFeatureInfo { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java index d57a34a58..9cfc16215 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureId.java @@ -22,7 +22,7 @@ * {@code OSGi component}'s properties. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class ComponentLicFeatureId extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java index 8b5a31f81..5f26dd6dc 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureLevel.java @@ -23,7 +23,7 @@ * {@code OSGi component}'s properties for the requirement under construction. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class ComponentLicFeatureLevel extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java index a0ff92bd0..1bf36e8dd 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureName.java @@ -22,7 +22,7 @@ * {@code OSGi component}'s properties. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class ComponentLicFeatureName extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java index 32554c39d..5028bbd50 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureProvider.java @@ -22,7 +22,7 @@ * properties. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class ComponentLicFeatureProvider extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java index c182fa3d4..19fe36079 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentLicFeatureVersion.java @@ -22,7 +22,7 @@ * licensing from a {@code OSGi component}'s properties. * * @see NamedData - * @since 2.0 + * @since 2.1 */ public final class ComponentLicFeatureVersion extends StringNamedData { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java index 7ad9e9fe1..1dcc7f1be 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/ComponentRequirements.java @@ -34,7 +34,7 @@ * * @see Requirement * @see ResolvedRequirements - * @since 2.0 + * @since 2.1 */ public final class ComponentRequirements implements ResolvedRequirements { diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java index 1a36598c5..e1638a85f 100644 --- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java +++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/requirements/RequirementsToBundle.java @@ -33,7 +33,7 @@ * � * * @see NamedData.Writable - * @since 2.0 + * @since 2.1 */ public final class RequirementsToBundle implements NamedData> { From bb80e23d303487e4616e76710a67a261e041355f Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 13:11:37 +0300 Subject: [PATCH 4/5] Bug 572897 lic api goes out from the shadows bump service version for affected plug-in Signed-off-by: eparovyshnaya --- .../META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF index 0a0a58059..1b7c9e7cb 100644 --- a/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.ldc.pde.core.templates Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.ldc.pde.core.templates -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 0.1.100.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 From 877b993f8a7b5be85a63cd63aa839d473a036d42 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Jul 2021 13:24:13 +0300 Subject: [PATCH 5/5] Bug 572897 lic api goes out from the shadows bump service version for affected plug-in Signed-off-by: eparovyshnaya --- .../META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF index a9ca62219..9f051a450 100644 --- a/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.passage.ldc.pde.ui.templates;singleton:=true -Bundle-Version: 0.6.0.qualifier +Bundle-Version: 0.6.100.qualifier Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.passage.ldc.internal.pde.ui.templates;x-internal:=true, org.eclipse.passage.ldc.internal.pde.ui.templates.e3;x-internal:=true,