diff --git a/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF index be4662fe6..dda068ae3 100644 --- a/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF @@ -14,8 +14,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", org.eclipse.passage.lic.equinox;bundle-version="0.0.0", org.eclipse.passage.lic.net;bundle-version="0.0.0", org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0" -Export-Package: org.eclipse.passage.lic.hc.remote, - org.eclipse.passage.lic.hc.remote.impl, - org.eclipse.passage.lic.hc.remote.impl.acquire, - org.eclipse.passage.lic.hc.remote.impl.mine +Export-Package: org.eclipse.passage.lic.hc.internal.remote;x-internal:=true, + org.eclipse.passage.lic.hc.remote, + org.eclipse.passage.lic.hc.remote.impl;x-internal:=true, + org.eclipse.passage.lic.hc.remote.impl.acquire;x-internal:=true, + org.eclipse.passage.lic.hc.remote.impl.mine;x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Client.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/internal/remote/Client.java similarity index 82% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Client.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/internal/remote/Client.java index 92d79cb2f..8da283e6e 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/Client.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/internal/remote/Client.java @@ -10,9 +10,11 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.hc.remote; +package org.eclipse.passage.lic.hc.internal.remote; import org.eclipse.passage.lic.api.ServiceInvocationResult; +import org.eclipse.passage.lic.hc.remote.Connection; +import org.eclipse.passage.lic.hc.remote.Request; /** * diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/ResponseHandler.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/internal/remote/ResponseHandler.java similarity index 87% rename from bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/ResponseHandler.java rename to bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/internal/remote/ResponseHandler.java index 2ba108f0c..34176ffbc 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/ResponseHandler.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/internal/remote/ResponseHandler.java @@ -10,9 +10,10 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.hc.remote; +package org.eclipse.passage.lic.hc.internal.remote; import org.eclipse.passage.lic.api.LicensingException; +import org.eclipse.passage.lic.hc.remote.RequestContext; import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; /** diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java index af288967e..eb9b3eeb8 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/EObjectFromXmiResponse.java @@ -17,8 +17,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.passage.lic.api.LicensingException; import org.eclipse.passage.lic.api.conditions.mining.ContentType; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.RequestContext; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.emf.EObjectFromBytes; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; import org.eclipse.passage.lic.internal.net.io.SafePayload; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java index 10c2a757c..0413b8861 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/HttpClient.java @@ -20,10 +20,10 @@ import org.eclipse.passage.lic.base.BaseServiceInvocationResult; import org.eclipse.passage.lic.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.base.diagnostic.code.ServiceFailedOnInfrastructureDenial; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.Request; import org.eclipse.passage.lic.hc.remote.RequestContext; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; /** diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java index 80133b6fb..dff46c3f6 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceAny.java @@ -24,7 +24,7 @@ import org.eclipse.passage.lic.base.diagnostic.BaseDiagnostic; import org.eclipse.passage.lic.base.diagnostic.NoSevereErrors; import org.eclipse.passage.lic.base.diagnostic.SumOfDiagnostics; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java index a8dac4066..2f2156f45 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceEvery.java @@ -19,7 +19,7 @@ import org.eclipse.passage.lic.api.ServiceInvocationResult; import org.eclipse.passage.lic.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java index 79fa2e85f..4d9d3ae5f 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/ServiceRemote.java @@ -27,9 +27,9 @@ import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.PathFromLicensedProduct; import org.eclipse.passage.lic.base.io.UserHomePath; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.Connection; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.internal.hc.i18n.AccessMessages; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java index ffa3bfcf2..bc18d014f 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquire.java @@ -19,11 +19,11 @@ import org.eclipse.passage.lic.api.LicensingException; import org.eclipse.passage.lic.api.acquire.GrantAcquisition; import org.eclipse.passage.lic.api.io.HashesRegistry; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.Configuration; import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.hc.remote.RequestContext; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration; import org.eclipse.passage.lic.hc.remote.impl.EObjectFromXmiResponse; import org.eclipse.passage.lic.hc.remote.impl.Equipment; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java index 8092c14d7..e4ebde969 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteAcquisitionService.java @@ -22,7 +22,7 @@ import org.eclipse.passage.lic.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.UserHomePath; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.hc.remote.impl.Equipment; import org.eclipse.passage.lic.hc.remote.impl.HttpClient; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java index b4ed9755a..b9f8e802f 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/acquire/RemoteRelease.java @@ -19,11 +19,11 @@ import org.eclipse.passage.lic.api.LicensingException; import org.eclipse.passage.lic.api.acquire.GrantAcquisition; import org.eclipse.passage.lic.api.io.HashesRegistry; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.Configuration; import org.eclipse.passage.lic.hc.remote.Connection; import org.eclipse.passage.lic.hc.remote.RequestContext; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.impl.BaseConfiguration; import org.eclipse.passage.lic.hc.remote.impl.Equipment; import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java index 4d00f500e..a91cc8475 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/DecryptedConditions.java @@ -24,8 +24,8 @@ import org.eclipse.passage.lic.api.conditions.mining.ConditionTransport.Data; import org.eclipse.passage.lic.base.conditions.BaseConditionOrigin; import org.eclipse.passage.lic.base.conditions.BaseConditionPack; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.RequestContext; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.impl.Equipment; import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; import org.eclipse.passage.lic.internal.hc.i18n.MineMessages; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java index f2042c167..f41c0ff1c 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/mine/RemoteConditions.java @@ -26,9 +26,9 @@ import org.eclipse.passage.lic.base.SumOfCollections; import org.eclipse.passage.lic.base.io.LicensingFolder; import org.eclipse.passage.lic.base.io.UserHomePath; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.Connection; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.impl.Equipment; import org.eclipse.passage.lic.hc.remote.impl.HttpClient; import org.eclipse.passage.lic.hc.remote.impl.RemoteRequest; diff --git a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/i18n/MineMessages.java b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/i18n/MineMessages.java index 13c7298f1..93208dfc2 100644 --- a/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/i18n/MineMessages.java +++ b/bundles/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/i18n/MineMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 ArSysOp + * Copyright (c) 2019, 2024 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -9,12 +9,13 @@ * * Contributors: * ArSysOp - initial API and implementation + * ArSysOp - further support *******************************************************************************/ package org.eclipse.passage.lic.internal.hc.i18n; import org.eclipse.osgi.util.NLS; -public class MineMessages extends NLS { +public final class MineMessages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.passage.lic.internal.hc.i18n.MineMessages"; //$NON-NLS-1$ public static String DecryptedConditions_no_transport_for_content_type; diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java index 21cea217f..1bfadc601 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/AcquireTest.java @@ -26,7 +26,7 @@ import org.eclipse.passage.lic.api.ServiceInvocationResult; import org.eclipse.passage.lic.api.acquire.GrantAcquisition; import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; import org.eclipse.passage.lic.hc.remote.impl.acquire.RemoteAcquisitionService; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest; diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java index 6d08b3768..1e371f308 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/MineTest.java @@ -28,7 +28,7 @@ import org.eclipse.passage.lic.api.ServiceInvocationResult; import org.eclipse.passage.lic.api.conditions.ConditionPack; import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; import org.eclipse.passage.lic.hc.remote.impl.mine.RemoteConditions; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse; import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest; diff --git a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java index d9cf00d9d..e36a1d1fa 100644 --- a/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java +++ b/tests/org.eclipse.passage.lic.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/remote/ShortcutClient.java @@ -22,9 +22,9 @@ import org.eclipse.passage.lic.api.LicensingException; import org.eclipse.passage.lic.api.ServiceInvocationResult; import org.eclipse.passage.lic.base.BaseServiceInvocationResult; -import org.eclipse.passage.lic.hc.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.Client; +import org.eclipse.passage.lic.hc.internal.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.Request; -import org.eclipse.passage.lic.hc.remote.ResponseHandler; import org.eclipse.passage.lic.hc.remote.impl.ResultsTransfered; import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;