Author: mes
Date: 2011-09-15 12:36:05 -0700 (Thu, 15 Sep 2011)
New Revision: 26811
Added:
core3/impl/branches/no-spring/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyActivator.java
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/model-impl/impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/model-impl/impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/model-impl/impl/osgi.bnd 2011-09-15
19:35:54 UTC (rev 26810)
+++ core3/impl/branches/no-spring/model-impl/impl/osgi.bnd 2011-09-15
19:36:05 UTC (rev 26811)
@@ -2,6 +2,6 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Private-Package: ${bundle.namespace}.internal, ${bundle.namespace}.internal.*
Added:
core3/impl/branches/no-spring/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyActivator.java
2011-09-15 19:36:05 UTC (rev 26811)
@@ -0,0 +1,55 @@
+
+package org.cytoscape.model.internal;
+
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.equations.Interpreter;
+
+import org.cytoscape.model.internal.CyTableFactoryImpl;
+import org.cytoscape.model.internal.CyRootNetworkFactoryImpl;
+import org.cytoscape.model.internal.CyTableManagerImpl;
+import org.cytoscape.model.internal.CyNetworkFactoryImpl;
+import org.cytoscape.model.internal.CyNetworkManagerImpl;
+
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.CyNetworkFactory;
+
+
+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) {
+
+ CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
+ Interpreter InterpreterRef = getService(bc,Interpreter.class);
+ CyServiceRegistrar cyServiceRegistrarServiceRef =
getService(bc,CyServiceRegistrar.class);
+
+ CyTableManagerImpl cyTableManager = new
CyTableManagerImpl(cyEventHelperServiceRef);
+ CyTableFactoryImpl cyTableFactory = new
CyTableFactoryImpl(cyEventHelperServiceRef,InterpreterRef,cyServiceRegistrarServiceRef);
+ CyNetworkFactoryImpl cyNetworkFactory = new
CyNetworkFactoryImpl(cyEventHelperServiceRef,cyTableManager,cyTableFactory,cyServiceRegistrarServiceRef);
+ CyNetworkManagerImpl cyNetworkManager = new
CyNetworkManagerImpl(cyEventHelperServiceRef);
+ CyRootNetworkFactoryImpl cyRootNetworkFactory = new
CyRootNetworkFactoryImpl();
+
+ registerService(bc,cyNetworkFactory,CyNetworkFactory.class, new
Properties());
+ registerService(bc,cyTableFactory,CyTableFactory.class, new
Properties());
+
registerService(bc,cyRootNetworkFactory,CyRootNetworkFactory.class, new
Properties());
+ registerService(bc,cyTableManager,CyTableManager.class, new
Properties());
+
registerService(bc,cyTableManager,NetworkAboutToBeDestroyedListener.class, new
Properties());
+ registerService(bc,cyNetworkManager,CyNetworkManager.class, new
Properties());
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:35:54 UTC (rev 26810)
+++
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:36:05 UTC (rev 26811)
@@ -1,42 +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="cyEventHelperServiceRef"
- interface="org.cytoscape.event.CyEventHelper" />
- <osgi:reference id="InterpreterRef"
- interface="org.cytoscape.equations.Interpreter" />
- <osgi:reference id="cyServiceRegistrarServiceRef"
- interface="org.cytoscape.service.util.CyServiceRegistrar" />
-
-
- <!-- Individual Service -->
- <osgi:service id="cyNetworkFactoryService"
- ref="cyNetworkFactory"
interface="org.cytoscape.model.CyNetworkFactory">
- </osgi:service>
-
- <osgi:service id="cyTableFactoryService"
- ref="cyTableFactory"
interface="org.cytoscape.model.CyTableFactory">
- </osgi:service>
-
- <osgi:service id="cyRootNetworkFactoryService"
- ref="cyRootNetworkFactory"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
- </osgi:service>
-
- <osgi:service id="cyTableManagerService"
- ref="cyTableManager">
- <osgi:interfaces>
- <value>org.cytoscape.model.CyTableManager</value>
-
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener</value>
- </osgi:interfaces>
- </osgi:service>
-
- <osgi:service id="cyNetworkManagerService"
- ref="cyNetworkManager"
interface="org.cytoscape.model.CyNetworkManager">
- </osgi:service>
-
-</beans>
Copied:
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 19:36:05 UTC (rev 26811)
@@ -0,0 +1,42 @@
+<?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="cyEventHelperServiceRef"
+ interface="org.cytoscape.event.CyEventHelper" />
+ <osgi:reference id="InterpreterRef"
+ interface="org.cytoscape.equations.Interpreter" />
+ <osgi:reference id="cyServiceRegistrarServiceRef"
+ interface="org.cytoscape.service.util.CyServiceRegistrar" />
+
+
+ <!-- Individual Service -->
+ <osgi:service id="cyNetworkFactoryService"
+ ref="cyNetworkFactory"
interface="org.cytoscape.model.CyNetworkFactory">
+ </osgi:service>
+
+ <osgi:service id="cyTableFactoryService"
+ ref="cyTableFactory"
interface="org.cytoscape.model.CyTableFactory">
+ </osgi:service>
+
+ <osgi:service id="cyRootNetworkFactoryService"
+ ref="cyRootNetworkFactory"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
+ </osgi:service>
+
+ <osgi:service id="cyTableManagerService"
+ ref="cyTableManager">
+ <osgi:interfaces>
+ <value>org.cytoscape.model.CyTableManager</value>
+
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener</value>
+ </osgi:interfaces>
+ </osgi:service>
+
+ <osgi:service id="cyNetworkManagerService"
+ ref="cyNetworkManager"
interface="org.cytoscape.model.CyNetworkManager">
+ </osgi:service>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:35:54 UTC (rev 26810)
+++
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:36:05 UTC (rev 26811)
@@ -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: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="cyTableManager"
class="org.cytoscape.model.internal.CyTableManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- </bean>
-
- <bean id="cyTableFactory"
class="org.cytoscape.model.internal.CyTableFactoryImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="InterpreterRef" />
- <constructor-arg ref="cyServiceRegistrarServiceRef" />
- </bean>
-
- <bean id="cyNetworkFactory"
class="org.cytoscape.model.internal.CyNetworkFactoryImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="cyTableManager" />
- <constructor-arg ref="cyTableFactory" />
- <constructor-arg ref="cyServiceRegistrarServiceRef" />
- </bean>
-
- <bean id="cyNetworkManager"
class="org.cytoscape.model.internal.CyNetworkManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- </bean>
-
- <bean id="cyRootNetworkFactory"
class="org.cytoscape.model.internal.CyRootNetworkFactoryImpl"/>
-
-</beans>
Copied:
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/model-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 19:36:05 UTC (rev 26811)
@@ -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: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="cyTableManager"
class="org.cytoscape.model.internal.CyTableManagerImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ </bean>
+
+ <bean id="cyTableFactory"
class="org.cytoscape.model.internal.CyTableFactoryImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="InterpreterRef" />
+ <constructor-arg ref="cyServiceRegistrarServiceRef" />
+ </bean>
+
+ <bean id="cyNetworkFactory"
class="org.cytoscape.model.internal.CyNetworkFactoryImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="cyTableManager" />
+ <constructor-arg ref="cyTableFactory" />
+ <constructor-arg ref="cyServiceRegistrarServiceRef" />
+ </bean>
+
+ <bean id="cyNetworkManager"
class="org.cytoscape.model.internal.CyNetworkManagerImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ </bean>
+
+ <bean id="cyRootNetworkFactory"
class="org.cytoscape.model.internal.CyRootNetworkFactoryImpl"/>
+
+</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.
