Author: mes
Date: 2011-09-13 14:27:17 -0700 (Tue, 13 Sep 2011)
New Revision: 26783
Added:
core3/impl/branches/no-spring/filter-impl/src/main/java/org/cytoscape/filter/internal/CyActivator.java
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/filter-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/filter-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/filter-impl/osgi.bnd 2011-09-13 21:25:08 UTC
(rev 26782)
+++ core3/impl/branches/no-spring/filter-impl/osgi.bnd 2011-09-13 21:27:17 UTC
(rev 26783)
@@ -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/filter-impl/src/main/java/org/cytoscape/filter/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/filter-impl/src/main/java/org/cytoscape/filter/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/filter-impl/src/main/java/org/cytoscape/filter/internal/CyActivator.java
2011-09-13 21:27:17 UTC (rev 26783)
@@ -0,0 +1,65 @@
+
+package org.cytoscape.filter.internal;
+
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.event.CyEventHelper;
+
+import org.cytoscape.filter.internal.FilterPanelSelectedListener;
+import org.cytoscape.filter.internal.filters.view.FilterMainPanel;
+import org.cytoscape.filter.internal.filters.FilterPlugin;
+import org.cytoscape.filter.internal.gui.FilterCytoPanelComponent;
+import org.cytoscape.filter.internal.quickfind.plugin.QuickFindPlugIn;
+import org.cytoscape.filter.internal.filters.FilterMenuItemAction;
+
+import org.cytoscape.application.swing.CytoPanelComponent;
+import
org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener;
+import org.cytoscape.application.swing.CyAction;
+
+
+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 cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+ CyNetworkViewManager cyNetworkViewManagerServiceRef =
getService(bc,CyNetworkViewManager.class);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+ CyServiceRegistrar cyServiceRegistrarServiceRef =
getService(bc,CyServiceRegistrar.class);
+ CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+ TaskManager taskManagerServiceRef =
getService(bc,TaskManager.class);
+
+ FilterPlugin filterPlugin = new
FilterPlugin(cyApplicationManagerServiceRef,cySwingApplicationServiceRef);
+ QuickFindPlugIn quickFindPlugin = new
QuickFindPlugIn(cyApplicationManagerServiceRef,cyNetworkViewManagerServiceRef,cySwingApplicationServiceRef,cyNetworkManagerServiceRef);
+ FilterMainPanel filterMainPanel = new
FilterMainPanel(cyApplicationManagerServiceRef,filterPlugin,cyNetworkManagerServiceRef,cyServiceRegistrarServiceRef,cyEventHelperServiceRef,taskManagerServiceRef);
+ FilterCytoPanelComponent filterCytoPanelComponent = new
FilterCytoPanelComponent(filterMainPanel);
+ FilterPanelSelectedListener filterPanelSelectedListener = new
FilterPanelSelectedListener(filterMainPanel);
+ FilterMenuItemAction filterAction = new
FilterMenuItemAction(cyApplicationManagerServiceRef,cySwingApplicationServiceRef,filterMainPanel);
+
+
registerService(bc,filterCytoPanelComponent,CytoPanelComponent.class, new
Properties());
+ registerAllServices(bc,filterMainPanel, new Properties());
+
registerService(bc,filterPanelSelectedListener,CytoPanelComponentSelectedListener.class,
new Properties());
+ registerService(bc,filterAction,CyAction.class, new
Properties());
+ registerAllServices(bc,quickFindPlugin, new Properties());
+
+
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 21:25:08 UTC (rev 26782)
+++
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 21:27:17 UTC (rev 26783)
@@ -1,40 +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">
-
- <!-- Imports -->
- <osgi:reference id="cySwingApplicationServiceRef"
-
interface="org.cytoscape.application.swing.CySwingApplication"/>
-
- <osgi:reference id="cyApplicationManagerServiceRef"
-
interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:reference id="cyNetworkViewManagerServiceRef"
-
interface="org.cytoscape.view.model.CyNetworkViewManager" />
-
- <osgi:reference id="cyNetworkManagerServiceRef"
- interface="org.cytoscape.model.CyNetworkManager" />
-
- <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
-
- <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper"/>
-
- <osgi:reference id="taskManagerServiceRef"
interface="org.cytoscape.work.TaskManager" />
-
- <!-- Exports -->
- <osgi:service id="filterCytoPanelComponentService"
ref="filterCytoPanelComponent"
-
interface="org.cytoscape.application.swing.CytoPanelComponent"/>
-
- <osgi:service id="filterPanelService" ref="filterMainPanel"
auto-export="interfaces"/>
-
- <osgi:service id="filterPanelSelectedListenerService"
ref="filterPanelSelectedListener"
-
interface="org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener"/>
-
- <osgi:service id="filterActionService" ref="filterAction"
- interface="org.cytoscape.application.swing.CyAction" />
-
- <osgi:service id="quickFindPluginService" ref="quickFindPlugin"
auto-export="interfaces"/>
-</beans>
Copied:
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-13 21:27:17 UTC (rev 26783)
@@ -0,0 +1,40 @@
+<?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">
+
+ <!-- Imports -->
+ <osgi:reference id="cySwingApplicationServiceRef"
+
interface="org.cytoscape.application.swing.CySwingApplication"/>
+
+ <osgi:reference id="cyApplicationManagerServiceRef"
+
interface="org.cytoscape.application.CyApplicationManager" />
+
+ <osgi:reference id="cyNetworkViewManagerServiceRef"
+
interface="org.cytoscape.view.model.CyNetworkViewManager" />
+
+ <osgi:reference id="cyNetworkManagerServiceRef"
+ interface="org.cytoscape.model.CyNetworkManager" />
+
+ <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
+
+ <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper"/>
+
+ <osgi:reference id="taskManagerServiceRef"
interface="org.cytoscape.work.TaskManager" />
+
+ <!-- Exports -->
+ <osgi:service id="filterCytoPanelComponentService"
ref="filterCytoPanelComponent"
+
interface="org.cytoscape.application.swing.CytoPanelComponent"/>
+
+ <osgi:service id="filterPanelService" ref="filterMainPanel"
auto-export="interfaces"/>
+
+ <osgi:service id="filterPanelSelectedListenerService"
ref="filterPanelSelectedListener"
+
interface="org.cytoscape.application.swing.events.CytoPanelComponentSelectedListener"/>
+
+ <osgi:service id="filterActionService" ref="filterAction"
+ interface="org.cytoscape.application.swing.CyAction" />
+
+ <osgi:service id="quickFindPluginService" ref="quickFindPlugin"
auto-export="interfaces"/>
+</beans>
Deleted:
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 21:25:08 UTC (rev 26782)
+++
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 21:27:17 UTC (rev 26783)
@@ -1,50 +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";>
-
- <context:annotation-config />
-
- <bean id="filterPlugin"
class="org.cytoscape.filter.internal.filters.FilterPlugin">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- </bean>
-
- <bean id="quickFindPlugin"
class="org.cytoscape.filter.internal.quickfind.plugin.QuickFindPlugIn">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="cyNetworkViewManagerServiceRef" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- </bean>
-
- <bean id="filterMainPanel"
- class="org.cytoscape.filter.internal.filters.view.FilterMainPanel">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="filterPlugin" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyServiceRegistrarServiceRef" />
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="taskManagerServiceRef" />
- </bean>
-
- <bean id="filterCytoPanelComponent"
- class="org.cytoscape.filter.internal.gui.FilterCytoPanelComponent">
- <constructor-arg ref="filterMainPanel" />
- </bean>
-
- <bean id="filterPanelSelectedListener"
-
class="org.cytoscape.filter.internal.FilterPanelSelectedListener">
- <constructor-arg ref="filterMainPanel" />
- </bean>
-
- <bean id="filterAction"
class="org.cytoscape.filter.internal.filters.FilterMenuItemAction">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="filterMainPanel" />
- </bean>
-
-</beans>
Copied:
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/filter-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-13 21:27:17 UTC (rev 26783)
@@ -0,0 +1,50 @@
+<?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";>
+
+ <context:annotation-config />
+
+ <bean id="filterPlugin"
class="org.cytoscape.filter.internal.filters.FilterPlugin">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ </bean>
+
+ <bean id="quickFindPlugin"
class="org.cytoscape.filter.internal.quickfind.plugin.QuickFindPlugIn">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ </bean>
+
+ <bean id="filterMainPanel"
+ class="org.cytoscape.filter.internal.filters.view.FilterMainPanel">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="filterPlugin" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyServiceRegistrarServiceRef" />
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
+ </bean>
+
+ <bean id="filterCytoPanelComponent"
+ class="org.cytoscape.filter.internal.gui.FilterCytoPanelComponent">
+ <constructor-arg ref="filterMainPanel" />
+ </bean>
+
+ <bean id="filterPanelSelectedListener"
+
class="org.cytoscape.filter.internal.FilterPanelSelectedListener">
+ <constructor-arg ref="filterMainPanel" />
+ </bean>
+
+ <bean id="filterAction"
class="org.cytoscape.filter.internal.filters.FilterMenuItemAction">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="filterMainPanel" />
+ </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.
