From c603c546e84ff95bae137efad47d2de34acd9b6f Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Sat, 25 May 2024 19:14:08 +0300
Subject: [PATCH] [#1323] lic.equinox plug-in to be renamed

* reworked dependencies to equinox
* moved helper types to LIC Execute
* extracted LIC CLI bundle

Fixes #1323
---
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../seal/SealedAccessCycleConfiguration.java  |  4 +-
 .../META-INF/MANIFEST.MF                      |  1 +
 .../org.eclipse.passage.lic.cli/.classpath    |  7 +++
 bundles/org.eclipse.passage.lic.cli/.project  | 46 +++++++++++++++++++
 .../META-INF/MANIFEST.MF                      | 14 ++++++
 .../OSGI-INF/l10n/bundle.properties           | 22 +++++++++
 .../org.eclipse.passage.lic.cli/about.html    | 36 +++++++++++++++
 .../build.properties                          | 19 ++++++++
 .../eclipse/passage/lic/cli}/BaseOption.java  |  2 +-
 .../passage/lic/cli}/ConsoleInteraction.java  |  2 +-
 .../lic/cli}/CoverageCheckOptionDecision.java |  2 +-
 .../eclipse/passage/lic/cli}/Interaction.java |  2 +-
 .../lic/cli}/LicenseCoverageCheck.java        |  2 +-
 .../passage/lic/cli}/LicenseProtection.java   |  2 +-
 .../org/eclipse/passage/lic/cli}/Option.java  |  2 +-
 .../passage/lic/cli}/OptionAccept.java        |  4 +-
 .../passage/lic/cli}/OptionDiagnostic.java    |  2 +-
 .../passage/lic/cli}/OptionImport.java        |  2 +-
 .../passage/lic/cli}/OptionProceed.java       |  2 +-
 .../eclipse/passage/lic/cli}/OptionQuit.java  |  2 +-
 .../passage/lic/cli}/OptionRequest.java       |  2 +-
 .../org/eclipse/passage/lic/cli}/Options.java |  2 +-
 .../META-INF/MANIFEST.MF                      |  5 +-
 .../internal/equinox/ServiceExtensions.java   |  6 +--
 .../equinox/i18n/EquinoxMessages.java         |  3 +-
 .../equinox/i18n/EquinoxMessages.properties   |  3 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../execute/BaseAccessCycleConfiguration.java |  1 -
 .../lic/execute}/ConfigurationPath.java       |  2 +-
 .../ConfigurationResidentConditions.java      |  6 +--
 .../lic/execute}/InstallationPath.java        |  2 +-
 .../InstallationResidentConditions.java       |  6 +--
 .../lic/execute/PersonalLicensing.java        |  2 -
 .../META-INF/MANIFEST.MF                      |  1 +
 .../jetty/interaction/ServerHandles.java      |  2 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../licensing/BaseLicenseStatusDialog.java    |  1 -
 .../dialogs/licensing}/ProductContacts.java   |  8 ++--
 .../i18n/LicenseStatusDialogMessages.java     |  3 +-
 .../LicenseStatusDialogMessages.properties    |  3 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../loc/workspace/HomeBasedAgreements.java    |  2 +-
 .../loc/workspace/UncertainFeatures.java      |  2 +-
 .../loc/workspace/UncertainLicenses.java      |  2 +-
 .../loc/workspace/UncertainProducts.java      |  2 +-
 .../passage/loc/workspace/UncertainUsers.java |  2 +-
 .../feature.xml                               |  7 +++
 .../pom.xml                                   |  4 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../lic/jface/tests}/ProductContactsTest.java |  6 +--
 53 files changed, 218 insertions(+), 63 deletions(-)
 create mode 100644 bundles/org.eclipse.passage.lic.cli/.classpath
 create mode 100644 bundles/org.eclipse.passage.lic.cli/.project
 create mode 100644 bundles/org.eclipse.passage.lic.cli/META-INF/MANIFEST.MF
 create mode 100644 bundles/org.eclipse.passage.lic.cli/OSGI-INF/l10n/bundle.properties
 create mode 100644 bundles/org.eclipse.passage.lic.cli/about.html
 create mode 100644 bundles/org.eclipse.passage.lic.cli/build.properties
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/BaseOption.java (95%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/ConsoleInteraction.java (96%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/CoverageCheckOptionDecision.java (92%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/Interaction.java (96%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/LicenseCoverageCheck.java (98%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/LicenseProtection.java (98%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/Option.java (92%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/OptionAccept.java (97%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/OptionDiagnostic.java (96%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/OptionImport.java (97%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/OptionProceed.java (95%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/OptionQuit.java (95%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/OptionRequest.java (97%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access => org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli}/Options.java (96%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io => org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute}/ConfigurationPath.java (96%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions => org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute}/ConfigurationResidentConditions.java (90%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io => org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute}/InstallationPath.java (96%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions => org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute}/InstallationResidentConditions.java (91%)
 rename bundles/{org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox => org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing}/ProductContacts.java (79%)
 rename tests/{org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/io => org.eclipse.passage.lic.jface.tests/src/org/eclipse/passage/lic/jface/tests}/ProductContactsTest.java (82%)

diff --git a/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
index 081f795a0..8ee999cab 100644
--- a/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.passage.lic.base;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
+ org.eclipse.passage.lic.base;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",
- org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
  org.eclipse.passage.lic.emf;bundle-version="0.0.0",
  org.eclipse.passage.lic.oshi;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0"
diff --git a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java
index 78d23a7bb..f9def37ca 100644
--- a/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java
+++ b/bundles/org.eclipse.passage.lbc.fls.seal/src/org/eclipse/passage/lbc/internal/fls/seal/SealedAccessCycleConfiguration.java
@@ -27,9 +27,9 @@
 import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
 import org.eclipse.passage.lic.equinox.acquire.ConfigurationLicenseAcquisitionService;
 import org.eclipse.passage.lic.equinox.acquire.InstallationLicenseAcquisitionService;
-import org.eclipse.passage.lic.equinox.conditions.ConfigurationResidentConditions;
-import org.eclipse.passage.lic.equinox.conditions.InstallationResidentConditions;
 import org.eclipse.passage.lic.execute.BaseAccessCycleConfiguration;
+import org.eclipse.passage.lic.execute.ConfigurationResidentConditions;
+import org.eclipse.passage.lic.execute.InstallationResidentConditions;
 import org.osgi.framework.FrameworkUtil;
 
 final class SealedAccessCycleConfiguration extends BaseAccessCycleConfiguration {
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 9378573e9..8b52cca8b 100644
--- a/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Export-Package: org.eclipse.passage.lic.api,
  org.eclipse.passage.lic.api.agreements;
   x-friends:="org.eclipse.passage.lic.base,
    org.eclipse.passage.lic.base.tests,
+   org.eclipse.passage.lic.cli,
    org.eclipse.passage.lic.jface,
    org.eclipse.passage.lic.equinox",
  org.eclipse.passage.lic.api.conditions,
diff --git a/bundles/org.eclipse.passage.lic.cli/.classpath b/bundles/org.eclipse.passage.lic.cli/.classpath
new file mode 100644
index 000000000..81fe078c2
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.cli/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.passage.lic.cli/.project b/bundles/org.eclipse.passage.lic.cli/.project
new file mode 100644
index 000000000..f79175082
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.cli/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.passage.lic.cli</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+	<linkedResources>
+     <link>
+            <name>.settings</name>
+            <type>2</type>
+            <locationURI>$%7BPARENT-2-PROJECT_LOC%7D/.settings</locationURI>
+        </link>
+ </linkedResources>
+</projectDescription>
diff --git a/bundles/org.eclipse.passage.lic.cli/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.cli/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..e263cdeb8
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.cli/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.eclipse.passage.lic.cli
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.passage.lic.cli
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Copyright: %Bundle-Copyright
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.lic.equinox;bundle-version="0.0.0";visibility:=reexport
+Export-Package: org.eclipse.passage.lic.cli;x-friends:="org.eclipse.passage.lic.jetty"
+Import-Package: org.slf4j;version="1.7.36"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.passage.lic.cli/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.cli/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 000000000..09ea93e5e
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.cli/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,22 @@
+###############################################################################
+# Copyright (c) 2018, 2024 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+Bundle-Name = Passage LIC CLI
+Bundle-Vendor = Eclipse Passage
+Bundle-Copyright = Copyright (c) 2018, 2024 ArSysOp and others.\n\
+\n\
+This program and the accompanying materials are made\n\
+available under the terms of the Eclipse Public License 2.0\n\
+which is available at https://www.eclipse.org/legal/epl-2.0/\n\
+\n\
+SPDX-License-Identifier: EPL-2.0\n\
diff --git a/bundles/org.eclipse.passage.lic.cli/about.html b/bundles/org.eclipse.passage.lic.cli/about.html
new file mode 100644
index 000000000..164f781a8
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.cli/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.cli/build.properties b/bundles/org.eclipse.passage.lic.cli/build.properties
new file mode 100644
index 000000000..37261f380
--- /dev/null
+++ b/bundles/org.eclipse.passage.lic.cli/build.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2018, 2024 ArSysOp and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/.
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     ArSysOp - initial API and implementation
+###############################################################################
+
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html
\ No newline at end of file
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/BaseOption.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/BaseOption.java
similarity index 95%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/BaseOption.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/BaseOption.java
index 2347f9d23..a9c7d0c24 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/BaseOption.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/BaseOption.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 abstract class BaseOption<D extends Enum<?>> implements Option<D> {
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/ConsoleInteraction.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/ConsoleInteraction.java
similarity index 96%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/ConsoleInteraction.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/ConsoleInteraction.java
index b83b577bf..00b318910 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/ConsoleInteraction.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/ConsoleInteraction.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.io.IOException;
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/CoverageCheckOptionDecision.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/CoverageCheckOptionDecision.java
similarity index 92%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/CoverageCheckOptionDecision.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/CoverageCheckOptionDecision.java
index 6228a56eb..483318dcd 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/CoverageCheckOptionDecision.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/CoverageCheckOptionDecision.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 enum CoverageCheckOptionDecision {
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Interaction.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Interaction.java
similarity index 96%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Interaction.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Interaction.java
index 440a9c45e..08e65e3d5 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Interaction.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Interaction.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.util.Optional;
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseCoverageCheck.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/LicenseCoverageCheck.java
similarity index 98%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseCoverageCheck.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/LicenseCoverageCheck.java
index fbfb6258c..2be82a045 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseCoverageCheck.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/LicenseCoverageCheck.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseProtection.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/LicenseProtection.java
similarity index 98%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseProtection.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/LicenseProtection.java
index 53a4da9aa..bcb1e7b7d 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseProtection.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/LicenseProtection.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.util.Optional;
 import java.util.function.Supplier;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Option.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Option.java
similarity index 92%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Option.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Option.java
index 23f862ffc..e231abb8f 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Option.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Option.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 public interface Option<D extends Enum<?>> {
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionAccept.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionAccept.java
similarity index 97%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionAccept.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionAccept.java
index a823cb0eb..79effe465 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionAccept.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionAccept.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -19,8 +19,8 @@
 import org.eclipse.passage.lic.api.LicensedProduct;
 import org.eclipse.passage.lic.api.agreements.AgreementAcceptanceService;
 import org.eclipse.passage.lic.api.agreements.AgreementToAccept;
+import org.eclipse.passage.lic.cli.Interaction.Smart;
 import org.eclipse.passage.lic.equinox.SuppliedFrameworkAware;
-import org.eclipse.passage.lic.equinox.access.Interaction.Smart;
 import org.eclipse.passage.lic.internal.base.access.Libraries;
 import org.eclipse.passage.lic.internal.equinox.access.AgreementAcceptanceDelegate;
 import org.eclipse.passage.lic.internal.equinox.access.RegisteredLibraries;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionDiagnostic.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionDiagnostic.java
similarity index 96%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionDiagnostic.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionDiagnostic.java
index 32e9de653..e7d4a7dd8 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionDiagnostic.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionDiagnostic.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import org.eclipse.passage.lic.api.diagnostic.Diagnostic;
 import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionImport.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionImport.java
similarity index 97%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionImport.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionImport.java
index 82eedccad..538d620da 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionImport.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionImport.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionProceed.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionProceed.java
similarity index 95%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionProceed.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionProceed.java
index 95f5771ff..32c7b5982 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionProceed.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionProceed.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 final class OptionProceed extends BaseOption<CoverageCheckOptionDecision> {
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionQuit.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionQuit.java
similarity index 95%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionQuit.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionQuit.java
index 8f4789047..9a4a59437 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionQuit.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionQuit.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 final class OptionQuit extends BaseOption<CoverageCheckOptionDecision> {
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionRequest.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionRequest.java
similarity index 97%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionRequest.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionRequest.java
index 798c07ace..b21bccc4b 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/OptionRequest.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/OptionRequest.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Options.java b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Options.java
similarity index 96%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Options.java
rename to bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Options.java
index a3387570a..e39cd2ac7 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/Options.java
+++ b/bundles/org.eclipse.passage.lic.cli/src/org/eclipse/passage/lic/cli/Options.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.access;
+package org.eclipse.passage.lic.cli;
 
 import java.util.List;
 import java.util.Optional;
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 ec6371d85..9d4470abe 100644
--- a/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.equinox/META-INF/MANIFEST.MF
@@ -7,11 +7,12 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.equinox.registry;bundle-version="0.0.0",
+ org.eclipse.osgi;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.api;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport
 Export-Package: org.eclipse.passage.lic.equinox;x-internal:=true,
- org.eclipse.passage.lic.equinox.access;x-friends:="org.eclipse.passage.lic.jetty",
  org.eclipse.passage.lic.equinox.acquire;x-internal:=true,
  org.eclipse.passage.lic.equinox.conditions;x-internal:=true,
  org.eclipse.passage.lic.equinox.io;x-internal:=true,
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ServiceExtensions.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ServiceExtensions.java
index 3af6d25d9..577477b0d 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ServiceExtensions.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/ServiceExtensions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 ArSysOp
+ * Copyright (c) 2022, 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
@@ -22,7 +22,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.RegistryFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,7 +64,7 @@ public List<S> get() {
 	}
 
 	private IExtension[] extensions() {
-		return Platform.getExtensionRegistry().getExtensionPoint(namespace, point).getExtensions();
+		return RegistryFactory.getRegistry().getExtensionPoint(namespace, point).getExtensions();
 	}
 
 	private Optional<S> service(IConfigurationElement config) {
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.java b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.java
index faa2bd034..ef127de8f 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.java
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 ArSysOp and others
+ * Copyright (c) 2019, 2024 ArSysOp and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -27,7 +27,6 @@ public class EquinoxMessages extends NLS {
 	public static String LicensedApplication_application_context_service_unregistered;
 	public static String LicensedApplication_no_application_context_service_ref;
 	public static String LicensedApplication_no_bundle_context;
-	public static String ProductContacts_defaults;
 	public static String RequirementsFromCapability_no_attributes;
 	public static String RequirementsFromCapability_no_feature_id;
 
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.properties b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.properties
index 45402743a..b190f068c 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.properties
+++ b/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/internal/equinox/i18n/EquinoxMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2019, 2021 ArSysOp and others
+# Copyright (c) 2019, 2024 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -20,6 +20,5 @@ BundleVendor_unknown_vendor=Unknown vendor
 LicensedApplication_application_context_service_unregistered=Severe runtime insufficiency error: IApplicationContext service is unregistered or unavailable
 LicensedApplication_no_application_context_service_ref=Severe runtime insufficiency error: no service reference for IApplicationContext
 LicensedApplication_no_bundle_context=Severe runtime insufficiency error: no bundle context
-ProductContacts_defaults=Protected by Eclipse Passage. Please visit https://eclipse-passage.github.io/passage-docs/#support
 RequirementsFromCapability_no_attributes=Attributes for capability {0} in bundle {1} is required
 RequirementsFromCapability_no_feature_id=Configuration of a feature identifier in capability {0} of bundle {1} is required
diff --git a/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
index d4a5185a5..1ba40e96b 100644
--- a/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.execute/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.passage.lic.api;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.api;bundle-version="0.0.0",
  org.eclipse.passage.lic.base;bundle-version="0.0.0",
  org.eclipse.passage.lic.bc;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
diff --git a/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/BaseAccessCycleConfiguration.java b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/BaseAccessCycleConfiguration.java
index cea8c7cb2..bbaef5177 100644
--- a/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/BaseAccessCycleConfiguration.java
+++ b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/BaseAccessCycleConfiguration.java
@@ -57,7 +57,6 @@
 import org.eclipse.passage.lic.base.restrictions.BasePermissionsExaminationService;
 import org.eclipse.passage.lic.bc.BcStreamCodec;
 import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper;
-import org.eclipse.passage.lic.equinox.io.ConfigurationPath;
 import org.eclipse.passage.lic.equinox.requirements.BundleRequirements;
 import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements;
 import org.eclipse.passage.lic.internal.base.access.storage.StoringGrantTraceService;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/ConfigurationPath.java b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/ConfigurationPath.java
similarity index 96%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/ConfigurationPath.java
rename to bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/ConfigurationPath.java
index d31e20fad..1346f83bb 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/ConfigurationPath.java
+++ b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/ConfigurationPath.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.io;
+package org.eclipse.passage.lic.execute;
 
 import java.nio.file.Path;
 import java.util.function.Supplier;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions/ConfigurationResidentConditions.java b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/ConfigurationResidentConditions.java
similarity index 90%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions/ConfigurationResidentConditions.java
rename to bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/ConfigurationResidentConditions.java
index a759746a7..90032271d 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions/ConfigurationResidentConditions.java
+++ b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/ConfigurationResidentConditions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2022 ArSysOp
+ * Copyright (c) 2020, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.conditions;
+package org.eclipse.passage.lic.execute;
 
 import java.nio.file.Path;
 import java.util.function.Supplier;
@@ -21,7 +21,7 @@
 import org.eclipse.passage.lic.base.io.ExistingFolder;
 import org.eclipse.passage.lic.base.io.LicensingFolder;
 import org.eclipse.passage.lic.base.io.PathFromLicensedProduct;
-import org.eclipse.passage.lic.equinox.io.ConfigurationPath;
+import org.eclipse.passage.lic.equinox.conditions.ConfigurationMiningTarget;
 
 /**
  * Reads all the conditions containing in license files under {@code .passage}
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/InstallationPath.java b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/InstallationPath.java
similarity index 96%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/InstallationPath.java
rename to bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/InstallationPath.java
index cb6ca5fc7..3b14987fb 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/io/InstallationPath.java
+++ b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/InstallationPath.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.io;
+package org.eclipse.passage.lic.execute;
 
 import java.nio.file.Path;
 import java.util.function.Supplier;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions/InstallationResidentConditions.java b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/InstallationResidentConditions.java
similarity index 91%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions/InstallationResidentConditions.java
rename to bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/InstallationResidentConditions.java
index 7a7279f76..24a84b41a 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/conditions/InstallationResidentConditions.java
+++ b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/InstallationResidentConditions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2022 ArSysOp
+ * Copyright (c) 2020, 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
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox.conditions;
+package org.eclipse.passage.lic.execute;
 
 import java.nio.file.Path;
 import java.util.function.Supplier;
@@ -21,7 +21,7 @@
 import org.eclipse.passage.lic.base.io.ExistingFolder;
 import org.eclipse.passage.lic.base.io.LicensingFolder;
 import org.eclipse.passage.lic.base.io.PathFromLicensedProduct;
-import org.eclipse.passage.lic.equinox.io.InstallationPath;
+import org.eclipse.passage.lic.equinox.conditions.InstallationMiningTarget;
 
 /**
  * Reads all the conditions containing in license files under {@code .passage}
diff --git a/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/PersonalLicensing.java b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/PersonalLicensing.java
index ad33b4d8a..2b37b8779 100644
--- a/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/PersonalLicensing.java
+++ b/bundles/org.eclipse.passage.lic.execute/src/org/eclipse/passage/lic/execute/PersonalLicensing.java
@@ -30,8 +30,6 @@
 import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
 import org.eclipse.passage.lic.equinox.acquire.ConfigurationLicenseAcquisitionService;
 import org.eclipse.passage.lic.equinox.acquire.InstallationLicenseAcquisitionService;
-import org.eclipse.passage.lic.equinox.conditions.ConfigurationResidentConditions;
-import org.eclipse.passage.lic.equinox.conditions.InstallationResidentConditions;
 
 final class PersonalLicensing implements LicensingDirection {
 
diff --git a/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF
index f43b7aa9d..4b7418614 100644
--- a/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.jetty/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
+ org.eclipse.passage.lic.cli;bundle-version="3.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
  org.eclipse.passage.lic.net;bundle-version="0.0.0"
 Export-Package: org.eclipse.passage.lic.internal.jetty;x-friends:="org.eclipse.passage.lbc.base,org.eclipse.passage.lbc.jetty,org.eclipse.passage.lac.jetty",
diff --git a/bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/interaction/ServerHandles.java b/bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/interaction/ServerHandles.java
index 60e9e8f8e..b583d756f 100644
--- a/bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/interaction/ServerHandles.java
+++ b/bundles/org.eclipse.passage.lic.jetty/src/org/eclipse/passage/lic/internal/jetty/interaction/ServerHandles.java
@@ -15,7 +15,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.passage.lic.equinox.access.LicenseProtection;
+import org.eclipse.passage.lic.cli.LicenseProtection;
 import org.eclipse.passage.lic.internal.jetty.JettyException;
 import org.eclipse.passage.lic.internal.jetty.JettyServer;
 import org.eclipse.passage.lic.internal.net.connect.BindAddress;
diff --git a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
index b00caf010..dd53e3df6 100644
--- a/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.equinox.common;bundle-version="0.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
+ org.eclipse.equinox.common;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.jface;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.api;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport,
diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/BaseLicenseStatusDialog.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/BaseLicenseStatusDialog.java
index 71c7dba92..852475087 100644
--- a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/BaseLicenseStatusDialog.java
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/BaseLicenseStatusDialog.java
@@ -24,7 +24,6 @@
 import org.eclipse.passage.lic.base.diagnostic.RequirementStatus;
 import org.eclipse.passage.lic.base.diagnostic.RequirementsCoverage;
 import org.eclipse.passage.lic.base.restrictions.ExaminationExplained;
-import org.eclipse.passage.lic.equinox.ProductContacts;
 import org.eclipse.passage.lic.internal.jface.i18n.LicenseStatusDialogMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
diff --git a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/ProductContacts.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ProductContacts.java
similarity index 79%
rename from bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/ProductContacts.java
rename to bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ProductContacts.java
index c746c8cab..17454a754 100644
--- a/bundles/org.eclipse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/ProductContacts.java
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/licensing/ProductContacts.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 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
@@ -10,13 +10,13 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.equinox;
+package org.eclipse.passage.lic.internal.jface.dialogs.licensing;
 
 import java.util.Optional;
 import java.util.function.Supplier;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.passage.lic.internal.equinox.i18n.EquinoxMessages;
+import org.eclipse.passage.lic.internal.jface.i18n.LicenseStatusDialogMessages;
 
 /**
  * @since 2.1
@@ -33,7 +33,7 @@ public String get() {
 	}
 
 	public String defaults() {
-		return EquinoxMessages.ProductContacts_defaults;
+		return LicenseStatusDialogMessages.ProductContacts_defaults;
 	}
 
 }
diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.java b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.java
index a8dfcecd6..02a6aa5bf 100644
--- a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.java
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 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
@@ -29,6 +29,7 @@ public class LicenseStatusDialogMessages extends NLS {
 	public static String LicenseStatusDialog_intention_diagnose;
 	public static String LicenseStatusDialog_intention_diagnose_tooltip;
 	public static String LicenseStatusDialog_title;
+	public static String ProductContacts_defaults;
 	public static String WithCertificatSummary_error;
 	public static String WithCertificatSummary_ok;
 	public static String WithCertificatSummary_warning;
diff --git a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.properties b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.properties
index 9d567443e..980cb48ff 100644
--- a/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.properties
+++ b/bundles/org.eclipse.passage.lic.jface/src/org/eclipse/passage/lic/internal/jface/i18n/LicenseStatusDialogMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2020, 2021 ArSysOp and others
+# Copyright (c) 2020, 2024 ArSysOp and others
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License 2.0 which is available at
@@ -23,6 +23,7 @@ LicenseStatusDialog_intention_accept_tooltip=There are not yet accepted license
 LicenseStatusDialog_intention_diagnose=&Diagnostic
 LicenseStatusDialog_intention_diagnose_tooltip=There is a diagnostic information available, view it in a dedicated dialog
 LicenseStatusDialog_title=Licensing status
+ProductContacts_defaults=Protected by Eclipse Passage. Please visit https://eclipse-passage.github.io/passage-docs/#support
 WithCertificatSummary_error=License coverage is not sufficient and has restrictive statements
 WithCertificatSummary_ok=License coverage is sufficient
 WithCertificatSummary_warning=License coverage is not sufficient and demands attention
diff --git a/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
index e5f86d7b8..beee89ce7 100644
--- a/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lic.net/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
  org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.emf;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0"
diff --git a/bundles/org.eclipse.passage.loc.equinox/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.equinox/META-INF/MANIFEST.MF
index c4d42039c..eb8a84a3d 100644
--- a/bundles/org.eclipse.passage.loc.equinox/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.equinox/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.passage.loc.api;bundle-version="0.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.passage.loc.api;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.base;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.emf;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0";visibility:=reexport
diff --git a/bundles/org.eclipse.passage.loc.workspace/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workspace/META-INF/MANIFEST.MF
index 0cfc271df..1390fab1e 100644
--- a/bundles/org.eclipse.passage.loc.workspace/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.loc.workspace/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.passage.lic.base;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
- org.eclipse.passage.loc.api;bundle-version="0.0.0"
+ org.eclipse.passage.loc.api;bundle-version="0.0.0",
+ org.eclipse.passage.lic.execute;bundle-version="3.0.0"
 Export-Package: org.eclipse.passage.loc.workspace;x-friends:="org.eclipse.passage.loc.operator.gear"
diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedAgreements.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedAgreements.java
index 12994ed82..1f4b9c275 100644
--- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedAgreements.java
+++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/HomeBasedAgreements.java
@@ -20,7 +20,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.passage.lic.base.io.LicensingFolder;
 import org.eclipse.passage.lic.base.io.UserHomePath;
-import org.eclipse.passage.lic.equinox.io.InstallationPath;
+import org.eclipse.passage.lic.execute.InstallationPath;
 import org.eclipse.passage.loc.internal.api.workspace.Agreements;
 import org.eclipse.passage.loc.internal.api.workspace.ResourceHandle;
 
diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainFeatures.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainFeatures.java
index ce50dd386..363e65678 100644
--- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainFeatures.java
+++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainFeatures.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.eclipse.passage.lic.equinox.io.InstallationPath;
+import org.eclipse.passage.lic.execute.InstallationPath;
 import org.eclipse.passage.loc.internal.api.workspace.Features;
 import org.eclipse.passage.loc.internal.api.workspace.ResourceHandle;
 
diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainLicenses.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainLicenses.java
index cf9dc6480..efdad53ec 100644
--- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainLicenses.java
+++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainLicenses.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.eclipse.passage.lic.equinox.io.InstallationPath;
+import org.eclipse.passage.lic.execute.InstallationPath;
 import org.eclipse.passage.loc.internal.api.workspace.Licenses;
 import org.eclipse.passage.loc.internal.api.workspace.ResourceHandle;
 
diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainProducts.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainProducts.java
index 3039c0d20..450e85aa3 100644
--- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainProducts.java
+++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainProducts.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.eclipse.passage.lic.equinox.io.InstallationPath;
+import org.eclipse.passage.lic.execute.InstallationPath;
 import org.eclipse.passage.loc.internal.api.workspace.Products;
 import org.eclipse.passage.loc.internal.api.workspace.ResourceHandle;
 
diff --git a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainUsers.java b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainUsers.java
index 21d307ad0..9b6f61a56 100644
--- a/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainUsers.java
+++ b/bundles/org.eclipse.passage.loc.workspace/src/org/eclipse/passage/loc/workspace/UncertainUsers.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.eclipse.passage.lic.equinox.io.InstallationPath;
+import org.eclipse.passage.lic.execute.InstallationPath;
 import org.eclipse.passage.loc.internal.api.workspace.ResourceHandle;
 import org.eclipse.passage.loc.internal.api.workspace.Users;
 
diff --git a/features/org.eclipse.passage.lic.equinox.feature/feature.xml b/features/org.eclipse.passage.lic.equinox.feature/feature.xml
index 57918c86e..299ba8fd1 100644
--- a/features/org.eclipse.passage.lic.equinox.feature/feature.xml
+++ b/features/org.eclipse.passage.lic.equinox.feature/feature.xml
@@ -46,6 +46,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.passage.lic.cli"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.passage.lic.equinox"
          download-size="0"
diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.lic.aggregator/pom.xml
index 4f7ffa6f9..a057a9cd8 100644
--- a/releng/org.eclipse.passage.lic.aggregator/pom.xml
+++ b/releng/org.eclipse.passage.lic.aggregator/pom.xml
@@ -30,11 +30,11 @@
 
 	<modules>
 		<module>../../bundles/org.eclipse.passage.lic.api</module>
-		<module>../../tests/org.eclipse.passage.lic.api.tests</module>
-
 		<module>../../bundles/org.eclipse.passage.lic.base</module>
+		<module>../../bundles/org.eclipse.passage.lic.cli</module>
 		<module>../../bundles/org.eclipse.passage.lic.equinox</module>
 		<module>../../features/org.eclipse.passage.lic.equinox.feature</module>
+		<module>../../tests/org.eclipse.passage.lic.api.tests</module>
 		<module>../../tests/org.eclipse.passage.lic.base.tests</module>
 		<module>../../tests/org.eclipse.passage.lic.equinox.tests</module>
 		<module>../../tests/org.eclipse.passage.lic.equinox.tests.data.requirements</module>
diff --git a/tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF
index 053ad934b..f931dad29 100644
--- a/tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.passage.lic.equinox.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Fragment-Host: org.eclipse.passage.lic.equinox
 Import-Package: org.junit
-Require-Bundle: org.eclipse.equinox.event;bundle-version="0.0.0",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.passage.lic.base;bundle-version="0.0.0",
  org.eclipse.passage.lic.equinox.tests.data.requirements;bundle-version="0.1.0",
  org.eclipse.passage.lic.base.tests;bundle-version="1.0.0",
diff --git a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/io/ProductContactsTest.java b/tests/org.eclipse.passage.lic.jface.tests/src/org/eclipse/passage/lic/jface/tests/ProductContactsTest.java
similarity index 82%
rename from tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/io/ProductContactsTest.java
rename to tests/org.eclipse.passage.lic.jface.tests/src/org/eclipse/passage/lic/jface/tests/ProductContactsTest.java
index 820bd2cf4..04d668e5c 100644
--- a/tests/org.eclipse.passage.lic.equinox.tests/src/org/eclipse/passage/lic/internal/equinox/io/ProductContactsTest.java
+++ b/tests/org.eclipse.passage.lic.jface.tests/src/org/eclipse/passage/lic/jface/tests/ProductContactsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 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
@@ -10,12 +10,12 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.internal.equinox.io;
+package org.eclipse.passage.lic.jface.tests;
 
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.eclipse.passage.lic.equinox.ProductContacts;
+import org.eclipse.passage.lic.internal.jface.dialogs.licensing.ProductContacts;
 import org.junit.Test;
 
 public class ProductContactsTest {