Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 552796 - [Passage] Server could not bind a conditional transport #49

Merged
merged 1 commit into from
Nov 8, 2019
Merged

Bug 552796 - [Passage] Server could not bind a conditional transport #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...NF/org.eclipse.passage.lbc.internal.equinox.conditions.AcquireConditionActionExecutor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<service>
<provide interface="org.eclipse.passage.lbc.api.BackendActionExecutor"/>
</service>
<reference bind="bindConditionMiner" cardinality="0..n" interface="org.eclipse.passage.lic.api.conditions.ConditionMiner" name="ConditionMiner" unbind="unbindConditionMiner"/>
<reference bind="bindConditionTransport" cardinality="0..n" interface="org.eclipse.passage.lic.api.conditions.ConditionTransport" name="ConditionTransport" unbind="unbindConditionTransport"/>
<reference bind="bindConditionMiner" cardinality="0..n" interface="org.eclipse.passage.lic.api.conditions.ConditionMiner" name="ConditionMiner" policy="dynamic" unbind="unbindConditionMiner"/>
<reference bind="bindConditionTransport" cardinality="0..n" interface="org.eclipse.passage.lic.api.conditions.ConditionTransport" name="ConditionTransport" policy="dynamic" unbind="unbindConditionTransport"/>
</scr:component>
6 changes: 4 additions & 2 deletions ...ox/OSGI-INF/org.eclipse.passage.lbc.internal.equinox.conditions.ServerConditionsMiner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.passage.lbc.internal.equinox.conditions.ServerConditionsMiner">
<implementation class="org.eclipse.passage.lbc.internal.equinox.conditions.ServerConditionsMiner"/>
<reference bind="bindConditionTransport" cardinality="0..n" interface="org.eclipse.passage.lic.api.conditions.ConditionTransport" name="ConditionTransport" unbind="unbindConditionTransport"/>
<service>
<provide interface="org.eclipse.passage.lic.api.conditions.ConditionMiner"/>
</service>
<reference bind="bindConditionTransport" cardinality="0..n" interface="org.eclipse.passage.lic.api.conditions.ConditionTransport" name="ConditionTransport" policy="dynamic" unbind="unbindConditionTransport"/>
<reference bind="bindKeyKeeperRegistry" interface="org.eclipse.passage.lic.api.io.KeyKeeperRegistry" name="KeyKeeperRegistry" policy="dynamic" unbind="unbindKeyKeeperRegistry"/>
<reference bind="bindStreamCodecRegistry" interface="org.eclipse.passage.lic.api.io.StreamCodecRegistry" name="StreamCodecRegistry" policy="dynamic" unbind="unbindStreamCodecRegistry"/>
<implementation class="org.eclipse.passage.lbc.internal.equinox.conditions.ServerConditionsMiner"/>
</scr:component>
10 changes: 6 additions & 4 deletions ...c/org/eclipse/passage/lbc/internal/equinox/conditions/AcquireConditionActionExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -65,7 +66,7 @@ public LicensingResult executeAction(HttpServletRequest request, HttpServletResp
}
try {
String productId = request.getParameter(LicensingConfigurations.LICENSING_PRODUCT_IDENTIFIER);
String productVersion = request.getParameter(LicensingConfigurations.LICENSING_PRODUCT_IDENTIFIER);
String productVersion = request.getParameter(LicensingConfigurations.LICENSING_PRODUCT_VERSION);
LicensingConfiguration configuration = LicensingConfigurations.create(productId, productVersion);

Collection<LicensingCondition> resultConditions = new ArrayList<>();
Expand All @@ -77,7 +78,8 @@ public LicensingResult executeAction(HttpServletRequest request, HttpServletResp
String contentType = request.getParameter(LicensingProperties.LICENSING_CONTENT_TYPE);
ConditionTransport transport = mapCondition2Transport.get(contentType);
if (transport == null) {
String error = NLS.bind(EquinoxMessages.AcquireConditionActionExecutor_e_transport_not_defined, contentType);
String error = NLS.bind(EquinoxMessages.AcquireConditionActionExecutor_e_transport_not_defined,
contentType);
LOG.error(error);
return LicensingResults.createError(error, source);
}
Expand All @@ -93,7 +95,7 @@ public LicensingResult executeAction(HttpServletRequest request, HttpServletResp
}
}

@Reference(cardinality = ReferenceCardinality.MULTIPLE)
@Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
public void bindConditionMiner(ConditionMiner conditionMiner) {
this.licenseConditionMiners.add(conditionMiner);
}
Expand All @@ -102,7 +104,7 @@ public void unbindConditionMiner(ConditionMiner conditionMiner) {
this.licenseConditionMiners.remove(conditionMiner);
}

@Reference(cardinality = ReferenceCardinality.MULTIPLE)
@Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
public void bindConditionTransport(ConditionTransport transport, Map<String, String> context) {
String conditionType = context.get(LicensingProperties.LICENSING_CONTENT_TYPE);
mapCondition2Transport.put(conditionType, transport);
Expand Down
15 changes: 11 additions & 4 deletions ...quinox/src/org/eclipse/passage/lbc/internal/equinox/conditions/ServerConditionsMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
*******************************************************************************/
package org.eclipse.passage.lbc.internal.equinox.conditions;

import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map;

import org.eclipse.passage.lic.api.LicensingReporter;
Expand All @@ -21,10 +23,11 @@
import org.eclipse.passage.lic.api.io.KeyKeeperRegistry;
import org.eclipse.passage.lic.api.io.StreamCodecRegistry;
import org.eclipse.passage.lic.base.conditions.PathConditionMiner;
import org.eclipse.passage.lic.equinox.io.EquinoxPaths;
import org.eclipse.passage.lic.base.io.LicensingPaths;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;;

@Component(service = ConditionMiner.class)
public class ServerConditionsMiner extends PathConditionMiner {
Expand All @@ -39,6 +42,7 @@ public void unbindLicensingReporter(LicensingReporter reporter) {
super.unbindLicensingReporter(reporter);
}

@Reference(policy = ReferencePolicy.DYNAMIC)
@Override
public void bindKeyKeeperRegistry(KeyKeeperRegistry registry) {
super.bindKeyKeeperRegistry(registry);
Expand All @@ -49,6 +53,7 @@ public void unbindKeyKeeperRegistry(KeyKeeperRegistry registry) {
super.unbindKeyKeeperRegistry(registry);
}

@Reference(policy = ReferencePolicy.DYNAMIC)
@Override
public void bindStreamCodecRegistry(StreamCodecRegistry registry) {
super.bindStreamCodecRegistry(registry);
Expand All @@ -60,7 +65,7 @@ public void unbindStreamCodecRegistry(StreamCodecRegistry registry) {
}

@Override
@Reference(cardinality = ReferenceCardinality.MULTIPLE)
@Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
public void bindConditionTransport(ConditionTransport transport, Map<String, Object> properties) {
super.bindConditionTransport(transport, properties);
}
Expand All @@ -72,7 +77,9 @@ public void unbindConditionTransport(ConditionTransport transport, Map<String, O

@Override
protected Path getBasePath() {
return EquinoxPaths.resolveInstallBasePath();
String property = System.getProperty("user.home"); //$NON-NLS-1$
String value = new File(property).getAbsolutePath();
return Paths.get(value, LicensingPaths.FOLDER_LICENSING_BASE);
}

}
2 changes: 1 addition & 1 deletion ....lbc.equinox/src/org/eclipse/passage/lbc/internal/equinox/i18n/EquinoxMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
###############################################################################

AcquireConditionActionExecutor_e_no_miners=No condition miners available
AcquireConditionActionExecutor_e_transport_not_defined=LicensingConditionTransport not defined for contentType: %s
AcquireConditionActionExecutor_e_transport_not_defined=LicensingConditionTransport not defined for contentType: {0}
AcquireConditionActionExecutor_e_mining_failed=Condition mining failed
AcquireConditionActionExecutor_i_execute_action=Executing action request from class: {0}
AcquireConditionActionExecutor_k_mined=Conditions mined
Expand Down
57 changes: 57 additions & 0 deletions features/org.eclipse.passage.lbc.target.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,61 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.passage.lic.licenses.migration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.passage.lic.emf"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.passage.lic.licenses.model"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.passage.lic.licenses"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.emf.ecore"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.emf.ecore.xmi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>


<plugin
id="org.eclipse.emf.edit"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.emf.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>