Author: mes
Date: 2011-09-15 13:08:30 -0700 (Thu, 15 Sep 2011)
New Revision: 26820
Added:
core3/impl/branches/no-spring/search-impl/src/main/java/org/cytoscape/search/internal/CyActivator.java
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/search-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/search-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/search-impl/osgi.bnd 2011-09-15 20:02:45 UTC
(rev 26819)
+++ core3/impl/branches/no-spring/search-impl/osgi.bnd 2011-09-15 20:08:30 UTC
(rev 26820)
@@ -4,3 +4,4 @@
Import-Package: *
Private-Package: ${bundle.namespace}.internal.*
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Added:
core3/impl/branches/no-spring/search-impl/src/main/java/org/cytoscape/search/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/search-impl/src/main/java/org/cytoscape/search/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/search-impl/src/main/java/org/cytoscape/search/internal/CyActivator.java
2011-09-15 20:08:30 UTC (rev 26820)
@@ -0,0 +1,38 @@
+
+package org.cytoscape.search.internal;
+
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.work.swing.GUITaskManager;
+
+import org.cytoscape.search.internal.EnhancedSearchPlugin;
+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 cytoscapeDesktopService =
getService(bc,CySwingApplication.class);
+ CyApplicationManager cyApplicationManagerRef =
getService(bc,CyApplicationManager.class);
+ CyTableManager cyTableManagerServiceRef =
getService(bc,CyTableManager.class);
+ GUITaskManager guiTaskManagerServiceRef =
getService(bc,GUITaskManager.class);
+ CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+ CyNetworkViewManager cyNetworkViewManagerServiceRef =
getService(bc,CyNetworkViewManager.class);
+
+ EnhancedSearchPlugin enhancedSearchPlugin = new
EnhancedSearchPlugin(cytoscapeDesktopService,cyApplicationManagerRef,cyTableManagerServiceRef,guiTaskManagerServiceRef,cyEventHelperServiceRef,cyNetworkViewManagerServiceRef);
+
+ registerAllServices(bc,enhancedSearchPlugin, new Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:02:45 UTC (rev 26819)
+++
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:08:30 UTC (rev 26820)
@@ -1,41 +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">
-
-
- <osgi:reference id="cytoscapeDesktopService"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.application.CyApplicationManager">
- </osgi:reference>
-
- <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
-
- <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
-
- <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
-
- <osgi:reference id="cyNetworkViewManagerServiceRef"
- interface="org.cytoscape.view.model.CyNetworkViewManager" />
-
- <!--
- This code registers the bean we just created "sampleTaskFactory" as an
- OSGi service of a particular type
(org.cytoscape.task.NetworkTaskFactory).
- By registering your bean as a service, it will become available to all
- users interested in services of that particular type.
- The service properties are metadata that can be used elsewhere in the
- system to identify and otherwise control how the service gets use
- (like determining which menu to put the service in).
- -->
- <osgi:service id="enhancedSearchService" ref="enhancedSearchPlugin"
- auto-export="interfaces" />
-
-</beans>
Copied:
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 20:08:30 UTC (rev 26820)
@@ -0,0 +1,41 @@
+<?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">
+
+
+ <osgi:reference id="cytoscapeDesktopService"
+ interface="org.cytoscape.application.swing.CySwingApplication"
/>
+
+ <osgi:reference id="cyApplicationManagerRef"
+ interface="org.cytoscape.application.CyApplicationManager">
+ </osgi:reference>
+
+ <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+
+ <osgi:reference id="guiTaskManagerServiceRef"
interface="org.cytoscape.work.swing.GUITaskManager" />
+
+ <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
+
+ <osgi:reference id="cyNetworkViewManagerServiceRef"
+ interface="org.cytoscape.view.model.CyNetworkViewManager" />
+
+ <!--
+ This code registers the bean we just created "sampleTaskFactory" as an
+ OSGi service of a particular type
(org.cytoscape.task.NetworkTaskFactory).
+ By registering your bean as a service, it will become available to all
+ users interested in services of that particular type.
+ The service properties are metadata that can be used elsewhere in the
+ system to identify and otherwise control how the service gets use
+ (like determining which menu to put the service in).
+ -->
+ <osgi:service id="enhancedSearchService" ref="enhancedSearchPlugin"
+ auto-export="interfaces" />
+
+</beans>
Deleted:
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:02:45 UTC (rev 26819)
+++
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:08:30 UTC (rev 26820)
@@ -1,26 +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";>
-
- <!--
- This simply constructs an object (or bean) called "sampleTaskFactory"
- of type org.example.internal.SampleTaskFactory. The name
"sampleTaskFactory"
- is used to identify this particular object in this and the
- bundle-context-osgi.xml file.
- -->
- <bean id="enhancedSearchPlugin"
- class="org.cytoscape.search.internal.EnhancedSearchPlugin">
- <constructor-arg ref="cytoscapeDesktopService" />
- <constructor-arg ref="cyApplicationManagerRef" />
- <constructor-arg ref="cyTableManagerServiceRef" />
- <constructor-arg ref="guiTaskManagerServiceRef" />
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="cyNetworkViewManagerServiceRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/search-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 20:08:30 UTC (rev 26820)
@@ -0,0 +1,26 @@
+<?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";>
+
+ <!--
+ This simply constructs an object (or bean) called "sampleTaskFactory"
+ of type org.example.internal.SampleTaskFactory. The name
"sampleTaskFactory"
+ is used to identify this particular object in this and the
+ bundle-context-osgi.xml file.
+ -->
+ <bean id="enhancedSearchPlugin"
+ class="org.cytoscape.search.internal.EnhancedSearchPlugin">
+ <constructor-arg ref="cytoscapeDesktopService" />
+ <constructor-arg ref="cyApplicationManagerRef" />
+ <constructor-arg ref="cyTableManagerServiceRef" />
+ <constructor-arg ref="guiTaskManagerServiceRef" />
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
+ </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.
