Author: mes
Date: 2011-09-15 14:00:24 -0700 (Thu, 15 Sep 2011)
New Revision: 26823
Added:
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/table-browser-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/table-browser-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/table-browser-impl/osgi.bnd 2011-09-15
20:56:24 UTC (rev 26822)
+++ core3/impl/branches/no-spring/table-browser-impl/osgi.bnd 2011-09-15
21:00:24 UTC (rev 26823)
@@ -3,6 +3,6 @@
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Private-Package: ${bundle.namespace}.*
Added:
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2011-09-15 21:00:24 UTC (rev 26823)
@@ -0,0 +1,59 @@
+
+
+
+
+package org.cytoscape.browser.internal;
+
+import org.cytoscape.util.swing.OpenBrowser;
+import org.cytoscape.equations.EquationCompiler;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.work.swing.GUITaskManager;
+
+import org.cytoscape.browser.internal.TableBrowser;
+import org.cytoscape.browser.internal.PopupMenuHelper;
+
+
+import org.cytoscape.task.TableCellTaskFactory;
+import org.cytoscape.task.TableColumnTaskFactory;
+
+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) {
+
+ CyTableManager cyTableManagerServiceRef =
getService(bc,CyTableManager.class);
+ CyServiceRegistrar cyServiceRegistrarServiceRef =
getService(bc,CyServiceRegistrar.class);
+ EquationCompiler compilerServiceRef =
getService(bc,EquationCompiler.class);
+ OpenBrowser openBrowserServiceRef =
getService(bc,OpenBrowser.class);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+ TableTaskFactory deleteTableTaskFactoryService =
getService(bc,TableTaskFactory.class);
+ GUITaskManager guiTaskManagerServiceRef =
getService(bc,GUITaskManager.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+
+ PopupMenuHelper popupMenuHelper = new
PopupMenuHelper(guiTaskManagerServiceRef);
+ TableBrowser tableBrowser = new
TableBrowser(cyTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef);
+
+ registerAllServices(bc,tableBrowser, new Properties());
+
+
registerServiceListener(bc,popupMenuHelper,"addTableColumnTaskFactory","removeTableColumnTaskFactory",TableColumnTaskFactory.class);
+
registerServiceListener(bc,popupMenuHelper,"addTableCellTaskFactory","removeTableCellTaskFactory",TableCellTaskFactory.class);
+
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:56:24 UTC (rev 26822)
+++
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 21:00:24 UTC (rev 26823)
@@ -1,33 +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="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
- <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
- <osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EquationCompiler" />
- <osgi:reference id="openBrowserServiceRef"
interface="org.cytoscape.util.swing.OpenBrowser" />
- <osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
-
- <osgi:reference id="deleteTableTaskFactoryService"
interface="org.cytoscape.task.TableTaskFactory" />
- <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
- <osgi:reference id="cyApplicationManagerServiceRef"
interface="org.cytoscape.application.CyApplicationManager" />
-
- <!-- listeners -->
- <osgi:service id="tableBrowserCytoPanelComponentService"
ref="tableBrowser" auto-export="interfaces"/>
-
- <osgi:set id="tableColumnTaskFactorySet"
interface="org.cytoscape.task.TableColumnTaskFactory"
- cardinality="0..N">
- <osgi:listener bind-method="addTableColumnTaskFactory"
- unbind-method="removeTableColumnTaskFactory"
ref="popupMenuHelper" />
- </osgi:set>
-
- <osgi:set id="tableCellTaskFactorySet"
interface="org.cytoscape.task.TableCellTaskFactory"
- cardinality="0..N">
- <osgi:listener bind-method="addTableCellTaskFactory"
- unbind-method="removeTableCellTaskFactory"
ref="popupMenuHelper" />
- </osgi:set>
-</beans>
Copied:
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 21:00:24 UTC (rev 26823)
@@ -0,0 +1,33 @@
+<?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="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+ <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
+ <osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EquationCompiler" />
+ <osgi:reference id="openBrowserServiceRef"
interface="org.cytoscape.util.swing.OpenBrowser" />
+ <osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
+
+ <osgi:reference id="deleteTableTaskFactoryService"
interface="org.cytoscape.task.TableTaskFactory" />
+ <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
+ <osgi:reference id="cyApplicationManagerServiceRef"
interface="org.cytoscape.application.CyApplicationManager" />
+
+ <!-- listeners -->
+ <osgi:service id="tableBrowserCytoPanelComponentService"
ref="tableBrowser" auto-export="interfaces"/>
+
+ <osgi:set id="tableColumnTaskFactorySet"
interface="org.cytoscape.task.TableColumnTaskFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addTableColumnTaskFactory"
+ unbind-method="removeTableColumnTaskFactory"
ref="popupMenuHelper" />
+ </osgi:set>
+
+ <osgi:set id="tableCellTaskFactorySet"
interface="org.cytoscape.task.TableCellTaskFactory"
+ cardinality="0..N">
+ <osgi:listener bind-method="addTableCellTaskFactory"
+ unbind-method="removeTableCellTaskFactory"
ref="popupMenuHelper" />
+ </osgi:set>
+</beans>
Deleted:
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:56:24 UTC (rev 26822)
+++
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 21:00:24 UTC (rev 26823)
@@ -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: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/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/util
- http://www.springframework.org/schema/util/spring-util-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" />
-
- <!-- 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/>
-
- <bean id="tableBrowser"
class="org.cytoscape.browser.internal.TableBrowser">
- <constructor-arg ref="cyTableManagerServiceRef" />
- <constructor-arg ref="cyServiceRegistrarServiceRef" />
- <constructor-arg ref="compilerServiceRef" />
- <constructor-arg ref="openBrowserServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="deleteTableTaskFactoryService" />
- <constructor-arg ref="guiTaskManagerServiceRef" />
- <constructor-arg ref="popupMenuHelper" />
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="popupMenuHelper"
class="org.cytoscape.browser.internal.PopupMenuHelper">
- <constructor-arg ref="guiTaskManagerServiceRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/table-browser-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 21:00:24 UTC (rev 26823)
@@ -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: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/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/util
+ http://www.springframework.org/schema/util/spring-util-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" />
+
+ <!-- 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/>
+
+ <bean id="tableBrowser"
class="org.cytoscape.browser.internal.TableBrowser">
+ <constructor-arg ref="cyTableManagerServiceRef" />
+ <constructor-arg ref="cyServiceRegistrarServiceRef" />
+ <constructor-arg ref="compilerServiceRef" />
+ <constructor-arg ref="openBrowserServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="deleteTableTaskFactoryService" />
+ <constructor-arg ref="guiTaskManagerServiceRef" />
+ <constructor-arg ref="popupMenuHelper" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="popupMenuHelper"
class="org.cytoscape.browser.internal.PopupMenuHelper">
+ <constructor-arg ref="guiTaskManagerServiceRef" />
+ </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.
