Skip to content

Commit

Permalink
Showing 11 changed files with 13 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -65,9 +65,9 @@
import org.eclipse.passage.lic.equinox.requirements.BundleRequirements;
import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements;
import org.eclipse.passage.lic.internal.json.JsonConditionTransport;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.UserFilteringConditionTransport;
import org.eclipse.passage.lic.internal.net.api.handle.NetRequest;
import org.eclipse.passage.lic.internal.net.handle.ProductUserRequest;
import org.eclipse.passage.lic.licenses.model.transport.UserFilteringConditionTransport;
import org.eclipse.passage.lic.oshi.HardwareAssessmentService;
import org.eclipse.passage.lic.oshi.HardwareEnvironment;

Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@
import org.eclipse.passage.lic.base.io.PathKeyKeeper;
import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
import org.eclipse.passage.lic.bc.BcStreamCodec;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.transport.XmiConditionTransport;

@SuppressWarnings("restriction")
final class PassageFlsGear implements FlsGear {
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@
import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper;
import org.eclipse.passage.lic.equinox.requirements.BundleRequirements;
import org.eclipse.passage.lic.equinox.requirements.ComponentRequirements;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.transport.XmiConditionTransport;
import org.eclipse.passage.lic.oshi.HardwareAssessmentService;
import org.eclipse.passage.lic.oshi.HardwareEnvironment;
import org.osgi.framework.Bundle;
Original file line number Diff line number Diff line change
@@ -14,17 +14,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=
org.eclipse.passage.lic.emf;bundle-version="2.0.0",
org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.base;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.lic.internal.licenses.convert;
x-friends:="org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.internal.licenses.model;
x-friends:="org.eclipse.passage.lic.licenses.migration,
org.eclipse.passage.loc.dashboard.ui,
org.eclipse.passage.loc.licenses.core",
Export-Package: org.eclipse.passage.lic.internal.licenses.convert;x-friends:="org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.internal.licenses.model;x-friends:="org.eclipse.passage.lic.licenses.migration,org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.licenses.core",
org.eclipse.passage.lic.internal.licenses.model.signature,
org.eclipse.passage.lic.internal.licenses.model.toberemoved;x-internal:=true,
org.eclipse.passage.lic.licenses.model.api,
org.eclipse.passage.lic.licenses.model.impl;x-internal:=true,
org.eclipse.passage.lic.licenses.model.meta,
org.eclipse.passage.lic.licenses.model.transport,
org.eclipse.passage.lic.licenses.model.util
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.internal.licenses.model.toberemoved;
package org.eclipse.passage.lic.licenses.model.transport;

import java.io.IOException;
import java.io.InputStream;
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.internal.licenses.model.toberemoved;
package org.eclipse.passage.lic.licenses.model.transport;

import java.util.Objects;
import java.util.function.Supplier;
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
* Contributors:
* ArSysOp - initial API and implementation
*******************************************************************************/
package org.eclipse.passage.lic.internal.licenses.model.toberemoved;
package org.eclipse.passage.lic.licenses.model.transport;

public final class XmiConditionTransport extends BaseXmiConditionTransport {

Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
import org.eclipse.passage.lic.bc.BcStreamCodec;
import org.eclipse.passage.lic.hc.remote.impl.Equipment;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.transport.XmiConditionTransport;

@SuppressWarnings("restriction")
final class TestEquipment implements Supplier<Equipment> {
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@
import org.eclipse.passage.lic.api.conditions.Condition;
import org.eclipse.passage.lic.internal.licenses.model.EmptyPersonalFeatureGrant;
import org.eclipse.passage.lic.internal.licenses.model.EmptyPersonalLicensePack;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.api.PersonalFeatureGrant;
import org.eclipse.passage.lic.licenses.model.api.PersonalLicensePack;
import org.eclipse.passage.lic.licenses.model.api.ValidityPeriodClosed;
import org.eclipse.passage.lic.licenses.model.transport.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.util.LicensesResourceImpl;
import org.junit.Rule;
import org.junit.Test;
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
import org.eclipse.passage.lic.base.conditions.BaseValidityPeriodClosed;
import org.eclipse.passage.lic.base.conditions.BaseVersionMatch;
import org.eclipse.passage.lic.base.conditions.MatchingRuleDefault;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.transport.XmiConditionTransport;
import org.junit.Ignore;

@Ignore // fix TODOs to make it test something reasonable
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
import org.eclipse.passage.lic.base.registry.ReadOnlyRegistry;
import org.eclipse.passage.lic.bc.BcStreamCodec;
import org.eclipse.passage.lic.equinox.io.BundleKeyKeeper;
import org.eclipse.passage.lic.internal.licenses.model.toberemoved.XmiConditionTransport;
import org.eclipse.passage.lic.licenses.model.transport.XmiConditionTransport;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

0 comments on commit 3b05778

Please sign in to comment.