Author: mes
Date: 2011-09-15 12:44:35 -0700 (Thu, 15 Sep 2011)
New Revision: 26814
Added:
core3/impl/branches/no-spring/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/plugin-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/plugin-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/plugin-impl/osgi.bnd 2011-09-15 19:42:41 UTC
(rev 26813)
+++ core3/impl/branches/no-spring/plugin-impl/osgi.bnd 2011-09-15 19:44:35 UTC
(rev 26814)
@@ -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, ${bundle.namespace}.internal.*
Added:
core3/impl/branches/no-spring/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyActivator.java
2011-09-15 19:44:35 UTC (rev 26814)
@@ -0,0 +1,105 @@
+package org.cytoscape.plugin.internal;
+
+import org.cytoscape.application.CytoscapeVersion;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.application.CyApplicationConfiguration;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.io.read.CyNetworkReaderManager;
+
+import org.cytoscape.plugin.internal.CyPluginAdapterImpl;
+import org.cytoscape.plugin.internal.action.PluginManagerAction;
+import org.cytoscape.plugin.internal.StartupMostlyFinished;
+import org.cytoscape.plugin.internal.PluginLoaderTaskFactory;
+
+import org.cytoscape.application.swing.CyAction;
+import org.cytoscape.work.TaskFactory;
+
+
+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) {
+
+ CyApplicationManager cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
+ CyEventHelper cyEventHelperRef =
getService(bc,CyEventHelper.class);
+ CyLayoutAlgorithmManager cyLayoutsRef =
getService(bc,CyLayoutAlgorithmManager.class);
+ CyNetworkFactory cyNetworkFactoryRef =
getService(bc,CyNetworkFactory.class);
+ CyNetworkManager cyNetworkManagerRef =
getService(bc,CyNetworkManager.class);
+ CyNetworkViewFactory cyNetworkViewFactoryRef =
getService(bc,CyNetworkViewFactory.class);
+ CyNetworkViewManager cyNetworkViewManagerRef =
getService(bc,CyNetworkViewManager.class);
+ CyNetworkReaderManager cyNetworkViewReaderManagerRef =
getService(bc,CyNetworkReaderManager.class);
+ CyNetworkViewWriterManager cyNetworkViewWriterManagerRef =
getService(bc,CyNetworkViewWriterManager.class);
+ CyProperty cyPropertyRef =
getService(bc,CyProperty.class,"(cyPropertyName=cytoscape3.props)");
+ CyPropertyReaderManager cyPropertyReaderManagerRef =
getService(bc,CyPropertyReaderManager.class);
+ CyPropertyWriterManager cyPropertyWriterManagerRef =
getService(bc,CyPropertyWriterManager.class);
+ CyRootNetworkFactory cyRootNetworkFactoryRef =
getService(bc,CyRootNetworkFactory.class);
+ CyServiceRegistrar cyServiceRegistrarRef =
getService(bc,CyServiceRegistrar.class);
+ CySessionManager cySessionManagerRef =
getService(bc,CySessionManager.class);
+ CySessionReaderManager cySessionReaderManagerRef =
getService(bc,CySessionReaderManager.class);
+ CySessionWriterManager cySessionWriterManagerRef =
getService(bc,CySessionWriterManager.class);
+ CySwingApplication cySwingApplicationRef =
getService(bc,CySwingApplication.class);
+ CyTableFactory cyTableFactoryRef =
getService(bc,CyTableFactory.class);
+ CyTableManager cyTableManagerRef =
getService(bc,CyTableManager.class);
+ CyTableReaderManager cyTableReaderManagerRef =
getService(bc,CyTableReaderManager.class);
+ GUITaskManager guiTaskManagerRef =
getService(bc,GUITaskManager.class);
+ PresentationWriterManager presentationWriterManagerRef =
getService(bc,PresentationWriterManager.class);
+ RenderingEngineManager renderingEngineManagerRef =
getService(bc,RenderingEngineManager.class);
+ TaskManager taskManagerRef = getService(bc,TaskManager.class);
+ UndoSupport undoSupportRef = getService(bc,UndoSupport.class);
+ VisualMappingManager visualMappingManagerRef =
getService(bc,VisualMappingManager.class);
+ VisualStyleFactory visualStyleFactoryRef =
getService(bc,VisualStyleFactory.class);
+ CytoscapeVersion cytoscapeVersionService =
getService(bc,CytoscapeVersion.class);
+ CyProperty bookmarkServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=bookmarks)");
+ BookmarksUtil bookmarksUtilServiceRef =
getService(bc,BookmarksUtil.class);
+ CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,CyApplicationConfiguration.class);
+
+ CyPluginAdapterImpl cyPluginAdapter = new
CyPluginAdapterImpl(cyApplicationManagerRef,cyEventHelperRef,cyLayoutsRef,cyNetworkFactoryRef,cyNetworkManagerRef,cyNetworkViewFactoryRef,cyNetworkViewManagerRef,cyNetworkViewReaderManagerRef,cyNetworkViewWriterManagerRef,cyPropertyRef,cyPropertyReaderManagerRef,cyPropertyWriterManagerRef,cyRootNetworkFactoryRef,cyServiceRegistrarRef,cySessionManagerRef,cySessionReaderManagerRef,cySessionWriterManagerRef,cySwingApplicationRef,cyTableFactoryRef,cyTableManagerRef,cyTableReaderManagerRef,guiTaskManagerRef,presentationWriterManagerRef,renderingEngineManagerRef,taskManagerRef,undoSupportRef,visualMappingManagerRef,visualStyleFactoryRef);
+ PluginLoaderTaskFactory pluginLoaderTaskFactory = new
PluginLoaderTaskFactory(cyPluginAdapter);
+ PluginManagerAction pluginManagerAction = new
PluginManagerAction(cySwingApplicationRef,cyApplicationManagerRef,cytoscapeVersionService,bookmarkServiceRef,bookmarksUtilServiceRef,guiTaskManagerRef,cyPropertyRef,cyPluginAdapter,pluginLoaderTaskFactory,cyApplicationConfigurationServiceRef);
+ StartupMostlyFinished startupMostlyFinished = new
StartupMostlyFinished(cyEventHelperRef);
+
+
+ Properties pluginLoaderTaskFactoryProps = new Properties();
+
pluginLoaderTaskFactoryProps.setProperty("preferredMenu","File.Import");
+ pluginLoaderTaskFactoryProps.setProperty("title","Plugin...");
+ registerService(bc,pluginLoaderTaskFactory,TaskFactory.class,
pluginLoaderTaskFactoryProps);
+ registerService(bc,pluginManagerAction,CyAction.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:42:41 UTC (rev 26813)
+++
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:44:35 UTC (rev 26814)
@@ -1,158 +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">
-
- <!--
- Keep services in alphabetical order to maintain sanity and
- make service reference names the class name with a lower case
- first letter and with "Ref" as a suffix.
- -->
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.application.CyApplicationManager">
- </osgi:reference>
-
- <osgi:reference id="cyEventHelperRef"
- interface="org.cytoscape.event.CyEventHelper">
- </osgi:reference>
-
- <osgi:reference id="cyLayoutsRef"
- interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
- </osgi:reference>
-
- <osgi:reference id="cyNetworkFactoryRef"
- interface="org.cytoscape.model.CyNetworkFactory">
- </osgi:reference>
-
- <osgi:reference id="cyNetworkManagerRef"
- interface="org.cytoscape.model.CyNetworkManager">
- </osgi:reference>
-
- <osgi:reference id="cyNetworkViewFactoryRef"
- interface="org.cytoscape.view.model.CyNetworkViewFactory">
- </osgi:reference>
-
- <osgi:reference id="cyNetworkViewManagerRef"
- interface="org.cytoscape.view.model.CyNetworkViewManager">
- </osgi:reference>
-
- <osgi:reference id="cyNetworkViewReaderManagerRef"
- interface="org.cytoscape.io.read.CyNetworkReaderManager">
- </osgi:reference>
-
- <osgi:reference id="cyNetworkViewWriterManagerRef"
- interface="org.cytoscape.io.write.CyNetworkViewWriterManager">
- </osgi:reference>
-
- <osgi:reference id="cyPropertyRef"
- interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=cytoscape3.props)">
- </osgi:reference>
-
- <osgi:reference id="cyPropertyReaderManagerRef"
- interface="org.cytoscape.io.read.CyPropertyReaderManager">
- </osgi:reference>
-
- <osgi:reference id="cyPropertyWriterManagerRef"
- interface="org.cytoscape.io.write.CyPropertyWriterManager">
- </osgi:reference>
-
- <osgi:reference id="cyRootNetworkFactoryRef"
- interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
- </osgi:reference>
-
- <osgi:reference id="cyServiceRegistrarRef"
- interface="org.cytoscape.service.util.CyServiceRegistrar">
- </osgi:reference>
-
- <osgi:reference id="cySessionManagerRef"
- interface="org.cytoscape.session.CySessionManager">
- </osgi:reference>
-
- <osgi:reference id="cySessionReaderManagerRef"
- interface="org.cytoscape.io.read.CySessionReaderManager">
- </osgi:reference>
-
- <osgi:reference id="cySessionWriterManagerRef"
- interface="org.cytoscape.io.write.CySessionWriterManager">
- </osgi:reference>
-
- <osgi:reference id="cySwingApplicationRef"
- interface="org.cytoscape.application.swing.CySwingApplication">
- </osgi:reference>
-
- <osgi:reference id="cyTableFactoryRef"
- interface="org.cytoscape.model.CyTableFactory">
- </osgi:reference>
-
- <osgi:reference id="cyTableManagerRef"
- interface="org.cytoscape.model.CyTableManager">
- </osgi:reference>
-
- <osgi:reference id="cyTableReaderManagerRef"
- interface="org.cytoscape.io.read.CyTableReaderManager">
- </osgi:reference>
-
-<!--
- <osgi:reference id="cyTableWriterManagerRef"
- interface="org.cytoscape.io.write.CyTableWriterManager">
- </osgi:reference>
- -->
-
- <osgi:reference id="guiTaskManagerRef"
- interface="org.cytoscape.work.swing.GUITaskManager">
- </osgi:reference>
-
- <osgi:reference id="presentationWriterManagerRef"
- interface="org.cytoscape.io.write.PresentationWriterManager">
- </osgi:reference>
-
- <osgi:reference id="renderingEngineManagerRef"
-
interface="org.cytoscape.view.presentation.RenderingEngineManager">
- </osgi:reference>
-
- <osgi:reference id="taskManagerRef"
- interface="org.cytoscape.work.TaskManager">
- </osgi:reference>
-
- <osgi:reference id="undoSupportRef"
- interface="org.cytoscape.work.undo.UndoSupport">
- </osgi:reference>
-
- <osgi:reference id="visualMappingManagerRef"
- interface="org.cytoscape.view.vizmap.VisualMappingManager">
- </osgi:reference>
-
- <osgi:reference id="visualStyleFactoryRef"
- interface="org.cytoscape.view.vizmap.VisualStyleFactory">
- </osgi:reference>
-
- <osgi:reference id="cytoscapeVersionService"
- interface="org.cytoscape.application.CytoscapeVersion" />
-
- <osgi:reference id="bookmarkServiceRef"
- interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=bookmarks)" />
-
- <osgi:reference id="bookmarksUtilServiceRef"
- interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-
- <osgi:reference id="cyApplicationConfigurationServiceRef"
interface="org.cytoscape.application.CyApplicationConfiguration" />
-
-
- <osgi:service id="pluginLoaderTaskFactoryService"
ref="pluginLoaderTaskFactory"
- interface="org.cytoscape.work.TaskFactory">
- <osgi:service-properties>
- <entry key="title" value="Plugin..." />
- <entry key="preferredMenu" value="File.Import" />
- </osgi:service-properties>
- </osgi:service>
-
- <!-- Plugin manager -->
- <osgi:service id="pluginManagerActionService" ref="pluginManagerAction"
- interface="org.cytoscape.application.swing.CyAction" />
-
-</beans>
Copied:
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 19:44:35 UTC (rev 26814)
@@ -0,0 +1,158 @@
+<?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">
+
+ <!--
+ Keep services in alphabetical order to maintain sanity and
+ make service reference names the class name with a lower case
+ first letter and with "Ref" as a suffix.
+ -->
+ <osgi:reference id="cyApplicationManagerRef"
+ interface="org.cytoscape.application.CyApplicationManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyEventHelperRef"
+ interface="org.cytoscape.event.CyEventHelper">
+ </osgi:reference>
+
+ <osgi:reference id="cyLayoutsRef"
+ interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkFactoryRef"
+ interface="org.cytoscape.model.CyNetworkFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkManagerRef"
+ interface="org.cytoscape.model.CyNetworkManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkViewFactoryRef"
+ interface="org.cytoscape.view.model.CyNetworkViewFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkViewManagerRef"
+ interface="org.cytoscape.view.model.CyNetworkViewManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkViewReaderManagerRef"
+ interface="org.cytoscape.io.read.CyNetworkReaderManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyNetworkViewWriterManagerRef"
+ interface="org.cytoscape.io.write.CyNetworkViewWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyPropertyRef"
+ interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=cytoscape3.props)">
+ </osgi:reference>
+
+ <osgi:reference id="cyPropertyReaderManagerRef"
+ interface="org.cytoscape.io.read.CyPropertyReaderManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyPropertyWriterManagerRef"
+ interface="org.cytoscape.io.write.CyPropertyWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyRootNetworkFactoryRef"
+ interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cyServiceRegistrarRef"
+ interface="org.cytoscape.service.util.CyServiceRegistrar">
+ </osgi:reference>
+
+ <osgi:reference id="cySessionManagerRef"
+ interface="org.cytoscape.session.CySessionManager">
+ </osgi:reference>
+
+ <osgi:reference id="cySessionReaderManagerRef"
+ interface="org.cytoscape.io.read.CySessionReaderManager">
+ </osgi:reference>
+
+ <osgi:reference id="cySessionWriterManagerRef"
+ interface="org.cytoscape.io.write.CySessionWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="cySwingApplicationRef"
+ interface="org.cytoscape.application.swing.CySwingApplication">
+ </osgi:reference>
+
+ <osgi:reference id="cyTableFactoryRef"
+ interface="org.cytoscape.model.CyTableFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cyTableManagerRef"
+ interface="org.cytoscape.model.CyTableManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyTableReaderManagerRef"
+ interface="org.cytoscape.io.read.CyTableReaderManager">
+ </osgi:reference>
+
+<!--
+ <osgi:reference id="cyTableWriterManagerRef"
+ interface="org.cytoscape.io.write.CyTableWriterManager">
+ </osgi:reference>
+ -->
+
+ <osgi:reference id="guiTaskManagerRef"
+ interface="org.cytoscape.work.swing.GUITaskManager">
+ </osgi:reference>
+
+ <osgi:reference id="presentationWriterManagerRef"
+ interface="org.cytoscape.io.write.PresentationWriterManager">
+ </osgi:reference>
+
+ <osgi:reference id="renderingEngineManagerRef"
+
interface="org.cytoscape.view.presentation.RenderingEngineManager">
+ </osgi:reference>
+
+ <osgi:reference id="taskManagerRef"
+ interface="org.cytoscape.work.TaskManager">
+ </osgi:reference>
+
+ <osgi:reference id="undoSupportRef"
+ interface="org.cytoscape.work.undo.UndoSupport">
+ </osgi:reference>
+
+ <osgi:reference id="visualMappingManagerRef"
+ interface="org.cytoscape.view.vizmap.VisualMappingManager">
+ </osgi:reference>
+
+ <osgi:reference id="visualStyleFactoryRef"
+ interface="org.cytoscape.view.vizmap.VisualStyleFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cytoscapeVersionService"
+ interface="org.cytoscape.application.CytoscapeVersion" />
+
+ <osgi:reference id="bookmarkServiceRef"
+ interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=bookmarks)" />
+
+ <osgi:reference id="bookmarksUtilServiceRef"
+ interface="org.cytoscape.property.bookmark.BookmarksUtil" />
+
+ <osgi:reference id="cyApplicationConfigurationServiceRef"
interface="org.cytoscape.application.CyApplicationConfiguration" />
+
+
+ <osgi:service id="pluginLoaderTaskFactoryService"
ref="pluginLoaderTaskFactory"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Plugin..." />
+ <entry key="preferredMenu" value="File.Import" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <!-- Plugin manager -->
+ <osgi:service id="pluginManagerActionService" ref="pluginManagerAction"
+ interface="org.cytoscape.application.swing.CyAction" />
+
+</beans>
Deleted:
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:42:41 UTC (rev 26813)
+++
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:44:35 UTC (rev 26814)
@@ -1,76 +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:context="http://www.springframework.org/schema/context";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
-
- <!-- regular spring configuration file defining the beans for this
- bundle. We've kept the osgi definitions in a separate
- configuration file so that this file can easily be used
- for integration testing outside of an OSGi environment -->
-
- <context:annotation-config/>
-
-
- <!-- constructor args are in alphabetical order! -->
-
- <bean id="cyPluginAdapter"
class="org.cytoscape.plugin.internal.CyPluginAdapterImpl">
- <constructor-arg ref="cyApplicationManagerRef" />
- <constructor-arg ref="cyEventHelperRef" />
- <constructor-arg ref="cyLayoutsRef" />
- <constructor-arg ref="cyNetworkFactoryRef" />
- <constructor-arg ref="cyNetworkManagerRef" />
- <constructor-arg ref="cyNetworkViewFactoryRef" />
- <constructor-arg ref="cyNetworkViewManagerRef" />
- <constructor-arg ref="cyNetworkViewReaderManagerRef" />
- <constructor-arg ref="cyNetworkViewWriterManagerRef" />
- <constructor-arg ref="cyPropertyRef" />
- <constructor-arg ref="cyPropertyReaderManagerRef" />
- <constructor-arg ref="cyPropertyWriterManagerRef" />
- <constructor-arg ref="cyRootNetworkFactoryRef" />
- <constructor-arg ref="cyServiceRegistrarRef" />
- <constructor-arg ref="cySessionManagerRef" />
- <constructor-arg ref="cySessionReaderManagerRef" />
- <constructor-arg ref="cySessionWriterManagerRef" />
- <constructor-arg ref="cySwingApplicationRef" />
- <constructor-arg ref="cyTableFactoryRef" />
- <constructor-arg ref="cyTableManagerRef" />
- <constructor-arg ref="cyTableReaderManagerRef" />
- <!--
- <constructor-arg ref="cyTableWriterManagerRef" />
- -->
- <constructor-arg ref="guiTaskManagerRef" />
- <constructor-arg ref="presentationWriterManagerRef" />
- <constructor-arg ref="renderingEngineManagerRef" />
- <constructor-arg ref="taskManagerRef" />
- <constructor-arg ref="undoSupportRef" />
- <constructor-arg ref="visualMappingManagerRef" />
- <constructor-arg ref="visualStyleFactoryRef" />
- </bean>
-
- <bean id="pluginLoaderTaskFactory"
class="org.cytoscape.plugin.internal.PluginLoaderTaskFactory">
- <constructor-arg ref="cyPluginAdapter" />
- </bean>
-
-
- <bean id="pluginManagerAction"
class="org.cytoscape.plugin.internal.action.PluginManagerAction">
- <constructor-arg ref="cySwingApplicationRef" />
- <constructor-arg ref="cyApplicationManagerRef" />
- <constructor-arg ref="cytoscapeVersionService" />
- <constructor-arg ref="bookmarkServiceRef" />
- <constructor-arg ref="bookmarksUtilServiceRef" />
- <constructor-arg ref="guiTaskManagerRef" />
- <constructor-arg ref="cyPropertyRef" />
- <constructor-arg ref="cyPluginAdapter" />
- <constructor-arg ref="pluginLoaderTaskFactory" />
- <constructor-arg ref="cyApplicationConfigurationServiceRef" />
- </bean>
-
- <bean id="startupMostlyFinished"
class="org.cytoscape.plugin.internal.StartupMostlyFinished">
- <constructor-arg ref="cyEventHelperRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/plugin-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 19:44:35 UTC (rev 26814)
@@ -0,0 +1,76 @@
+<?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:context="http://www.springframework.org/schema/context";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+
+ <!-- regular spring configuration file defining the beans for this
+ bundle. We've kept the osgi definitions in a separate
+ configuration file so that this file can easily be used
+ for integration testing outside of an OSGi environment -->
+
+ <context:annotation-config/>
+
+
+ <!-- constructor args are in alphabetical order! -->
+
+ <bean id="cyPluginAdapter"
class="org.cytoscape.plugin.internal.CyPluginAdapterImpl">
+ <constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="cyEventHelperRef" />
+ <constructor-arg ref="cyLayoutsRef" />
+ <constructor-arg ref="cyNetworkFactoryRef" />
+ <constructor-arg ref="cyNetworkManagerRef" />
+ <constructor-arg ref="cyNetworkViewFactoryRef" />
+ <constructor-arg ref="cyNetworkViewManagerRef" />
+ <constructor-arg ref="cyNetworkViewReaderManagerRef" />
+ <constructor-arg ref="cyNetworkViewWriterManagerRef" />
+ <constructor-arg ref="cyPropertyRef" />
+ <constructor-arg ref="cyPropertyReaderManagerRef" />
+ <constructor-arg ref="cyPropertyWriterManagerRef" />
+ <constructor-arg ref="cyRootNetworkFactoryRef" />
+ <constructor-arg ref="cyServiceRegistrarRef" />
+ <constructor-arg ref="cySessionManagerRef" />
+ <constructor-arg ref="cySessionReaderManagerRef" />
+ <constructor-arg ref="cySessionWriterManagerRef" />
+ <constructor-arg ref="cySwingApplicationRef" />
+ <constructor-arg ref="cyTableFactoryRef" />
+ <constructor-arg ref="cyTableManagerRef" />
+ <constructor-arg ref="cyTableReaderManagerRef" />
+ <!--
+ <constructor-arg ref="cyTableWriterManagerRef" />
+ -->
+ <constructor-arg ref="guiTaskManagerRef" />
+ <constructor-arg ref="presentationWriterManagerRef" />
+ <constructor-arg ref="renderingEngineManagerRef" />
+ <constructor-arg ref="taskManagerRef" />
+ <constructor-arg ref="undoSupportRef" />
+ <constructor-arg ref="visualMappingManagerRef" />
+ <constructor-arg ref="visualStyleFactoryRef" />
+ </bean>
+
+ <bean id="pluginLoaderTaskFactory"
class="org.cytoscape.plugin.internal.PluginLoaderTaskFactory">
+ <constructor-arg ref="cyPluginAdapter" />
+ </bean>
+
+
+ <bean id="pluginManagerAction"
class="org.cytoscape.plugin.internal.action.PluginManagerAction">
+ <constructor-arg ref="cySwingApplicationRef" />
+ <constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="cytoscapeVersionService" />
+ <constructor-arg ref="bookmarkServiceRef" />
+ <constructor-arg ref="bookmarksUtilServiceRef" />
+ <constructor-arg ref="guiTaskManagerRef" />
+ <constructor-arg ref="cyPropertyRef" />
+ <constructor-arg ref="cyPluginAdapter" />
+ <constructor-arg ref="pluginLoaderTaskFactory" />
+ <constructor-arg ref="cyApplicationConfigurationServiceRef" />
+ </bean>
+
+ <bean id="startupMostlyFinished"
class="org.cytoscape.plugin.internal.StartupMostlyFinished">
+ <constructor-arg ref="cyEventHelperRef" />
+ </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.
