Skip to content
Browse files

Merge pull request #204 from VWoeltjen/mct199quickFix

[Launcher] Add dependency to default component provider
  • Loading branch information...
2 parents 6b39d28 + 51b20e1 commit f2cdf004b6a2afaffdfbe813b0e62d92ed45460d @harleigh harleigh committed Sep 27, 2013
View
8 platform/src/main/java/gov/nasa/arc/mct/platform/LaunchMCTService.java
@@ -24,9 +24,8 @@
import gov.nasa.arc.mct.context.GlobalContext;
import gov.nasa.arc.mct.gui.impl.MenuExtensionManager;
import gov.nasa.arc.mct.gui.impl.StatusAreaWidgetRegistryImpl;
-import gov.nasa.arc.mct.osgi.platform.OSGIRuntimeImpl;
import gov.nasa.arc.mct.osgi.platform.OSGIRuntime;
-import gov.nasa.arc.mct.platform.spi.PersistenceProvider;
+import gov.nasa.arc.mct.osgi.platform.OSGIRuntimeImpl;
import gov.nasa.arc.mct.platform.spi.Platform;
import gov.nasa.arc.mct.platform.spi.PlatformAccess;
import gov.nasa.arc.mct.policymgr.PolicyManagerImpl;
@@ -63,11 +62,12 @@
private boolean haveInitialized = false;
private Timer t;
- public void bind(PersistenceProvider provider) {
+ public void bind(Object provider) {
// do nothing as this signals launch can proceed
+ // (used to declare dependencies to persistence, default component provider)
}
- public void unbind(PersistenceProvider provider) {
+ public void unbind(Object provider) {
}
View
1 platform/src/main/resources/OSGI-INF/service.xml
@@ -3,6 +3,7 @@
<scr:component name="gov.nasa.arc.mct.platform.LaunchMCTService">
<implementation class="gov.nasa.arc.mct.platform.LaunchMCTService" />
<reference bind="bind" cardinality="1..1" interface="gov.nasa.arc.mct.platform.spi.PersistenceProvider" name="PersistenceService" policy="dynamic" unbind="unbind"/>
+ <reference bind="bind" cardinality="1..n" interface="gov.nasa.arc.mct.platform.spi.DefaultComponentProvider" name="DefaultComponentProvider" policy="dynamic" unbind="unbind"/>
<reference bind="componentProviderAdded" cardinality="0..n" interface="gov.nasa.arc.mct.services.component.ComponentProvider" name="ComponentProvider" policy="dynamic" unbind="componentProviderRemoved"/>
</scr:component>
<scr:component name="gov.nasa.arc.mct.platform.spi.RoleAccess">

0 comments on commit f2cdf00

Please sign in to comment.
Something went wrong with that request. Please try again.