Author: mes
Date: 2011-07-06 09:19:30 -0700 (Wed, 06 Jul 2011)
New Revision: 26060
Modified:
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context.xml
core3/vizmap-impl/trunk/it/src/test/java/org/cytoscape/view/vizmap/ServiceConfigurationTest.java
Log:
now properly exporting services
Modified:
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-07-06 15:49:44 UTC (rev 26059)
+++
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-07-06 16:19:30 UTC (rev 26060)
@@ -16,6 +16,31 @@
interface="org.cytoscape.view.vizmap.VisualStyleFactory">
</osgi:service>
+ <!-- Individual Service -->
+ <osgi:service id="discreteMappingFactoryService"
ref="discreteMappingFactory"
+
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory">
+ <osgi:service-properties>
+ <entry key="service.type" value="factory" />
+ <entry key="mapping.type" value="discrete" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="continuousMappingFactoryService"
ref="continuousMappingFactory"
+
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory">
+ <osgi:service-properties>
+ <entry key="service.type" value="factory" />
+ <entry key="mapping.type" value="continuous" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="passthroughMappingFactoryService"
ref="passthroughMappingFactory"
+
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory">
+ <osgi:service-properties>
+ <entry key="service.type" value="factory" />
+ <entry key="mapping.type" value="passthrough" />
+ </osgi:service-properties>
+ </osgi:service>
+
<!-- Import Services -->
<osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
Modified:
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-06 15:49:44 UTC (rev 26059)
+++
core3/vizmap-impl/trunk/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-06 16:19:30 UTC (rev 26060)
@@ -32,4 +32,12 @@
<constructor-arg ref="visualLexiconManager" />
</bean>
+
+ <bean id="discreteMappingFactory"
+
class="org.cytoscape.view.vizmap.internal.mappings.DiscreteMappingFactory" />
+ <bean id="continuousMappingFactory"
+
class="org.cytoscape.view.vizmap.internal.mappings.ContinuousMappingFactory" />
+ <bean id="passthroughMappingFactory"
+
class="org.cytoscape.view.vizmap.internal.mappings.PassthroughMappingFactory" />
+
</beans>
Modified:
core3/vizmap-impl/trunk/it/src/test/java/org/cytoscape/view/vizmap/ServiceConfigurationTest.java
===================================================================
---
core3/vizmap-impl/trunk/it/src/test/java/org/cytoscape/view/vizmap/ServiceConfigurationTest.java
2011-07-06 15:49:44 UTC (rev 26059)
+++
core3/vizmap-impl/trunk/it/src/test/java/org/cytoscape/view/vizmap/ServiceConfigurationTest.java
2011-07-06 16:19:30 UTC (rev 26060)
@@ -17,23 +17,12 @@
public void setup() {
registerMockService(CyEventHelper.class);
registerMockService(RenderingEngineManager.class);
-
- Properties p1 = new Properties();
- p1.setProperty("mapping.type","discrete");
- registerMockService(VisualMappingFunctionFactory.class, p1);
-
- Properties p2 = new Properties();
- p2.setProperty("mapping.type","continuous");
- registerMockService(VisualMappingFunctionFactory.class, p2);
-
- Properties p3 = new Properties();
- p3.setProperty("mapping.type","passthrough");
- registerMockService(VisualMappingFunctionFactory.class, p3);
}
@Test
public void testExpectedServices() {
checkService(VisualMappingManager.class);
checkService(VisualStyleFactory.class);
+ checkService(VisualMappingFunctionFactory.class);
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
