Merge pull request #825 from eclipse-passage/572897

Bug 572897 lic api goes out from the shadows

bundles/org.eclipse.passage.lac.gear/src/org/eclipse/passage/lac/internal/gear/RuntimeConfiguration.java

@@ -17,6 +17,8 @@
 import java.util.Collections;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
@@ -38,8 +40,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.inspection.RuntimeEnvironment;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.io.Hashes;
 import org.eclipse.passage.lic.internal.api.io.HashesRegistry;
 import org.eclipse.passage.lic.internal.api.io.KeyKeeper;
@@ -67,8 +67,8 @@
 import org.eclipse.passage.lic.internal.licenses.model.toberemoved.UserFilteringConditionTransport;
 import org.eclipse.passage.lic.internal.net.api.handle.NetRequest;
 import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest;
-import org.eclipse.passage.lic.internal.oshi.HardwareAssessmentService;
-import org.eclipse.passage.lic.internal.oshi.HardwareEnvironment;
+import org.eclipse.passage.lic.oshi.HardwareAssessmentService;
+import org.eclipse.passage.lic.oshi.HardwareEnvironment;
 
 @SuppressWarnings("restriction")
 public final class RuntimeConfiguration implements AccessCycleConfiguration {

bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lbc.base
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lbc.base
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright

bundles/org.eclipse.passage.lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthentication.java

@@ -12,20 +12,20 @@
  *******************************************************************************/
 package org.eclipse.passage.lbc.internal.base;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.EvaluationInstructions;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluatorsRegistry;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionParsingException;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionPasringRegistry;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessorsRegistry;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.base.conditions.evaluation.Authentication;
 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.registry.ReadOnlyRegistry;
-import org.eclipse.passage.lic.internal.oshi.HardwareAssessmentService;
-import org.eclipse.passage.lic.internal.oshi.HardwareEnvironment;
+import org.eclipse.passage.lic.oshi.HardwareAssessmentService;
+import org.eclipse.passage.lic.oshi.HardwareEnvironment;
 
 final class ServerAuthentication {
 

bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/BaseAccessCycleConfiguration.java

@@ -16,6 +16,8 @@
 import java.util.Collections;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.AccessCycleConfiguration;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
@@ -32,8 +34,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.inspection.RuntimeEnvironment;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.io.Hashes;
 import org.eclipse.passage.lic.internal.api.io.HashesRegistry;
 import org.eclipse.passage.lic.internal.api.io.KeyKeeper;
@@ -57,8 +57,8 @@
 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.internal.oshi.HardwareAssessmentService;
-import org.eclipse.passage.lic.internal.oshi.HardwareEnvironment;
+import org.eclipse.passage.lic.oshi.HardwareAssessmentService;
+import org.eclipse.passage.lic.oshi.HardwareEnvironment;
 import org.osgi.framework.Bundle;
 
 @SuppressWarnings("restriction")

bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF

@@ -7,7 +7,8 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.passage.lic.internal.api;
+Export-Package: org.eclipse.passage.lic.api.inspection,
+ org.eclipse.passage.lic.internal.api;
   x-friends:="org.eclipse.passage.lac,
    org.eclipse.passage.lac.gear,
    org.eclipse.passage.lbc.api,
@@ -116,14 +117,6 @@ Export-Package: org.eclipse.passage.lic.internal.api;
    org.eclipse.passage.loc.api,
    org.eclipse.passage.lic.jetty,
    org.eclipse.passage.lbc.jetty",
- org.eclipse.passage.lic.internal.api.inspection;
-  x-friends:="org.eclipse.passage.lic.base,
-   org.eclipse.passage.lic.api.tests,
-   org.eclipse.passage.lbc.base,
-   org.eclipse.passage.lic.equinox,
-   org.eclipse.passage.lic.jface,
-   org.eclipse.passage.lic.oshi,
-   org.eclipse.passage.loc.api",
  org.eclipse.passage.lic.internal.api.io;
   x-friends:="org.eclipse.passage.lac,
    org.eclipse.passage.lbc.api,

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/inspection/EnvironmentProperty.java → bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/inspection/EnvironmentProperty.java

@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.api.inspection;
+package org.eclipse.passage.lic.api.inspection;
 
 public interface EnvironmentProperty {
 

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/inspection/RuntimeEnvironment.java → bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/inspection/RuntimeEnvironment.java

@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.api.inspection;
+package org.eclipse.passage.lic.api.inspection;
 
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.LicensingException;

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/inspection/RuntimeEnvironmentRegistry.java → bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/api/inspection/RuntimeEnvironmentRegistry.java

@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.api.inspection;
+package org.eclipse.passage.lic.api.inspection;
 
 import java.util.function.Supplier;
 

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/AccessCycleConfiguration.java

@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.internal.api;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 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;
@@ -20,7 +21,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.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.io.HashesRegistry;
 import org.eclipse.passage.lic.internal.api.io.KeyKeeperRegistry;
 import org.eclipse.passage.lic.internal.api.io.StreamCodecRegistry;

bundles/org.eclipse.passage.lic.api/src/org/eclipse/passage/lic/internal/api/conditions/evaluation/package-info.java

@@ -61,6 +61,6 @@
  * 
  * @see org.eclipse.passage.lic.internal.api.conditions.Condition
  * @see org.eclipse.passage.lic.internal.api.EvaluationType
- * @see org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment
+ * @see org.eclipse.passage.lic.api.inspection.RuntimeEnvironment
  */
 package org.eclipse.passage.lic.internal.api.conditions.evaluation;

bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/inspection/BaseEnvironmentProperty.java

@@ -14,7 +14,7 @@
 
 import java.util.Objects;
 
-import org.eclipse.passage.lic.internal.api.inspection.EnvironmentProperty;
+import org.eclipse.passage.lic.api.inspection.EnvironmentProperty;
 import org.eclipse.passage.lic.internal.base.i18n.InspectionMessages;
 
 public abstract class BaseEnvironmentProperty implements EnvironmentProperty {

bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/EnvironmentNames.java

@@ -16,8 +16,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment;
 
 public final class EnvironmentNames implements Supplier<List<String>> {
 

bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/Environments.java

@@ -16,8 +16,8 @@
 import java.util.Collections;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.api.Framework;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment;
 
 public final class Environments implements Supplier<Collection<RuntimeEnvironment>> {
 

bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/interaction/LicenseRequest.java

@@ -15,8 +15,8 @@
 import java.util.Collection;
 import java.util.stream.Collectors;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.equinox.Environments;
 
 @SuppressWarnings("restriction")

bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/EnvironmentStateDialog.java

@@ -16,8 +16,8 @@
 import java.util.List;
 
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.equinox.Environments;
 import org.eclipse.passage.lic.internal.jface.i18n.EnvironmentStateDialogMessages;
 import org.eclipse.swt.SWT;

bundles/org.eclipse.passage.lic.oshi/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lic.oshi
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lic.oshi
-Bundle-Version: 1.0.300.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
@@ -15,5 +15,5 @@ Require-Bundle: com.sun.jna;bundle-version="[4.5.1,5.0.0)",
  org.eclipse.passage.lic.api;bundle-version="1.0.0",
  org.eclipse.passage.lic.base;bundle-version="1.0.0",
  org.slf4j.api;bundle-version="1.7.2"
-Export-Package: org.eclipse.passage.lic.internal.oshi;x-friends:="org.eclipse.passage.lbc.base"
+Export-Package: org.eclipse.passage.lic.oshi
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/EnvironmentProperties.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/EnvironmentProperties.java

@@ -10,15 +10,15 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import org.eclipse.passage.lic.internal.api.inspection.EnvironmentProperty;
+import org.eclipse.passage.lic.api.inspection.EnvironmentProperty;
 
 final class EnvironmentProperties {
 

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/FragileData.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/FragileData.java

@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/GlanceOfState.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/GlanceOfState.java

@@ -10,15 +10,15 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.eclipse.passage.lic.internal.api.inspection.EnvironmentProperty;
+import org.eclipse.passage.lic.api.inspection.EnvironmentProperty;
 
 final class GlanceOfState implements Supplier<String> {
 

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/HardwareAssessmentService.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/HardwareAssessmentService.java

@@ -10,17 +10,20 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionEvaluationException;
 import org.eclipse.passage.lic.internal.api.conditions.evaluation.ExpressionTokenAssessmentService;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.base.inspection.BaseEnvironmentProperty;
 import org.eclipse.passage.lic.internal.oshi.i18n.AssessmentMessages;
 
+/**
+ * @since 1.1
+ */
 public final class HardwareAssessmentService implements ExpressionTokenAssessmentService {
 
 	private final EvaluationType type = new EvaluationType.Hardware();

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/HardwareEnvironment.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/HardwareEnvironment.java

@@ -10,14 +10,14 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.util.Objects;
 
+import org.eclipse.passage.lic.api.inspection.EnvironmentProperty;
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironment;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.inspection.EnvironmentProperty;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironment;
 
 import oshi.SystemInfo;
 
@@ -28,6 +28,7 @@
  * </p>
  * 
  * @see State
+ * @since 1.1
  */
 
 public final class HardwareEnvironment implements RuntimeEnvironment {

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/NetHardwareAddress.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/NetHardwareAddress.java

@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.net.SocketException;
 import java.util.function.Supplier;

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/State.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/State.java

@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.util.Arrays;
 import java.util.List;
@@ -19,8 +19,8 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.api.inspection.EnvironmentProperty;
 import org.eclipse.passage.lic.internal.api.LicensingException;
-import org.eclipse.passage.lic.internal.api.inspection.EnvironmentProperty;
 import org.eclipse.passage.lic.internal.base.inspection.hardware.BaseBoard;
 import org.eclipse.passage.lic.internal.base.inspection.hardware.Computer;
 import org.eclipse.passage.lic.internal.base.inspection.hardware.Cpu;

bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/internal/oshi/Swath.java → bundles/org.eclipse.passage.lic.oshi/src/org/eclipse/passage/lic/oshi/Swath.java

@@ -10,15 +10,15 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.oshi;
+package org.eclipse.passage.lic.oshi;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import org.eclipse.passage.lic.internal.api.inspection.EnvironmentProperty;
+import org.eclipse.passage.lic.api.inspection.EnvironmentProperty;
 import org.eclipse.passage.lic.internal.base.inspection.hardware.Disk;
 import org.eclipse.passage.lic.internal.base.inspection.hardware.NetworkInterface;
 

bundles/org.eclipse.passage.loc.api/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.loc.api
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.loc.api
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright

bundles/org.eclipse.passage.loc.api/src/org/eclipse/passage/loc/internal/api/OperatorGear.java

@@ -14,9 +14,9 @@
 
 import java.util.Optional;
 
+import org.eclipse.passage.lic.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.Gear;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
-import org.eclipse.passage.lic.internal.api.inspection.RuntimeEnvironmentRegistry;
 import org.eclipse.passage.lic.internal.api.io.StreamCodec;
 import org.eclipse.passage.loc.internal.api.workspace.OperatorWorkspace;