Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-03-05 18:02:34 -0500
committerslewis2018-03-05 18:02:34 -0500
commit010721a8f85b472e5c4598e5c938c527a95c89b7 (patch)
tree25541e37359b227439ebbad71b4bb2c79c2a150f /framework/bundles
parentf58ebe72dabee54d8e04fc54348ceb035056bdfe (diff)
downloadorg.eclipse.ecf-010721a8f85b472e5c4598e5c938c527a95c89b7.tar.gz
org.eclipse.ecf-010721a8f85b472e5c4598e5c938c527a95c89b7.tar.xz
org.eclipse.ecf-010721a8f85b472e5c4598e5c938c527a95c89b7.zip
Fix for ds version
Diffstat (limited to 'framework/bundles')
-rw-r--r--framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml6
-rw-r--r--framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java19
2 files changed, 20 insertions, 5 deletions
diff --git a/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml b/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
index e77a536c4..cafe3f645 100644
--- a/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
+++ b/framework/bundles/org.eclipse.ecf.console/OSGI-INF/org.eclipse.ecf.internal.console.ContainerCommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" immediate="true" name="org.eclipse.ecf.internal.console.ContainerCommand">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.ecf.internal.console.ContainerCommand">
<property name="osgi.command.scope" value="ecf"/>
<property name="osgi.command.function">listcontainers
lcs
@@ -14,7 +14,7 @@ lcfgs
<provide interface="org.eclipse.ecf.internal.console.ContainerCommand"/>
<provide interface="org.apache.felix.service.command.Converter"/>
</service>
- <reference cardinality="1..1" field="containerManager" interface="org.eclipse.ecf.core.IContainerManager" name="containerManager"/>
- <reference cardinality="1..1" field="idFactory" interface="org.eclipse.ecf.core.identity.IIDFactory" name="idFactory"/>
+ <reference bind="bindContainerManager" interface="org.eclipse.ecf.core.IContainerManager" name="ContainerManager" unbind="unbindContainerManager"/>
+ <reference bind="bindIdentityFactory" interface="org.eclipse.ecf.core.identity.IIDFactory" name="IdentityFactory" unbind="unbindIdentityFactory"/>
<implementation class="org.eclipse.ecf.internal.console.ContainerCommand"/>
</scr:component> \ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java
index 60c744070..f5298e376 100644
--- a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java
+++ b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java
@@ -28,11 +28,26 @@ import org.osgi.service.component.annotations.Reference;
"osgi.command.function=lcfgs" }, service = { ContainerCommand.class, Converter.class })
public class ContainerCommand extends AbstractCommand implements Converter {
- @Reference
private IContainerManager containerManager;
- @Reference
private IIDFactory idFactory;
+ @Reference
+ void bindContainerManager(IContainerManager cm) {
+ this.containerManager = cm;
+ }
+
+ void unbindContainerManager(IContainerManager cm) {
+ this.containerManager = null;
+ }
+
+ @Reference
+ void bindIdentityFactory(IIDFactory idf) {
+ this.idFactory = idf;
+ }
+
+ void unbindIdentityFactory(IIDFactory idf) {
+ this.idFactory = null;
+ }
protected IContainerManager getContainerManager() {
return this.containerManager;
}

Back to the top