Author: mes
Date: 2011-09-12 16:58:45 -0700 (Mon, 12 Sep 2011)
New Revision: 26770
Added:
core3/impl/branches/no-spring/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/command-executor-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/command-executor-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/command-executor-impl/osgi.bnd
2011-09-12 23:54:51 UTC (rev 26769)
+++ core3/impl/branches/no-spring/command-executor-impl/osgi.bnd
2011-09-12 23:58:45 UTC (rev 26770)
@@ -3,3 +3,4 @@
#-----------------------------------------------------------------
Private-Package: ${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Added:
core3/impl/branches/no-spring/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/command-executor-impl/src/main/java/org/cytoscape/command/internal/CyActivator.java
2011-09-12 23:58:45 UTC (rev 26770)
@@ -0,0 +1,50 @@
+
+
+
+
+package org.cytoscape.command.internal;
+
+import org.cytoscape.application.CyApplicationManager;
+
+import org.cytoscape.command.internal.CommandExecutorImpl;
+import org.cytoscape.command.internal.CommandExecutorTaskFactory;
+
+import org.cytoscape.work.TaskFactory;
+
+import org.cytoscape.task.NetworkTaskFactory;
+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 cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+
+ CommandExecutorImpl commandExecutorImpl = new
CommandExecutorImpl(cyApplicationManagerServiceRef);
+ CommandExecutorTaskFactory commandExecutorTaskFactory = new
CommandExecutorTaskFactory(commandExecutorImpl);
+
+
+ Properties commandExecutorTaskFactoryProps = new Properties();
+
commandExecutorTaskFactoryProps.setProperty("preferredMenu","Plugins");
+ commandExecutorTaskFactoryProps.setProperty("title","Load
Command File");
+
registerService(bc,commandExecutorTaskFactory,TaskFactory.class,
commandExecutorTaskFactoryProps);
+
+
registerServiceListener(bc,commandExecutorImpl,"addTaskFactory","removeTaskFactory",TaskFactory.class);
+
registerServiceListener(bc,commandExecutorImpl,"addNetworkTaskFactory","removeNetworkTaskFactory",NetworkTaskFactory.class);
+
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-12 23:54:51 UTC (rev 26769)
+++
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-12 23:58:45 UTC (rev 26770)
@@ -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">
-
- <osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:service id="commandExecutorTaskFactoryService"
ref="commandExecutorTaskFactory"
- interface="org.cytoscape.work.TaskFactory">
- <osgi:service-properties>
- <entry key="title" value="Load Command File" />
- <entry key="preferredMenu" value="Plugins" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:set id="taskFactorySet"
- interface="org.cytoscape.work.TaskFactory"
- cardinality="0..N" >
- <osgi:listener bind-method="addTaskFactory"
- unbind-method="removeTaskFactory"
- ref="commandExecutorImpl" />
- </osgi:set>
-
- <osgi:set id="networkTaskFactorySet"
- interface="org.cytoscape.task.NetworkTaskFactory"
- cardinality="0..N" >
- <osgi:listener bind-method="addNetworkTaskFactory"
- unbind-method="removeNetworkTaskFactory"
- ref="commandExecutorImpl" />
- </osgi:set>
-
-</beans>
Copied:
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-12 23:58:45 UTC (rev 26770)
@@ -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">
+
+ <osgi:reference id="cyApplicationManagerServiceRef"
+ interface="org.cytoscape.application.CyApplicationManager" />
+
+ <osgi:service id="commandExecutorTaskFactoryService"
ref="commandExecutorTaskFactory"
+ interface="org.cytoscape.work.TaskFactory">
+ <osgi:service-properties>
+ <entry key="title" value="Load Command File" />
+ <entry key="preferredMenu" value="Plugins" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:set id="taskFactorySet"
+ interface="org.cytoscape.work.TaskFactory"
+ cardinality="0..N" >
+ <osgi:listener bind-method="addTaskFactory"
+ unbind-method="removeTaskFactory"
+ ref="commandExecutorImpl" />
+ </osgi:set>
+
+ <osgi:set id="networkTaskFactorySet"
+ interface="org.cytoscape.task.NetworkTaskFactory"
+ cardinality="0..N" >
+ <osgi:listener bind-method="addNetworkTaskFactory"
+ unbind-method="removeNetworkTaskFactory"
+ ref="commandExecutorImpl" />
+ </osgi:set>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-12 23:54:51 UTC (rev 26769)
+++
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-12 23:58:45 UTC (rev 26770)
@@ -1,37 +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";
- xmlns:util="http://www.springframework.org/schema/util";
- 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">
-
- <!--
- 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="commandExecutorImpl"
class="org.cytoscape.command.internal.CommandExecutorImpl">
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- </bean>
-
- <bean id="commandExecutorTaskFactory"
- class="org.cytoscape.command.internal.CommandExecutorTaskFactory">
- <constructor-arg ref="commandExecutorImpl" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/command-executor-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-12 23:58:45 UTC (rev 26770)
@@ -0,0 +1,37 @@
+<?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";
+ xmlns:util="http://www.springframework.org/schema/util";
+ 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">
+
+ <!--
+ 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="commandExecutorImpl"
class="org.cytoscape.command.internal.CommandExecutorImpl">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ </bean>
+
+ <bean id="commandExecutorTaskFactory"
+ class="org.cytoscape.command.internal.CommandExecutorTaskFactory">
+ <constructor-arg ref="commandExecutorImpl" />
+ </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.
