Bug 572366 verify product's public key on hc-fls interaction

move not-generated floating.model utils to 'internal' package Signed-off-by: eparovyshnaya <[email protected]>
eclipse-passage · Mar 31, 2021 · 378d043 · 378d043
1 parent 3b26a52
commit 378d043
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 26 deletions.
diff --git a/....lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java b/....lbc.base/src/org/eclipse/passage/lbc/internal/base/ServerAuthenticationInstructions.java
@@ -15,8 +15,8 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.api.EvaluationInstructions;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.base.conditions.BaseEvaluationInstructions;

diff --git a/...g.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/logging/Logging.java b/...g.eclipse.passage.lic.base/src/org/eclipse/passage/lic/internal/base/logging/Logging.java
@@ -29,6 +29,7 @@ public Logging(ConfigSupplier config) {
 	@SuppressWarnings("resource")
 	public void configure() {
 		try {
+			System.setProperty("org.apache.logging.log4j.simplelog.StatusLogger.level", "ERROR"); //$NON-NLS-1$//$NON-NLS-2$
 			ConfigurationSource source = new ConfigurationSource(new FileInputStream(config.get().toFile()));
 			Configurator.initialize(getClass().getClassLoader().getParent(), source);
 		} catch (Exception e) {

diff --git a/bundles/org.eclipse.passage.lic.floating.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.floating.model/META-INF/MANIFEST.MF
@@ -14,7 +14,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=opti
  org.eclipse.passage.lic.floating;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.api;bundle-version="1.0.100",
  org.eclipse.passage.lic.base;bundle-version="1.0.100"
-Export-Package: org.eclipse.passage.lic.floating.model.api;
+Export-Package: org.eclipse.passage.lic.floating.internal.model.convert;x-friends:="org.eclipse.passage.lic.hc",
+ org.eclipse.passage.lic.floating.internal.model.net;x-friends:="org.eclipse.passage.lbc.base,org.eclipse.passage.lic.hc",
+ org.eclipse.passage.lic.floating.model.api;
   x-friends:="org.eclipse.passage.lic.floating.edit,
    org.eclipse.passage.loc.dashboard.ui,
    org.eclipse.passage.loc.api,
@@ -24,7 +26,6 @@ Export-Package: org.eclipse.passage.lic.floating.model.api;
    org.eclipse.passage.lbc.base,
    org.eclipse.passage.lbc.api,
    org.eclipse.passage.lbc.base.tests",
- org.eclipse.passage.lic.floating.model.convert;x-friends:="org.eclipse.passage.lic.hc",
  org.eclipse.passage.lic.floating.model.impl;x-internal:=true,
  org.eclipse.passage.lic.floating.model.meta;
   x-friends:="org.eclipse.passage.lic.floating.e4.ui,
@@ -35,7 +36,6 @@ Export-Package: org.eclipse.passage.lic.floating.model.api;
    org.eclipse.passage.lbc.base,
    org.eclipse.passage.lbc.base.tests,
    org.eclipse.passage.lic.hc",
- org.eclipse.passage.lic.floating.model.net,
  org.eclipse.passage.lic.floating.model.util;x-friends:="org.eclipse.passage.lic.floating.edit"
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
diff --git a/...ting/model/convert/EGrantAcquisition.java → ...rnal/model/convert/EGrantAcquisition.java b/...ting/model/convert/EGrantAcquisition.java → ...rnal/model/convert/EGrantAcquisition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 ArSysOp
+ * Copyright (c) 2020, 2021 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.floating.model.convert;
+package org.eclipse.passage.lic.floating.internal.model.convert;
 
 import java.util.function.Supplier;
 

diff --git a/...ting/model/convert/PGrantAcquisition.java → ...rnal/model/convert/PGrantAcquisition.java b/...ting/model/convert/PGrantAcquisition.java → ...rnal/model/convert/PGrantAcquisition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 ArSysOp
+ * Copyright (c) 2020, 2021 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -10,15 +10,16 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.floating.model.convert;
+package org.eclipse.passage.lic.floating.internal.model.convert;
 
 import java.util.Objects;
 import java.util.function.Supplier;
 
 import org.eclipse.passage.lic.floating.model.api.GrantAcqisition;
 import org.eclipse.passage.lic.internal.base.acquire.BaseGrantAcquisition;
 
-public final class PGrantAcquisition implements Supplier<org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition> {
+public final class PGrantAcquisition
+		implements Supplier<org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition> {
 
 	private final GrantAcqisition source;
 

diff --git a/...l/net/ServerAuthenticationExpression.java → ...l/net/ServerAuthenticationExpression.java b/...l/net/ServerAuthenticationExpression.java → ...l/net/ServerAuthenticationExpression.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 ArSysOp
+ * Copyright (c) 2020, 2021 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.floating.model.net;
+package org.eclipse.passage.lic.floating.internal.model.net;
 
 import java.util.function.Function;
 

diff --git a/...g/model/net/ServerAuthenticationType.java → ...l/model/net/ServerAuthenticationType.java b/...g/model/net/ServerAuthenticationType.java → ...l/model/net/ServerAuthenticationType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 ArSysOp
+ * Copyright (c) 2020, 2021 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -10,7 +10,7 @@
  * Contributors:
  *     ArSysOp - initial API and implementation
  *******************************************************************************/
-package org.eclipse.passage.lic.floating.model.net;
+package org.eclipse.passage.lic.floating.internal.model.net;
 
 import java.util.function.Function;
 

diff --git a/...passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java b/...passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/RequestParameters.java
@@ -18,9 +18,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.PassageAction;

diff --git a/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java b/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteAcquire.java
@@ -15,8 +15,8 @@
 import java.nio.file.Path;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.floating.internal.model.convert.PGrantAcquisition;
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
-import org.eclipse.passage.lic.floating.model.convert.PGrantAcquisition;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition;
 import org.eclipse.passage.lic.internal.api.io.HashesRegistry;

diff --git a/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java b/...age.lic.hc/src/org/eclipse/passage/lic/internal/hc/remote/impl/acquire/RemoteRelease.java
@@ -15,8 +15,8 @@
 import java.nio.file.Path;
 import java.util.function.Supplier;
 
+import org.eclipse.passage.lic.floating.internal.model.convert.EGrantAcquisition;
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
-import org.eclipse.passage.lic.floating.model.convert.EGrantAcquisition;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.acquire.GrantAcquisition;
 import org.eclipse.passage.lic.internal.api.io.HashesRegistry;

diff --git a/...s/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/MineTest.java b/...s/org.eclipse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/MineTest.java
@@ -18,8 +18,8 @@
 import java.util.Arrays;
 
 import org.eclipse.passage.lbc.internal.base.FlotingRequestHandled;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.base.ProductIdentifier;
@@ -29,6 +29,7 @@
 import org.eclipse.passage.lic.internal.net.handle.Failure;
 import org.junit.Test;
 
+@SuppressWarnings("restriction")
 public final class MineTest {
 
 	@Test

diff --git a/...pse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/RequestConstructed.java b/...pse.passage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/RequestConstructed.java
@@ -21,8 +21,8 @@
 import org.eclipse.passage.lbc.internal.base.EagerFloatingState;
 import org.eclipse.passage.lbc.internal.base.api.FloatingState;
 import org.eclipse.passage.lbc.internal.base.api.RawRequest;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.base.NamedData;

diff --git a/...ssage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ServerAuthenticationTest.java b/...ssage.lbc.base.tests/src/org/eclipse/passage/lbc/base/tests/ServerAuthenticationTest.java
@@ -16,15 +16,16 @@
 import static org.junit.Assert.assertTrue;
 
 import org.eclipse.passage.lbc.internal.base.FlotingRequestHandled;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.api.EvaluationType;
 import org.eclipse.passage.lic.internal.api.PassageAction;
 import org.eclipse.passage.lic.internal.base.StringNamedData;
 import org.eclipse.passage.lic.internal.net.api.handle.NetResponse;
 import org.eclipse.passage.lic.internal.net.handle.Failure;
 import org.junit.Test;
 
+@SuppressWarnings("restriction")
 public final class ServerAuthenticationTest {
 
 	@Test

diff --git a/...c.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java b/...c.hc.tests/src/org/eclipse/passage/lic/internal/hc/tests/RemoteConditionsRequestTest.java
@@ -20,12 +20,12 @@
 import java.io.IOException;
 import java.net.URL;
 
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationExpression;
+import org.eclipse.passage.lic.floating.internal.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.floating.model.api.EvaluationInstructions;
 import org.eclipse.passage.lic.floating.model.api.FloatingLicenseAccess;
 import org.eclipse.passage.lic.floating.model.api.FloatingServerConnection;
 import org.eclipse.passage.lic.floating.model.meta.FloatingFactory;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationExpression;
-import org.eclipse.passage.lic.floating.model.net.ServerAuthenticationType;
 import org.eclipse.passage.lic.internal.api.LicensedProduct;
 import org.eclipse.passage.lic.internal.api.LicensingException;
 import org.eclipse.passage.lic.internal.api.PassageAction;