Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Bug 572897 lic api goes out from the shadows #831

Merged
merged 5 commits into from
Jul 14, 2021
Merged

Bug 572897 lic api goes out from the shadows #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0de8c5f
Bug 572897 lic api goes out from the shadows
eparovyshnaya Jul 14, 2021
9bc2b28
Bug 572897 lic api goes out from the shadows
eparovyshnaya Jul 14, 2021
c4c6b34
Bug 572897 lic api goes out from the shadows
eparovyshnaya Jul 14, 2021
bb80e23
Bug 572897 lic api goes out from the shadows
eparovyshnaya Jul 14, 2021
877b993
Bug 572897 lic api goes out from the shadows
eparovyshnaya Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ....fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -45,17 +49,13 @@
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;
import org.eclipse.passage.lic.internal.base.conditions.evaluation.BerlinProtocolExpressionParseService;
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;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.ldc.pde.core.templates/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.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
Expand Down
6 changes: 3 additions & 3 deletions ...es/src/org/eclipse/passage/ldc/internal/pde/core/templates/DefaultProductRequirement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Requirement> {
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.ldc.pde.ui.templates/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
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,
Expand Down
4 changes: 2 additions & 2 deletions ...tes/src/org/eclipse/passage/ldc/internal/pde/ui/templates/BaseLicensedProductSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/eclipse/passage/ldc/internal/pde/ui/templates/e3/LicensedE3ProductTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/eclipse/passage/ldc/internal/pde/ui/templates/e4/LicensedE4ProductTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ssage/ldc/internal/pde/ui/templates/fullfeather/AntimagicShieldFeatureLicRequirement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Requirement> {
Expand Down
2 changes: 1 addition & 1 deletion ...dc/internal/pde/ui/templates/fullfeather/LicensedE4FullFeatherProductTemplateSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 1 addition & 7 deletions bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions ...org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/registry/RuntimeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
*******************************************************************************/
package org.eclipse.passage.lic.api.registry;

/**
* @since 1.1
*/
public interface RuntimeRegistry<I extends ServiceId, S extends Service<I>> extends Registry<I, S> {

void register(S service);
Expand Down
5 changes: 3 additions & 2 deletions ...ic/internal/api/requirements/Feature.java → ...passage/lic/api/requirements/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

/**
* <p>
Expand All @@ -22,6 +22,7 @@
*
* @see Requirement
* @see org.eclipse.passage.lic.api
* @since 1.1
*/
public interface Feature {

Expand Down
5 changes: 3 additions & 2 deletions ...nternal/api/requirements/Requirement.java → ...age/lic/api/requirements/Requirement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand All @@ -21,6 +21,7 @@
* {@link ResolvedRequirements}s.
*
* @see ResolvedRequirements
* @since 1.1
*/
public interface Requirement {

Expand Down
5 changes: 3 additions & 2 deletions ...pi/requirements/ResolvedRequirements.java → ...pi/requirements/ResolvedRequirements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand Down Expand Up @@ -42,6 +42,7 @@
*
* @see Requirement
* @see org.eclipse.passage.lic.api
* @since 1.1
*/
public interface ResolvedRequirements extends Service<StringServiceId> {

Expand Down
7 changes: 5 additions & 2 deletions ...rements/ResolvedRequirementsRegistry.java → ...rements/ResolvedRequirementsRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<Registry<StringServiceId, ResolvedRequirements>> {

}
2 changes: 1 addition & 1 deletion ...se.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/Passage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...pse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/MatchingRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* <p>
Expand Down
2 changes: 1 addition & 1 deletion ...lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/ExaminationCertificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* <p>
Expand Down
2 changes: 1 addition & 1 deletion .../src/org/eclipse/passage/lic/internal/api/restrictions/PermissionsExaminationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* <p>
Expand Down
2 changes: 1 addition & 1 deletion ...se.passage.lic.api/src/org/eclipse/passage/lic/internal/api/restrictions/Restriction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
* </p>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Access.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

/**
* Top-level access cycle
*
* @since 1.1
*/
public final class Access {

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/Cycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...les/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/access/CycleFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Loading