Author: mes
Date: 2011-09-15 13:10:06 -0700 (Thu, 15 Sep 2011)
New Revision: 26821
Added:
core3/impl/branches/no-spring/session-impl/src/main/java/org/cytoscape/session/internal/CyActivator.java
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/session-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/session-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/session-impl/osgi.bnd 2011-09-15 20:08:30 UTC
(rev 26820)
+++ core3/impl/branches/no-spring/session-impl/osgi.bnd 2011-09-15 20:10:06 UTC
(rev 26821)
@@ -3,4 +3,5 @@
#-----------------------------------------------------------------
Private-Package:
org.cytoscape.session.internal,org.cytoscape.session.internal.*
+Bundle-Activator: org.cytoscape.session.internal.CyActivator
Added:
core3/impl/branches/no-spring/session-impl/src/main/java/org/cytoscape/session/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/session-impl/src/main/java/org/cytoscape/session/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/session-impl/src/main/java/org/cytoscape/session/internal/CyActivator.java
2011-09-15 20:10:06 UTC (rev 26821)
@@ -0,0 +1,51 @@
+
+
+
+
+package org.cytoscape.session.internal;
+
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.model.CyNetworkManager;
+
+import org.cytoscape.session.internal.CySessionManagerImpl;
+import org.cytoscape.session.internal.CyNetworkNamingImpl;
+
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.session.CyNetworkNaming;
+
+import org.cytoscape.property.CyProperty;
+
+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);
+ CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
+ CyTableManager cyTableManagerServiceRef =
getService(bc,CyTableManager.class);
+ VisualMappingManager visualMappingManagerServiceRef =
getService(bc,VisualMappingManager.class);
+ CyNetworkViewManager cyNetworkViewManagerServiceRef =
getService(bc,CyNetworkViewManager.class);
+
+ CyNetworkNamingImpl cyNetworkNaming = new
CyNetworkNamingImpl(cyNetworkManagerServiceRef);
+ CySessionManagerImpl cySessionManager = new
CySessionManagerImpl(cyEventHelperServiceRef,cyNetworkManagerServiceRef,cyTableManagerServiceRef,visualMappingManagerServiceRef,cyNetworkViewManagerServiceRef);
+
+ registerService(bc,cyNetworkNaming,CyNetworkNaming.class, new
Properties());
+ registerService(bc,cySessionManager,CySessionManager.class, new
Properties());
+
+
registerServiceListener(bc,cySessionManager,"addCyProperty","removeCyProperty",CyProperty.class);
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:08:30 UTC (rev 26820)
+++
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:10:06 UTC (rev 26821)
@@ -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:service id="cyNetworkNamingService" ref="cyNetworkNaming"
- interface="org.cytoscape.session.CyNetworkNaming">
- </osgi:service>
-
- <osgi:service id="cySessionManagerService" ref="cySessionManager">
- <osgi:interfaces>
- <value>org.cytoscape.session.CySessionManager</value>
- </osgi:interfaces>
- </osgi:service>
-
- <!-- Import Services -->
- <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
-
- <osgi:reference id="cyNetworkManagerServiceRef"
- interface="org.cytoscape.model.CyNetworkManager" />
-
- <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
-
- <osgi:reference id="visualMappingManagerServiceRef"
- interface="org.cytoscape.view.vizmap.VisualMappingManager" />
-
- <osgi:reference id="cyNetworkViewManagerServiceRef"
- interface="org.cytoscape.view.model.CyNetworkViewManager" />
-
-
- <osgi:set id="cyPropertySet"
interface="org.cytoscape.property.CyProperty"
- cardinality="0..N">
- <osgi:listener bind-method="addCyProperty"
- unbind-method="removeCyProperty" ref="cySessionManager"
/>
- </osgi:set>
-
-</beans>
Copied:
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 20:10:06 UTC (rev 26821)
@@ -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:service id="cyNetworkNamingService" ref="cyNetworkNaming"
+ interface="org.cytoscape.session.CyNetworkNaming">
+ </osgi:service>
+
+ <osgi:service id="cySessionManagerService" ref="cySessionManager">
+ <osgi:interfaces>
+ <value>org.cytoscape.session.CySessionManager</value>
+ </osgi:interfaces>
+ </osgi:service>
+
+ <!-- Import Services -->
+ <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
+
+ <osgi:reference id="cyNetworkManagerServiceRef"
+ interface="org.cytoscape.model.CyNetworkManager" />
+
+ <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+
+ <osgi:reference id="visualMappingManagerServiceRef"
+ interface="org.cytoscape.view.vizmap.VisualMappingManager" />
+
+ <osgi:reference id="cyNetworkViewManagerServiceRef"
+ interface="org.cytoscape.view.model.CyNetworkViewManager" />
+
+
+ <osgi:set id="cyPropertySet"
interface="org.cytoscape.property.CyProperty"
+ cardinality="0..N">
+ <osgi:listener bind-method="addCyProperty"
+ unbind-method="removeCyProperty" ref="cySessionManager"
/>
+ </osgi:set>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:08:30 UTC (rev 26820)
+++
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:10:06 UTC (rev 26821)
@@ -1,30 +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:aop="http://www.springframework.org/schema/aop";
- xmlns:context="http://www.springframework.org/schema/context";
- xmlns:lang="http://www.springframework.org/schema/lang";
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/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/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">
-
- <context:annotation-config />
-
- <bean id="cyNetworkNaming"
class="org.cytoscape.session.internal.CyNetworkNamingImpl">
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- </bean>
-
- <bean id="cySessionManager"
class="org.cytoscape.session.internal.CySessionManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyTableManagerServiceRef" />
- <constructor-arg ref="visualMappingManagerServiceRef" />
- <constructor-arg ref="cyNetworkViewManagerServiceRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/session-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 20:10:06 UTC (rev 26821)
@@ -0,0 +1,30 @@
+<?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:aop="http://www.springframework.org/schema/aop";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:lang="http://www.springframework.org/schema/lang";
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/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/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">
+
+ <context:annotation-config />
+
+ <bean id="cyNetworkNaming"
class="org.cytoscape.session.internal.CyNetworkNamingImpl">
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ </bean>
+
+ <bean id="cySessionManager"
class="org.cytoscape.session.internal.CySessionManagerImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyTableManagerServiceRef" />
+ <constructor-arg ref="visualMappingManagerServiceRef" />
+ <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.
