From fd8f8d48eb4c6614f002155c938f449c10cc702b Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 13:55:08 +0300 Subject: [PATCH 1/9] Bug 572353 lease a license for common use improve diagnostic: add more information on condition mining Signed-off-by: eparovyshnaya --- .../conditions/mining/LocalConditions.java | 18 ++++++++++++- .../mining/PersonalLicenseMiningTool.java | 26 ++++++++++++++++--- .../base/diagnostic/code/NoLicenses.java | 24 +++++++++++++++++ .../diagnostic/code/NoRelevantConditions.java | 24 +++++++++++++++++ .../base/diagnostic/code/package-info.java | 2 ++ .../i18n/DiagnosticCodeMessages.properties | 2 ++ 6 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoLicenses.java create mode 100644 bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoRelevantConditions.java diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java index 85b7bd9f3..d406b4a16 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java @@ -14,6 +14,7 @@ import java.nio.file.Path; import java.util.Collection; +import java.util.Collections; import java.util.Objects; import java.util.function.Supplier; @@ -27,6 +28,8 @@ import org.eclipse.passage.lic.internal.api.conditions.mining.MiningEquipment; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.base.BaseServiceInvocationResult; +import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; +import org.eclipse.passage.lic.internal.base.diagnostic.code.NoLicenses; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnInfrastructureDenial; import org.eclipse.passage.lic.internal.base.i18n.ConditionMiningMessages; import org.eclipse.passage.lic.internal.base.io.FileCollection; @@ -67,7 +70,11 @@ public final ConditionMiningTarget id() { @Override public final ServiceInvocationResult> all(LicensedProduct product) { try { - return equipment.tool(product, id).mine(licenses(product)); + Collection licenses = licenses(product); + if (licenses.isEmpty()) { + return noLicenses(product); + } + return equipment.tool(product, id).mine(licenses); } catch (LicensingException e) { return new BaseServiceInvocationResult>( // new Trouble(// @@ -77,6 +84,15 @@ public final ServiceInvocationResult> all(LicensedProd } } + private ServiceInvocationResult> noLicenses(LicensedProduct product) { + return new BaseServiceInvocationResult>(// + new BaseDiagnostic(// + Collections.emptyList(), // + Collections.singletonList(// + new Trouble(new NoLicenses(), base(product).get().toAbsolutePath().toString()))// + )); + } + private Collection licenses(LicensedProduct product) throws LicensingException { return new FileCollection(base(product), scope).get(); } diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java index 6494e7bf3..0a6188e19 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/PersonalLicenseMiningTool.java @@ -24,6 +24,7 @@ import org.eclipse.passage.lic.internal.api.conditions.ConditionMiningTarget; import org.eclipse.passage.lic.internal.api.conditions.ConditionPack; import org.eclipse.passage.lic.internal.api.conditions.mining.ConditionTransport; +import org.eclipse.passage.lic.internal.api.diagnostic.Diagnostic; import org.eclipse.passage.lic.internal.api.diagnostic.Trouble; import org.eclipse.passage.lic.internal.api.io.KeyKeeper; import org.eclipse.passage.lic.internal.api.io.StreamCodec; @@ -31,6 +32,8 @@ import org.eclipse.passage.lic.internal.base.SumOfCollections; import org.eclipse.passage.lic.internal.base.conditions.BaseConditionOrigin; import org.eclipse.passage.lic.internal.base.conditions.BaseConditionPack; +import org.eclipse.passage.lic.internal.base.diagnostic.BaseDiagnostic; +import org.eclipse.passage.lic.internal.base.diagnostic.code.NoRelevantConditions; import org.eclipse.passage.lic.internal.base.diagnostic.code.ServiceFailedOnMorsel; import org.eclipse.passage.lic.internal.base.i18n.BaseMessages; @@ -51,10 +54,14 @@ public ServiceInvocationResult> mine(Collection private ServiceInvocationResult> mine(Path source) { try { - return new BaseServiceInvocationResult<>(Collections.singleton(// - new BaseConditionPack(// - new BaseConditionOrigin(miner, source(source)), // - from(decoded(source))))); + Collection conditions = from(decoded(source)); + return new BaseServiceInvocationResult<>(// + diagnostic(conditions, source), // + Collections.singleton(// + new BaseConditionPack(// + new BaseConditionOrigin(miner, source(source)), // + conditions)// + )); } catch (IOException | LicensingException e) { return new BaseServiceInvocationResult<>(// new Trouble(// @@ -71,4 +78,15 @@ private Collection from(byte[] decoded) throws IOException { } } + private Diagnostic diagnostic(Collection conditions, Path source) { + if (conditions.isEmpty()) { + return new BaseDiagnostic(// + Collections.emptyList(), // + Collections.singletonList(// + new Trouble(new NoRelevantConditions(), source.toAbsolutePath().toString()))// + ); + } + return new BaseDiagnostic(); + } + } diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoLicenses.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoLicenses.java new file mode 100644 index 000000000..c2cafa100 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoLicenses.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2020 ArSysOp + * + * 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 + *******************************************************************************/ +package org.eclipse.passage.lic.internal.base.diagnostic.code; + +import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; +import org.eclipse.passage.lic.internal.base.i18n.DiagnosticCodeMessages; + +public final class NoLicenses extends TroubleCode { + + public NoLicenses() { + super(410, DiagnosticCodeMessages.getString("NoLicenses.explanation")); //$NON-NLS-1$ + } + +} diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoRelevantConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoRelevantConditions.java new file mode 100644 index 000000000..dd7935b16 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/NoRelevantConditions.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2020 ArSysOp + * + * 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 + *******************************************************************************/ +package org.eclipse.passage.lic.internal.base.diagnostic.code; + +import org.eclipse.passage.lic.internal.api.diagnostic.TroubleCode; +import org.eclipse.passage.lic.internal.base.i18n.DiagnosticCodeMessages; + +public final class NoRelevantConditions extends TroubleCode { + + public NoRelevantConditions() { + super(409, DiagnosticCodeMessages.getString("NoRelevantConditions.explanation")); //$NON-NLS-1$ + } + +} diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/package-info.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/package-info.java index c88d82287..a89f96d68 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/package-info.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/diagnostic/code/package-info.java @@ -46,6 +46,8 @@ * conditions found for it), but has not-critical restriction level (for * instance @{code info}, {@code warning}) and thus can be used without * license. + *
  • 409 - a license source does not provide relevant conditions (info)
    • + *
  • 410 - no licenses found in a source directory (info)
    • * * *
  • 5xx - reserved
    • diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/i18n/DiagnosticCodeMessages.properties b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/i18n/DiagnosticCodeMessages.properties index c673d5061..1ffab30df 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/i18n/DiagnosticCodeMessages.properties +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/i18n/DiagnosticCodeMessages.properties @@ -20,6 +20,8 @@ ServiceCannotOperate.explanation=Access cycle service cannot operate NoServices.explanation=No services of type [%s] available NoRequirements.explanation=No licensing requirements registered NoFramework.explanation=Passage gains no Framework instance and is completely inoperable. It means either severe lack of configuration or sabotage. +NoRelevantConditions.explanation=License does not supply a relevant condition +NoLicenses.explanation=There are no licenses found under the given source dir SeveralFrameworks.explanation=Passage finds %s Framework implementations, which means either severe configuration errors or sabotage. ServiceFailedOnMorsel.explanation=Service failed to evaluate a morsel ServiceFailedOnInfrastructureDenial.explanation=Service failed severely due to an invoked service denial. From 3a26ddcc6a511e3f4e8ee9a48e50fe3b21d8fbac Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 13:56:47 +0300 Subject: [PATCH 2/9] Bug 572353 lease a license for common use Directly add 'org.eclipse.emf.ecp.view.model.provider.generator' to dependencies: it is not used for compilation, but necessary at runtime Signed-off-by: eparovyshnaya --- .../META-INF/MANIFEST.MF | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF index 67488d197..3de54d26d 100644 --- a/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF @@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0", org.eclipse.e4.ui.services;bundle-version="0.0.0", org.eclipse.emf.ecp.edit.swt;bundle-version="0.0.0", + org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="0.0.0", org.eclipse.emf.ecp.view.template.model;bundle-version="0.0.0", org.eclipse.emf.ecp.view.core.swt;bundle-version="0.0.0", org.eclipse.emf.ecp.view.validation;bundle-version="0.0.0", @@ -29,8 +30,8 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.passage.lic.api;bundle-version="1.0.0", org.eclipse.passage.lic.base;bundle-version="0.0.0", org.eclipse.passage.lic.emf;bundle-version="0.0.0", - org.eclipse.passage.loc.workbench;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.passage.loc.api;bundle-version="1.0.102" + org.eclipse.passage.loc.api;bundle-version="1.0.102", + org.eclipse.passage.loc.workbench;bundle-version="1.0.0";visibility:=reexport Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.passage.loc.internal.workbench.emfforms;x-internal:=true, org.eclipse.passage.loc.internal.workbench.emfforms.i18n;x-internal:=true, From a320fa78797914fd14a426cb6927da691bed1c75 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 13:58:48 +0300 Subject: [PATCH 3/9] Bug 572353 lease a license for common use - fix product identifier and version - append public key Signed-off-by: eparovyshnaya --- .../META-INF/MANIFEST.MF | 2 +- ....eclipse.passage.lbc.fls.product_1.2.1.pub | 19 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.passage.lbc.server/plugin.xml | 6 +++--- .../org.eclipse.passage.lbc.server.product | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 bundles/org.eclipse.passage.lbc.seal/OSGI-INF/org.eclipse.passage.lbc.fls.product_1.2.1.pub diff --git a/bundles/org.eclipse.passage.lbc.seal/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lbc.seal/META-INF/MANIFEST.MF index c13eed1c0..7254d99f4 100644 --- a/bundles/org.eclipse.passage.lbc.seal/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lbc.seal/META-INF/MANIFEST.MF @@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="3.8.0", org.eclipse.passage.lic.licenses.migration;bundle-version="0.5.200", org.eclipse.passage.lic.oshi;bundle-version="1.0.0" Service-Component: OSGI-INF/*.xml -Provide-Capability: licensing.feature;licensing.feature="org.eclipse.passage.lbc.server.product";name="Eclipse Passage Floating License Server";version="1.2.1";provider="Eclispe Passage";level="warn" +Provide-Capability: licensing.feature;licensing.feature="org.eclipse.passage.lbc.fls.product";name="Eclipse Passage Floating License Server";version="1.2.1";provider="Eclispe Passage";level="warn" diff --git a/bundles/org.eclipse.passage.lbc.seal/OSGI-INF/org.eclipse.passage.lbc.fls.product_1.2.1.pub b/bundles/org.eclipse.passage.lbc.seal/OSGI-INF/org.eclipse.passage.lbc.fls.product_1.2.1.pub new file mode 100644 index 000000000..72c3c10ea --- /dev/null +++ b/bundles/org.eclipse.passage.lbc.seal/OSGI-INF/org.eclipse.passage.lbc.fls.product_1.2.1.pub @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BCPG v1.65 + +mI0EYF79IAEEAJMe6WuKwLbjzTpFaHNuMQy+J0RPjh/2c7HJ0r01SDlmj9jhuiW0 +lXZHyzLQrAMOnX6g7ygPq9gksKpXwmwyNFttX2b25+Tn1XjeO0tP4VItP7kyAOLC +hVeemcL3ZRMxqpn50tAwNX82Xz8db31JN3kvm3OrLA7G4yN+jb4aB2NpABEBAAG0 +I29yZy5lY2xpcHNlLnBhc3NhZ2UubGJjLmZscy5wcm9kdWN0iKIEEwECAAwFAmBe +/SAFCQAAA+gACgkQYYOi/upUrjP8uwP/UdSbdTGoOX/1tpnqFr4I061T5bfCK0Zo +1hb6OejFmUzvstGftqL4cAPoYs8In4/Exts5Afjd18/Fd20hdQLJeocbU1l6/rw7 +RIxkrBIE+rI7tGogbTmbzIU9ZNdPUBV+pNoLjOgKOhyTUVNUXU/8ZYC9HkKHTTIL +hn2oMrhSOTq4jQRgXv0gAQQAkx7pa4rAtuPNOkVoc24xDL4nRE+OH/ZzscnSvTVI +OWaP2OG6JbSVdkfLMtCsAw6dfqDvKA+r2CSwqlfCbDI0W21fZvbn5OfVeN47S0/h +Ui0/uTIA4sKFV56ZwvdlEzGqmfnS0DA1fzZfPx1vfUk3eS+bc6ssDsbjI36NvhoH +Y2kAEQEAAYiiBBgBAgAMBQJgXv0gBQkAAAPoAAoJEGGDov7qVK4zMwID/jeApDO6 +lYVnQxQCWFsukHw6G+koq8xDkMgos9Uyv93km7h0zdIvW6XB7Q852iiIIpaDwXp1 +AdtgNNYLv3SZQ9WWRONfHj+s61VX3TZjRzfGPWCB+cWQnaZcYlsnUKUl98DmyCUh +oWwJ7N39l69F2YztzgoR5Z5kmNF/TMb7TE6x +=AGPH +-----END PGP PUBLIC KEY BLOCK----- diff --git a/bundles/org.eclipse.passage.lbc.server/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lbc.server/META-INF/MANIFEST.MF index b08d555e2..dc8f45c6b 100644 --- a/bundles/org.eclipse.passage.lbc.server/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lbc.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lbc.server Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lbc.server;singleton:=true -Bundle-Version: 0.5.101.qualifier +Bundle-Version: 1.2.1.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright diff --git a/bundles/org.eclipse.passage.lbc.server/plugin.xml b/bundles/org.eclipse.passage.lbc.server/plugin.xml index 4656f264c..5ac380e12 100644 --- a/bundles/org.eclipse.passage.lbc.server/plugin.xml +++ b/bundles/org.eclipse.passage.lbc.server/plugin.xml @@ -14,7 +14,7 @@ - + From b069ff82e69a0bec4c326627107107c4bc8949f7 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 14:19:47 +0300 Subject: [PATCH 4/9] Bug 572353 lease a license for common use fix info-diagnostic: response data must be kept to be normally valid empty collection Signed-off-by: eparovyshnaya --- .../lic/internal/base/conditions/mining/LocalConditions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java index d406b4a16..7c5ffe605 100644 --- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java +++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/conditions/mining/LocalConditions.java @@ -90,7 +90,9 @@ private ServiceInvocationResult> noLicenses(LicensedPr Collections.emptyList(), // Collections.singletonList(// new Trouble(new NoLicenses(), base(product).get().toAbsolutePath().toString()))// - )); + ), // + Collections.emptyList()// + ); } private Collection licenses(LicensedProduct product) throws LicensingException { From 8a45b0f2e291ce247427908a1d37586a3a4b02a1 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 14:20:21 +0300 Subject: [PATCH 5/9] Bug 572353 lease a license for common use add common license file Signed-off-by: eparovyshnaya --- .../common-license.licen | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 products/org.eclipse.passage.lbc.server.product/common-license.licen diff --git a/products/org.eclipse.passage.lbc.server.product/common-license.licen b/products/org.eclipse.passage.lbc.server.product/common-license.licen new file mode 100644 index 000000000..75812f994 --- /dev/null +++ b/products/org.eclipse.passage.lbc.server.product/common-license.licen @@ -0,0 +1,20 @@ +-----BEGIN PGP MESSAGE----- +Version: BCPG v1.65 + +owJ4nJWTS2gTURSGU20tBmO7KIjQxTB2ZZnJvNImQ2K1pq0RLdoXoli9mXsnuTqP +dO5M0q4UdFFqFRd2JxZcKCi6saiLujBdtS5FcSeCCNWFoQgK4uNOmtZULLYws5n7 +/f/555x7roe2BoI14NLtnx8HHso1L4rFdD3OWLaD4NnhH33xjlHTYPLIIdi2EqzI +CyyDLM2G2Mok2AP9B1MptmNfKBi3nQyPNAPnCOJzgBCQQbyBNfUI1pBF0DGgnWdG +TayuWkm+FTW3iEq/J9is6+bUcLhQKPC2meGpX/jE0dQKso79GtnKuS+tMGHK+K8f +gYRper8ohshysY6Rk2DbFEVUojrk5Jgic4qgaFw6DSGXliMxTZQiYlSMUgUhHkoC +F9HYgiRygsxJ7QOipMoxVRb4iCK3CrJArT2CnFSV/Tk7a/HQRvuBZiJes81lpNsz +jF5gUrvDFGCSNmIZB414iLjVaknXYxEZtnExpEBOEUGEA1BLc2JUklBER0CKtrNM +zgBWtepfrdIN4lc3beuMyEu8SFWODT3N/Z/QSGtlcQVf1Q39uRG+Hb0BDBOvNLrH +AZZLNt3mPbR/9J9cz0GbTmUCV8v+lYnJAwPDbsc210xNENTywwuCUJlaGRykFY0y +Ka1ParYFsUuLDIzl6PSywIEF4KCqg67RnIPIcg6b8DowsTGW2MuG/SUJb2BLKDf+ +vDZQEwy01m3xV7CleQMtCAS3N64s8fC12sD4SMPrl53c2w/zcvzZ/F3S1HWojsl+ +vjr4im1JPPpWzPc0Tj4J7eqLBecm428WJvItizcuXmhwi7+efhos9V+ZGZ57sBSa +wdxppbcTX/6+8GVx+j5z6/iOppvvty0tlh5PzfYFJnYW5959nS/t7r5jnEqW7iVn +p5vN+ikPnoz+BucxgsI= +=0fSN +-----END PGP MESSAGE----- From e6652c9a114c853ea9cb8e42ec9970f52f1ac60f Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 14:21:07 +0300 Subject: [PATCH 6/9] Bug 572353 lease a license for common use update test source code according to used interfaces evolution Signed-off-by: eparovyshnaya --- .../org/eclipse/passage/lbc/base/tests/ConditionsTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ConditionsTest.java b/tests/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ConditionsTest.java index 6abe60fe2..af8f7fed4 100644 --- a/tests/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ConditionsTest.java +++ b/tests/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ConditionsTest.java @@ -20,6 +20,7 @@ import java.util.List; import org.eclipse.emf.common.util.EList; +import org.eclipse.passage.lbc.internal.base.api.RawRequest; import org.eclipse.passage.lbc.internal.base.mine.Conditions; import org.eclipse.passage.lic.internal.api.LicensingException; import org.eclipse.passage.lic.internal.base.ProductIdentifier; @@ -59,8 +60,8 @@ private List mineForUserAndProduct(String user, String product, in return grants; } - private ProductUserRequest request(String user, String product) throws LicensingException { - return new ProductUserRequest(// + private ProductUserRequest request(String user, String product) throws LicensingException { + return new ProductUserRequest<>(// new RequestConstructed()// .withParameters(Arrays.asList(// new ProductIdentifier(product), new ProductVersion("0.2.1"), //$NON-NLS-1$ From 681ffc6ebcea0c6cd9fc449619673b8763655af3 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 14:35:01 +0300 Subject: [PATCH 7/9] Bug 572353 lease a license for common use bump service version for updated bundle Signed-off-by: eparovyshnaya --- .../META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF index 3de54d26d..7737ff329 100644 --- a/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.workbench.emfforms/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.loc.workbench.emfforms Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.loc.workbench.emfforms;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.201.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Import-Package: javax.inject, From 7a77785dfa9685352e223b1a6060d6e4d6cd2617 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 16:44:05 +0300 Subject: [PATCH 8/9] Bug 572353 lease a license for common use Rename product module from 'lbc.server' to 'lbc.fls' as it's not the only server planned to be developed in the scope of back-end components Signed-off-by: eparovyshnaya --- .../.settings/org.eclipse.core.resources.prefs | 0 .../common-license.licen | 0 .../org.eclipse.passage.lbc.fls.product} | 0 .../pom.xml | 2 +- .../.project | 17 ----------------- 5 files changed, 1 insertion(+), 18 deletions(-) rename products/{org.eclipse.passage.lbc.server.product => org.eclipse.passage.lbc.fls.product}/.settings/org.eclipse.core.resources.prefs (100%) rename products/{org.eclipse.passage.lbc.server.product => org.eclipse.passage.lbc.fls.product}/common-license.licen (100%) rename products/{org.eclipse.passage.lbc.server.product/org.eclipse.passage.lbc.server.product => org.eclipse.passage.lbc.fls.product/org.eclipse.passage.lbc.fls.product} (100%) rename products/{org.eclipse.passage.lbc.server.product => org.eclipse.passage.lbc.fls.product}/pom.xml (97%) delete mode 100644 products/org.eclipse.passage.lbc.server.product/.project diff --git a/products/org.eclipse.passage.lbc.server.product/.settings/org.eclipse.core.resources.prefs b/products/org.eclipse.passage.lbc.fls.product/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from products/org.eclipse.passage.lbc.server.product/.settings/org.eclipse.core.resources.prefs rename to products/org.eclipse.passage.lbc.fls.product/.settings/org.eclipse.core.resources.prefs diff --git a/products/org.eclipse.passage.lbc.server.product/common-license.licen b/products/org.eclipse.passage.lbc.fls.product/common-license.licen similarity index 100% rename from products/org.eclipse.passage.lbc.server.product/common-license.licen rename to products/org.eclipse.passage.lbc.fls.product/common-license.licen diff --git a/products/org.eclipse.passage.lbc.server.product/org.eclipse.passage.lbc.server.product b/products/org.eclipse.passage.lbc.fls.product/org.eclipse.passage.lbc.fls.product similarity index 100% rename from products/org.eclipse.passage.lbc.server.product/org.eclipse.passage.lbc.server.product rename to products/org.eclipse.passage.lbc.fls.product/org.eclipse.passage.lbc.fls.product diff --git a/products/org.eclipse.passage.lbc.server.product/pom.xml b/products/org.eclipse.passage.lbc.fls.product/pom.xml similarity index 97% rename from products/org.eclipse.passage.lbc.server.product/pom.xml rename to products/org.eclipse.passage.lbc.fls.product/pom.xml index 500f0aba9..f54730255 100644 --- a/products/org.eclipse.passage.lbc.server.product/pom.xml +++ b/products/org.eclipse.passage.lbc.fls.product/pom.xml @@ -17,7 +17,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.eclipse.passage.lbc.server.product + org.eclipse.passage.lbc.fls.product eclipse-repository diff --git a/products/org.eclipse.passage.lbc.server.product/.project b/products/org.eclipse.passage.lbc.server.product/.project deleted file mode 100644 index d568be4a8..000000000 --- a/products/org.eclipse.passage.lbc.server.product/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.passage.lbc.server.product - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - From 1cf1ebc66db588396e5245f5655f6cdb62fa2ba9 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Sat, 27 Mar 2021 16:45:33 +0300 Subject: [PATCH 9/9] Bug 572353 lease a license for common use Rename product module from 'lbc.server' to 'lbc.fls' as it's not the only server planned to be developed in the scope of back-end components Signed-off-by: eparovyshnaya --- .../.project | 17 +++++++++++++++++ .../org.eclipse.passage.lbc.aggregator/pom.xml | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 products/org.eclipse.passage.lbc.fls.product/.project diff --git a/products/org.eclipse.passage.lbc.fls.product/.project b/products/org.eclipse.passage.lbc.fls.product/.project new file mode 100644 index 000000000..b79181288 --- /dev/null +++ b/products/org.eclipse.passage.lbc.fls.product/.project @@ -0,0 +1,17 @@ + + + org.eclipse.passage.lbc.fls.product + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/releng/org.eclipse.passage.lbc.aggregator/pom.xml b/releng/org.eclipse.passage.lbc.aggregator/pom.xml index d96181f65..76076cc42 100644 --- a/releng/org.eclipse.passage.lbc.aggregator/pom.xml +++ b/releng/org.eclipse.passage.lbc.aggregator/pom.xml @@ -37,7 +37,7 @@ ../../features/org.eclipse.passage.lbc.execute.feature ../../features/org.eclipse.passage.lbc.seal.feature ../../releng/org.eclipse.passage.lbc.repository - ../../products/org.eclipse.passage.lbc.server.product + ../../products/org.eclipse.passage.lbc.fls.product \ No newline at end of file