Author: mes
Date: 2011-09-12 16:49:28 -0700 (Mon, 12 Sep 2011)
New Revision: 26768
Added:
core3/impl/branches/no-spring/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/CyActivator.java
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/cpath2-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/cpath2-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/cpath2-impl/osgi.bnd 2011-09-12 23:46:44 UTC
(rev 26767)
+++ core3/impl/branches/no-spring/cpath2-impl/osgi.bnd 2011-09-12 23:49:28 UTC
(rev 26768)
@@ -2,6 +2,6 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Private-Package: ${bundle.namespace}.internal.*
Export-Package:
!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"
Added:
core3/impl/branches/no-spring/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/CyActivator.java
2011-09-12 23:49:28 UTC (rev 26768)
@@ -0,0 +1,69 @@
+package org.cytoscape.cpath2.internal;
+
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.util.swing.OpenBrowser;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.biopax.MapBioPaxToCytoscapeFactory;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.biopax.BioPaxContainer;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
+import org.cytoscape.biopax.NetworkListener;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.io.read.CyNetworkReaderManager;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
+
+import org.cytoscape.cpath2.internal.web_service.CytoscapeCPathWebService;
+import org.cytoscape.cpath2.internal.cytoscape.BinarySifVisualStyleUtil;
+import org.cytoscape.cpath2.internal.CPath2Factory;
+
+
+
+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) {
+
+ CySwingApplication cySwingApplicationRef =
getService(bc,CySwingApplication.class);
+ TaskManager taskManagerRef = getService(bc,TaskManager.class);
+ OpenBrowser openBrowserRef = getService(bc,OpenBrowser.class);
+ CyNetworkManager cyNetworkManagerRef =
getService(bc,CyNetworkManager.class);
+ CyApplicationManager cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
+ CyNetworkViewManager cyNetworkViewManagerRef =
getService(bc,CyNetworkViewManager.class);
+ CyNetworkReaderManager cyNetworkViewReaderManagerRef =
getService(bc,CyNetworkReaderManager.class);
+ CyNetworkNaming cyNetworkNamingRef =
getService(bc,CyNetworkNaming.class);
+ CyNetworkFactory cyNetworkFactoryRef =
getService(bc,CyNetworkFactory.class);
+ CyLayoutAlgorithmManager cyLayoutsRef =
getService(bc,CyLayoutAlgorithmManager.class);
+ UndoSupport undoSupportRef = getService(bc,UndoSupport.class);
+ BioPaxContainer bioPaxContainerRef =
getService(bc,BioPaxContainer.class);
+ MapBioPaxToCytoscapeFactory mapBioPaxToCytoscapeFactoryRef =
getService(bc,MapBioPaxToCytoscapeFactory.class);
+ NetworkListener networkListenerRef =
getService(bc,NetworkListener.class);
+ VisualMappingManager visualMappingManagerRef =
getService(bc,VisualMappingManager.class);
+ VisualStyleFactory visualStyleFactoryRef =
getService(bc,VisualStyleFactory.class);
+ VisualMappingFunctionFactory discreteMappingFactoryRef =
getService(bc,VisualMappingFunctionFactory.class,"(mapping.type=discrete)");
+ VisualMappingFunctionFactory passthroughMappingFactoryRef =
getService(bc,VisualMappingFunctionFactory.class,"(mapping.type=passthrough)");
+
+ BinarySifVisualStyleUtil binarySifVisualStyleUtil = new
BinarySifVisualStyleUtil(visualStyleFactoryRef,visualMappingManagerRef,discreteMappingFactoryRef,passthroughMappingFactoryRef);
+ CPath2Factory cPath2Factory = new
CPath2Factory(cySwingApplicationRef,taskManagerRef,openBrowserRef,cyNetworkManagerRef,cyApplicationManagerRef,cyNetworkViewManagerRef,cyNetworkViewReaderManagerRef,cyNetworkNamingRef,cyNetworkFactoryRef,cyLayoutsRef,undoSupportRef,bioPaxContainerRef,mapBioPaxToCytoscapeFactoryRef,networkListenerRef,binarySifVisualStyleUtil,visualMappingManagerRef);
+ CytoscapeCPathWebService cPathWebService = new
CytoscapeCPathWebService(cPath2Factory);
+
+ registerAllServices(bc,cPathWebService, new Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-12 23:46:44 UTC (rev 26767)
+++
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-12 23:49:28 UTC (rev 26768)
@@ -1,67 +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">
-
-
- <!-- Import services -->
- <osgi:reference id="cySwingApplicationRef"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="taskManagerRef"
- interface="org.cytoscape.work.TaskManager" />
-
- <osgi:reference id="openBrowserRef"
- interface="org.cytoscape.util.swing.OpenBrowser" />
-
- <osgi:reference id="cyNetworkManagerRef"
- interface="org.cytoscape.model.CyNetworkManager" />
-
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:reference id="cyNetworkViewManagerRef"
- interface="org.cytoscape.view.model.CyNetworkViewManager" />
-
- <osgi:reference id="cyNetworkViewReaderManagerRef"
- interface="org.cytoscape.io.read.CyNetworkReaderManager" />
-
- <osgi:reference id="cyNetworkNamingRef"
- interface="org.cytoscape.session.CyNetworkNaming" />
-
- <osgi:reference id="cyNetworkFactoryRef"
- interface="org.cytoscape.model.CyNetworkFactory" />
-
- <osgi:reference id="cyLayoutsRef"
- interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager"
/>
-
- <osgi:reference id="undoSupportRef"
- interface="org.cytoscape.work.undo.UndoSupport" />
-
- <osgi:reference id="bioPaxContainerRef"
- interface="org.cytoscape.biopax.BioPaxContainer" />
-
- <osgi:reference id="mapBioPaxToCytoscapeFactoryRef"
- interface="org.cytoscape.biopax.MapBioPaxToCytoscapeFactory" />
-
- <osgi:reference id="networkListenerRef"
- interface="org.cytoscape.biopax.NetworkListener" />
-
- <osgi:reference id="visualMappingManagerRef"
- interface="org.cytoscape.view.vizmap.VisualMappingManager"/>
-
- <osgi:reference id="visualStyleFactoryRef"
- interface="org.cytoscape.view.vizmap.VisualStyleFactory"/>
-
- <osgi:reference id="discreteMappingFactoryRef"
-
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
- filter="(mapping.type=discrete)"/>
-
- <osgi:reference id="passthroughMappingFactoryRef"
-
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
- filter="(mapping.type=passthrough)"/>
-
- <osgi:service ref="cPathWebService" auto-export="interfaces" />
-</beans>
Copied:
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-12 23:49:28 UTC (rev 26768)
@@ -0,0 +1,67 @@
+<?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">
+
+
+ <!-- Import services -->
+ <osgi:reference id="cySwingApplicationRef"
+ interface="org.cytoscape.application.swing.CySwingApplication"
/>
+
+ <osgi:reference id="taskManagerRef"
+ interface="org.cytoscape.work.TaskManager" />
+
+ <osgi:reference id="openBrowserRef"
+ interface="org.cytoscape.util.swing.OpenBrowser" />
+
+ <osgi:reference id="cyNetworkManagerRef"
+ interface="org.cytoscape.model.CyNetworkManager" />
+
+ <osgi:reference id="cyApplicationManagerRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <osgi:reference id="cyNetworkViewManagerRef"
+ interface="org.cytoscape.view.model.CyNetworkViewManager" />
+
+ <osgi:reference id="cyNetworkViewReaderManagerRef"
+ interface="org.cytoscape.io.read.CyNetworkReaderManager" />
+
+ <osgi:reference id="cyNetworkNamingRef"
+ interface="org.cytoscape.session.CyNetworkNaming" />
+
+ <osgi:reference id="cyNetworkFactoryRef"
+ interface="org.cytoscape.model.CyNetworkFactory" />
+
+ <osgi:reference id="cyLayoutsRef"
+ interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager"
/>
+
+ <osgi:reference id="undoSupportRef"
+ interface="org.cytoscape.work.undo.UndoSupport" />
+
+ <osgi:reference id="bioPaxContainerRef"
+ interface="org.cytoscape.biopax.BioPaxContainer" />
+
+ <osgi:reference id="mapBioPaxToCytoscapeFactoryRef"
+ interface="org.cytoscape.biopax.MapBioPaxToCytoscapeFactory" />
+
+ <osgi:reference id="networkListenerRef"
+ interface="org.cytoscape.biopax.NetworkListener" />
+
+ <osgi:reference id="visualMappingManagerRef"
+ interface="org.cytoscape.view.vizmap.VisualMappingManager"/>
+
+ <osgi:reference id="visualStyleFactoryRef"
+ interface="org.cytoscape.view.vizmap.VisualStyleFactory"/>
+
+ <osgi:reference id="discreteMappingFactoryRef"
+
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
+ filter="(mapping.type=discrete)"/>
+
+ <osgi:reference id="passthroughMappingFactoryRef"
+
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
+ filter="(mapping.type=passthrough)"/>
+
+ <osgi:service ref="cPathWebService" auto-export="interfaces" />
+</beans>
Deleted:
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-12 23:46:44 UTC (rev 26767)
+++
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-12 23:49:28 UTC (rev 26768)
@@ -1,48 +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="true">
-
- <context:annotation-config />
-
- <bean id="cPath2Factory"
class="org.cytoscape.cpath2.internal.CPath2Factory">
- <constructor-arg ref="cySwingApplicationRef" />
- <constructor-arg ref="taskManagerRef" />
- <constructor-arg ref="openBrowserRef" />
- <constructor-arg ref="cyNetworkManagerRef" />
- <constructor-arg ref="cyApplicationManagerRef" />
- <constructor-arg ref="cyNetworkViewManagerRef" />
- <constructor-arg ref="cyNetworkViewReaderManagerRef" />
- <constructor-arg ref="cyNetworkNamingRef" />
- <constructor-arg ref="cyNetworkFactoryRef" />
- <constructor-arg ref="cyLayoutsRef" />
- <constructor-arg ref="undoSupportRef" />
- <constructor-arg ref="bioPaxContainerRef" />
- <constructor-arg ref="mapBioPaxToCytoscapeFactoryRef" />
- <constructor-arg ref="networkListenerRef" />
- <constructor-arg ref="binarySifVisualStyleUtil" />
- <constructor-arg ref="visualMappingManagerRef" />
- </bean>
-
- <bean id="cPathWebService"
class="org.cytoscape.cpath2.internal.web_service.CytoscapeCPathWebService">
- <constructor-arg ref="cPath2Factory" />
- </bean>
-
- <bean id="binarySifVisualStyleUtil"
class="org.cytoscape.cpath2.internal.cytoscape.BinarySifVisualStyleUtil">
- <constructor-arg ref="visualStyleFactoryRef" />
- <constructor-arg ref="visualMappingManagerRef" />
- <constructor-arg ref="discreteMappingFactoryRef" />
- <constructor-arg ref="passthroughMappingFactoryRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/cpath2-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-12 23:49:28 UTC (rev 26768)
@@ -0,0 +1,48 @@
+<?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="true">
+
+ <context:annotation-config />
+
+ <bean id="cPath2Factory"
class="org.cytoscape.cpath2.internal.CPath2Factory">
+ <constructor-arg ref="cySwingApplicationRef" />
+ <constructor-arg ref="taskManagerRef" />
+ <constructor-arg ref="openBrowserRef" />
+ <constructor-arg ref="cyNetworkManagerRef" />
+ <constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="cyNetworkViewManagerRef" />
+ <constructor-arg ref="cyNetworkViewReaderManagerRef" />
+ <constructor-arg ref="cyNetworkNamingRef" />
+ <constructor-arg ref="cyNetworkFactoryRef" />
+ <constructor-arg ref="cyLayoutsRef" />
+ <constructor-arg ref="undoSupportRef" />
+ <constructor-arg ref="bioPaxContainerRef" />
+ <constructor-arg ref="mapBioPaxToCytoscapeFactoryRef" />
+ <constructor-arg ref="networkListenerRef" />
+ <constructor-arg ref="binarySifVisualStyleUtil" />
+ <constructor-arg ref="visualMappingManagerRef" />
+ </bean>
+
+ <bean id="cPathWebService"
class="org.cytoscape.cpath2.internal.web_service.CytoscapeCPathWebService">
+ <constructor-arg ref="cPath2Factory" />
+ </bean>
+
+ <bean id="binarySifVisualStyleUtil"
class="org.cytoscape.cpath2.internal.cytoscape.BinarySifVisualStyleUtil">
+ <constructor-arg ref="visualStyleFactoryRef" />
+ <constructor-arg ref="visualMappingManagerRef" />
+ <constructor-arg ref="discreteMappingFactoryRef" />
+ <constructor-arg ref="passthroughMappingFactoryRef" />
+ </bean>
+</beans>
--
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.
