Author: mes
Date: 2011-09-15 15:12:59 -0700 (Thu, 15 Sep 2011)
New Revision: 26828
Added:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/vizmap-impl/impl/osgi.bnd
core3/impl/branches/no-spring/vizmap-impl/pom.xml
Log:
initial renaming of bundle context files
Modified: core3/impl/branches/no-spring/vizmap-impl/impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/vizmap-impl/impl/osgi.bnd 2011-09-15
22:06:16 UTC (rev 26827)
+++ core3/impl/branches/no-spring/vizmap-impl/impl/osgi.bnd 2011-09-15
22:12:59 UTC (rev 26828)
@@ -3,4 +3,5 @@
#-----------------------------------------------------------------
Private-Package: ${bundle.namespace}.internal,${bundle.namespace}.internal.*
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Added:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
2011-09-15 22:12:59 UTC (rev 26828)
@@ -0,0 +1,71 @@
+
+
+
+
+package org.cytoscape.view.vizmap.internal;
+
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.view.presentation.RenderingEngineManager;
+
+import org.cytoscape.view.vizmap.internal.mappings.PassthroughMappingFactory;
+import org.cytoscape.view.vizmap.internal.VisualMappingManagerImpl;
+import org.cytoscape.view.vizmap.internal.mappings.ContinuousMappingFactory;
+import org.cytoscape.view.vizmap.internal.mappings.DiscreteMappingFactory;
+import org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl;
+import org.cytoscape.view.vizmap.internal.VisualLexiconManager;
+
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
+
+import org.cytoscape.view.presentation.RenderingEngineFactory;
+
+import org.osgi.framework.BundleContext;
+
+import org.cytoscape.service.util.AbstractCyActivator;
+
+import java.util.Properties;
+
+
+
+public class CyActivator extends AbstractCyActivator {
+ public CyActivator() {
+ super();
+ }
+
+
+ public void start(BundleContext bc) {
+
+ CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+ RenderingEngineManager renderingEngineManagerServiceRef =
getService(bc,RenderingEngineManager.class);
+
+ VisualLexiconManager visualLexiconManager = new
VisualLexiconManager();
+ VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(visualLexiconManager);
+ VisualMappingManagerImpl visualMappingManager = new
VisualMappingManagerImpl(cyEventHelperServiceRef,visualStyleFactory,visualLexiconManager);
+ DiscreteMappingFactory discreteMappingFactory = new
DiscreteMappingFactory();
+ ContinuousMappingFactory continuousMappingFactory = new
ContinuousMappingFactory();
+ PassthroughMappingFactory passthroughMappingFactory = new
PassthroughMappingFactory();
+
+
registerService(bc,visualMappingManager,VisualMappingManager.class, new
Properties());
+ registerService(bc,visualStyleFactory,VisualStyleFactory.class,
new Properties());
+
+ Properties discreteMappingFactoryProps = new Properties();
+
discreteMappingFactoryProps.setProperty("service.type","factory");
+
discreteMappingFactoryProps.setProperty("mapping.type","discrete");
+
registerService(bc,discreteMappingFactory,VisualMappingFunctionFactory.class,
discreteMappingFactoryProps);
+
+ Properties continuousMappingFactoryProps = new Properties();
+
continuousMappingFactoryProps.setProperty("service.type","factory");
+
continuousMappingFactoryProps.setProperty("mapping.type","continuous");
+
registerService(bc,continuousMappingFactory,VisualMappingFunctionFactory.class,
continuousMappingFactoryProps);
+
+ Properties passthroughMappingFactoryProps = new Properties();
+
passthroughMappingFactoryProps.setProperty("service.type","factory");
+
passthroughMappingFactoryProps.setProperty("mapping.type","passthrough");
+
registerService(bc,passthroughMappingFactory,VisualMappingFunctionFactory.class,
passthroughMappingFactoryProps);
+
+
registerServiceListener(bc,visualLexiconManager,"addRenderingEngineFactory","removeRenderingEngineFactory",RenderingEngineFactory.class);
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 22:06:16 UTC (rev 26827)
+++
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 22:12:59 UTC (rev 26828)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
-
-
- <!-- Export VMM as an OSGi Service -->
- <osgi:service id="visualMappingManagerService"
ref="visualMappingManager"
- interface="org.cytoscape.view.vizmap.VisualMappingManager">
- </osgi:service>
-
- <!-- Export Visual Style Factory as an OSGi Service -->
- <osgi:service id="visualStyleFactoryService" ref="visualStyleFactory"
- 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" />
-
- <osgi:reference id="renderingEngineManagerServiceRef"
-
interface="org.cytoscape.view.presentation.RenderingEngineManager" />
-
- <osgi:set id="renderingEngineFactorySet"
-
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
- cardinality="0..N">
- <osgi:listener bind-method="addRenderingEngineFactory"
- unbind-method="removeRenderingEngineFactory"
ref="visualLexiconManager" />
- </osgi:set>
-
-</beans>
Copied:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 22:12:59 UTC (rev 26828)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
+ default-lazy-init="false">
+
+
+ <!-- Export VMM as an OSGi Service -->
+ <osgi:service id="visualMappingManagerService"
ref="visualMappingManager"
+ interface="org.cytoscape.view.vizmap.VisualMappingManager">
+ </osgi:service>
+
+ <!-- Export Visual Style Factory as an OSGi Service -->
+ <osgi:service id="visualStyleFactoryService" ref="visualStyleFactory"
+ 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" />
+
+ <osgi:reference id="renderingEngineManagerServiceRef"
+
interface="org.cytoscape.view.presentation.RenderingEngineManager" />
+
+ <osgi:set id="renderingEngineFactorySet"
+
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addRenderingEngineFactory"
+ unbind-method="removeRenderingEngineFactory"
ref="visualLexiconManager" />
+ </osgi:set>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 22:06:16 UTC (rev 26827)
+++
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 22:12:59 UTC (rev 26828)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
- xmlns:context="http://www.springframework.org/schema/context";
- xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
-
- <import resource="bundle-context-osgi.xml" />
-
- <context:annotation-config />
-
- <bean id="visualLexiconManager"
class="org.cytoscape.view.vizmap.internal.VisualLexiconManager" />
-
- <bean id="visualStyleFactory"
-
class="org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl">
- <constructor-arg ref="visualLexiconManager" />
- </bean>
-
- <bean id="visualMappingManager"
-
class="org.cytoscape.view.vizmap.internal.VisualMappingManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="visualStyleFactory" />
- <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>
Copied:
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/vizmap-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 22:12:59 UTC (rev 26828)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:aop="http://www.springframework.org/schema/aop";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:lang="http://www.springframework.org/schema/lang";
xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
+ default-lazy-init="false">
+
+ <import resource="bundle-context-osgi.xml" />
+
+ <context:annotation-config />
+
+ <bean id="visualLexiconManager"
class="org.cytoscape.view.vizmap.internal.VisualLexiconManager" />
+
+ <bean id="visualStyleFactory"
+
class="org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl">
+ <constructor-arg ref="visualLexiconManager" />
+ </bean>
+
+ <bean id="visualMappingManager"
+
class="org.cytoscape.view.vizmap.internal.VisualMappingManagerImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="visualStyleFactory" />
+ <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/impl/branches/no-spring/vizmap-impl/pom.xml
===================================================================
--- core3/impl/branches/no-spring/vizmap-impl/pom.xml 2011-09-15 22:06:16 UTC
(rev 26827)
+++ core3/impl/branches/no-spring/vizmap-impl/pom.xml 2011-09-15 22:12:59 UTC
(rev 26828)
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>service-api</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
--
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.
