Author: mes
Date: 2011-09-15 12:42:41 -0700 (Thu, 15 Sep 2011)
New Revision: 26813
Added:
core3/impl/branches/no-spring/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/network-merge-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/network-merge-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/network-merge-impl/osgi.bnd 2011-09-15
19:40:55 UTC (rev 26812)
+++ core3/impl/branches/no-spring/network-merge-impl/osgi.bnd 2011-09-15
19:42:41 UTC (rev 26813)
@@ -3,3 +3,4 @@
#-----------------------------------------------------------------
Private-Package: ${bundle.namespace},${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Added:
core3/impl/branches/no-spring/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/network-merge-impl/src/main/java/org/cytoscape/network/merge/internal/CyActivator.java
2011-09-15 19:42:41 UTC (rev 26813)
@@ -0,0 +1,41 @@
+
+package org.cytoscape.network.merge.internal;
+
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.CyNetworkFactory;
+
+import org.cytoscape.network.merge.internal.NetworkMergeAction;
+
+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) {
+
+ CyNetworkNaming cyNetworkNamingServiceRef =
getService(bc,CyNetworkNaming.class);
+ CyNetworkFactory cyNetworkFactoryServiceRef =
getService(bc,CyNetworkFactory.class);
+ TaskManager taskManagerServiceRef =
getService(bc,TaskManager.class);
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+ CySwingApplication cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+
+ NetworkMergeAction networkMergeAction = new
NetworkMergeAction(cyApplicationManagerServiceRef,cySwingApplicationServiceRef,cyNetworkManagerServiceRef,cyNetworkFactoryServiceRef,cyNetworkNamingServiceRef,taskManagerServiceRef);
+
+ registerService(bc,networkMergeAction,CyAction.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:40:55 UTC (rev 26812)
+++
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:42:41 UTC (rev 26813)
@@ -1,35 +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">
-
- <!-- collect necessary services -->
-
- <osgi:reference id="cyNetworkNamingServiceRef"
- interface="org.cytoscape.session.CyNetworkNaming" />
-
- <osgi:reference id="cyNetworkFactoryServiceRef"
- interface="org.cytoscape.model.CyNetworkFactory" />
-
- <osgi:reference id="taskManagerServiceRef"
- interface="org.cytoscape.work.TaskManager" />
-
- <osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:reference id="cySwingApplicationServiceRef"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="cyNetworkManagerServiceRef"
- interface="org.cytoscape.model.CyNetworkManager" />
-
-
- <!-- now register our services -->
-
- <osgi:service id="networkMergeActionService" ref="networkMergeAction"
- interface="org.cytoscape.application.swing.CyAction">
- </osgi:service>
-
-</beans>
Copied:
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 19:42:41 UTC (rev 26813)
@@ -0,0 +1,35 @@
+<?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">
+
+ <!-- collect necessary services -->
+
+ <osgi:reference id="cyNetworkNamingServiceRef"
+ interface="org.cytoscape.session.CyNetworkNaming" />
+
+ <osgi:reference id="cyNetworkFactoryServiceRef"
+ interface="org.cytoscape.model.CyNetworkFactory" />
+
+ <osgi:reference id="taskManagerServiceRef"
+ interface="org.cytoscape.work.TaskManager" />
+
+ <osgi:reference id="cyApplicationManagerServiceRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <osgi:reference id="cySwingApplicationServiceRef"
+ interface="org.cytoscape.application.swing.CySwingApplication"
/>
+
+ <osgi:reference id="cyNetworkManagerServiceRef"
+ interface="org.cytoscape.model.CyNetworkManager" />
+
+
+ <!-- now register our services -->
+
+ <osgi:service id="networkMergeActionService" ref="networkMergeAction"
+ interface="org.cytoscape.application.swing.CyAction">
+ </osgi:service>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:40:55 UTC (rev 26812)
+++
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:42:41 UTC (rev 26813)
@@ -1,32 +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" />
-
- <context:annotation-config />
-
- <bean id="networkMergeAction"
- class="org.cytoscape.network.merge.internal.NetworkMergeAction">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="cySwingApplicationServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyNetworkFactoryServiceRef" />
- <constructor-arg ref="cyNetworkNamingServiceRef" />
- <constructor-arg ref="taskManagerServiceRef" />
- </bean>
-
-</beans>
Copied:
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/network-merge-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 19:42:41 UTC (rev 26813)
@@ -0,0 +1,32 @@
+<?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" />
+
+ <context:annotation-config />
+
+ <bean id="networkMergeAction"
+ class="org.cytoscape.network.merge.internal.NetworkMergeAction">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cySwingApplicationServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyNetworkFactoryServiceRef" />
+ <constructor-arg ref="cyNetworkNamingServiceRef" />
+ <constructor-arg ref="taskManagerServiceRef" />
+ </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.
