Commit 6bb4a247 authored by Robert Smith's avatar Robert Smith
Browse files

Fixed Windows launch configuration and cleaned up OSGI files



The ice.product_WINDOWS.launch file now runs ICE correctly. 

Also, several OSGI related files were out of date, referencing services
which had been moved or were no longer needed. This commit updated them. 
Signed-off-by: Robert Smith's avatarRobert Smith <SmithRW@ornl.gov>
parent 05d8d06a
......@@ -126,7 +126,5 @@ Require-Bundle: org.eclipse.ice.client.compatibility;bundle-version="2.0.0",
org.eclipse.ice.datastructures,
org.eclipse.ice.viz.service;bundle-version="2.0.0"
Bundle-ClassPath: .
Service-Component: OSGI-INF/MasterApplicationFactory.xml,
OSGI-INF/MasterApplicationHolder.xml
Bundle-Vendor: Oak Ridge National Laboratory
Bundle-ActivationPolicy: lazy
......@@ -46,7 +46,4 @@ Import-Package: com.jme3.app,
org.osgi.framework;version="1.6.0",
org.slf4j;version="1.7.2"
Export-Package: org.eclipse.ice.client.widgets
Service-Component: OSGI-INF/eclipseWidgetsComponent.xml,
OSGI-INF/meshPageVizService.xml,
OSGI-INF/formEditorVizService.xml
Bundle-Vendor: Oak Ridge National Laboratory
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.ice.client.widgets.ICEFormEditor">
<implementation class="org.eclipse.ice.client.widgets.ICEMeshPage"/>
<reference bind="setVizServiceFactory" cardinality="1..1" interface="org.eclipse.ice.viz.service.IVizServiceFactory" name="IVizServiceFactory" policy="dynamic"/>
</scr:component>
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="false" name="org.eclipse.ice.materials.ui">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="true" immediate="true" name="org.eclipse.ice.materials.ui">
<implementation class="org.eclipse.ice.materials.ui.MaterialsDatabaseServiceHolder"/>
<reference bind="set" cardinality="1..1" interface="org.eclipse.ice.materials.IMaterialsDatabase" name="IMaterialsDatabase" policy="static"/>
</scr:component>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment