Author: mes
Date: 2011-09-16 15:39:37 -0700 (Fri, 16 Sep 2011)
New Revision: 26843
Added:
core3/impl/branches/no-spring/work-headless-impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/work-headless-impl/osgi.bnd
core3/impl/branches/no-spring/work-headless-impl/pom.xml
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/work-headless-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/work-headless-impl/osgi.bnd 2011-09-16
20:20:30 UTC (rev 26842)
+++ core3/impl/branches/no-spring/work-headless-impl/osgi.bnd 2011-09-16
22:39:37 UTC (rev 26843)
@@ -3,6 +3,6 @@
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Private-Package: ${bundle.namespace}.internal.*
Modified: core3/impl/branches/no-spring/work-headless-impl/pom.xml
===================================================================
--- core3/impl/branches/no-spring/work-headless-impl/pom.xml 2011-09-16
20:20:30 UTC (rev 26842)
+++ core3/impl/branches/no-spring/work-headless-impl/pom.xml 2011-09-16
22:39:37 UTC (rev 26843)
@@ -4,7 +4,7 @@
<parent>
<artifactId>impl-parent</artifactId>
<groupId>org.cytoscape</groupId>
- <version>3.0.0-alpha6-SNAPSHOT</version>
+ <version>3.0.0-alpha8-SNAPSHOT</version>
</parent>
<properties>
Added:
core3/impl/branches/no-spring/work-headless-impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/work-headless-impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/work-headless-impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
2011-09-16 22:39:37 UTC (rev 26843)
@@ -0,0 +1,34 @@
+
+package org.cytoscape.work.internal;
+
+import org.cytoscape.cmdline.launcher.CommandLineProvider;
+
+import org.cytoscape.work.internal.UndoSupportImpl;
+import org.cytoscape.work.internal.task.HeadlessTaskManager;
+import org.cytoscape.work.internal.tunables.CLTunableInterceptor;
+import org.cytoscape.work.UndoSupport;
+import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.TunableInterceptor;
+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) {
+
+ CommandLineProvider commandLineProviderServiceRef =
getService(bc,CommandLineProvider.class);
+
+ UndoSupportImpl undoSupport = new UndoSupportImpl();
+ HeadlessTaskManager headlessTaskManager = new
HeadlessTaskManager(tunableInterceptor);
+ CLTunableInterceptor tunableInterceptor = new
CLTunableInterceptor(commandLineProviderServiceRef);
+
+ registerService(bc,headlessTaskManager,TaskManager.class, new
Properties());
+ registerService(bc,tunableInterceptor,TunableInterceptor.class,
new Properties());
+ registerService(bc,undoSupport,UndoSupport.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-16 20:20:30 UTC (rev 26842)
+++
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-16 22:39:37 UTC (rev 26843)
@@ -1,23 +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">
-
- <!-- Import Osgi references -->
- <osgi:reference id="commandLineProviderServiceRef"
- interface="org.cytoscape.cmdline.launcher.CommandLineProvider"
/>
-
- <!-- Export Osgi services -->
- <osgi:service id="headlessTaskManagerService" ref="headlessTaskManager"
- interface="org.cytoscape.work.TaskManager" />
-
- <osgi:service id="tunableInterceptorService" ref="tunableInterceptor"
- interface="org.cytoscape.work.TunableInterceptor" />
-
- <osgi:service id="undoSupportService" ref="undoSupport"
- interface="org.cytoscape.work.UndoSupport"/>
-
-</beans>
Copied:
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-16 22:39:37 UTC (rev 26843)
@@ -0,0 +1,23 @@
+<?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">
+
+ <!-- Import Osgi references -->
+ <osgi:reference id="commandLineProviderServiceRef"
+ interface="org.cytoscape.cmdline.launcher.CommandLineProvider"
/>
+
+ <!-- Export Osgi services -->
+ <osgi:service id="headlessTaskManagerService" ref="headlessTaskManager"
+ interface="org.cytoscape.work.TaskManager" />
+
+ <osgi:service id="tunableInterceptorService" ref="tunableInterceptor"
+ interface="org.cytoscape.work.TunableInterceptor" />
+
+ <osgi:service id="undoSupportService" ref="undoSupport"
+ interface="org.cytoscape.work.UndoSupport"/>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-16 20:20:30 UTC (rev 26842)
+++
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-16 22:39:37 UTC (rev 26843)
@@ -1,28 +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";>
-
- <!-- 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="undoSupport"
class="org.cytoscape.work.internal.UndoSupportImpl"/>
-
- <bean name="headlessTaskManager"
class="org.cytoscape.work.internal.task.HeadlessTaskManager">
- <constructor-arg ref="tunableInterceptor"/>
- </bean>
-
- <bean name="tunableInterceptor"
class="org.cytoscape.work.internal.tunables.CLTunableInterceptor">
- <constructor-arg ref="commandLineProviderServiceRef"/>
- </bean>
-
-</beans>
Copied:
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/work-headless-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-16 22:39:37 UTC (rev 26843)
@@ -0,0 +1,28 @@
+<?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";>
+
+ <!-- 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="undoSupport"
class="org.cytoscape.work.internal.UndoSupportImpl"/>
+
+ <bean name="headlessTaskManager"
class="org.cytoscape.work.internal.task.HeadlessTaskManager">
+ <constructor-arg ref="tunableInterceptor"/>
+ </bean>
+
+ <bean name="tunableInterceptor"
class="org.cytoscape.work.internal.tunables.CLTunableInterceptor">
+ <constructor-arg ref="commandLineProviderServiceRef"/>
+ </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.
