Author: mes
Date: 2011-09-15 14:16:36 -0700 (Thu, 15 Sep 2011)
New Revision: 26825
Added:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/viewmodel-impl/impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/viewmodel-impl/impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/viewmodel-impl/impl/osgi.bnd 2011-09-15
21:13:46 UTC (rev 26824)
+++ core3/impl/branches/no-spring/viewmodel-impl/impl/osgi.bnd 2011-09-15
21:16:36 UTC (rev 26825)
@@ -4,4 +4,5 @@
Import-Package: *
Private-Package: ${bundle.namespace}.internal.*
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Added:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyActivator.java
2011-09-15 21:16:36 UTC (rev 26825)
@@ -0,0 +1,40 @@
+
+package org.cytoscape.view.model.internal;
+
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.service.util.CyServiceRegistrar;
+
+import org.cytoscape.view.model.internal.CyNetworkViewManagerImpl;
+import org.cytoscape.view.model.internal.NetworkViewFactoryImpl;
+
+import org.cytoscape.view.model.CyNetworkViewFactory;
+
+
+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);
+ CyServiceRegistrar cyServiceRegistrarRef =
getService(bc,CyServiceRegistrar.class);
+
+ NetworkViewFactoryImpl cyNetworkViewFactory = new
NetworkViewFactoryImpl(cyEventHelperServiceRef,cyServiceRegistrarRef);
+ CyNetworkViewManagerImpl cyNetworkViewManager = new
CyNetworkViewManagerImpl(cyEventHelperServiceRef);
+
+ Properties cyNetworkViewFactoryProps = new Properties();
+ cyNetworkViewFactoryProps.setProperty("service.type","factory");
+
registerService(bc,cyNetworkViewFactory,CyNetworkViewFactory.class,
cyNetworkViewFactoryProps);
+ registerAllServices(bc,cyNetworkViewManager, new Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 21:13:46 UTC (rev 26824)
+++
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 21:16:36 UTC (rev 26825)
@@ -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 Services -->
- <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
- <osgi:reference id="cyServiceRegistrarRef"
- interface="org.cytoscape.service.util.CyServiceRegistrar" />
-
- <!-- Export Beans as Services -->
- <osgi:service id="cyNetworkViewFactoryService"
ref="cyNetworkViewFactory"
- interface="org.cytoscape.view.model.CyNetworkViewFactory">
- <osgi:service-properties>
- <entry key="service.type" value="factory" />
- </osgi:service-properties>
- </osgi:service>
- <osgi:service id="cyNetworkViewManagerService"
ref="cyNetworkViewManager"
- auto-export="interfaces">
- </osgi:service>
-</beans>
Copied:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 21:16:36 UTC (rev 26825)
@@ -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 Services -->
+ <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
+ <osgi:reference id="cyServiceRegistrarRef"
+ interface="org.cytoscape.service.util.CyServiceRegistrar" />
+
+ <!-- Export Beans as Services -->
+ <osgi:service id="cyNetworkViewFactoryService"
ref="cyNetworkViewFactory"
+ interface="org.cytoscape.view.model.CyNetworkViewFactory">
+ <osgi:service-properties>
+ <entry key="service.type" value="factory" />
+ </osgi:service-properties>
+ </osgi:service>
+ <osgi:service id="cyNetworkViewManagerService"
ref="cyNetworkViewManager"
+ auto-export="interfaces">
+ </osgi:service>
+</beans>
Deleted:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 21:13:46 UTC (rev 26824)
+++
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 21:16:36 UTC (rev 26825)
@@ -1,25 +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";>
-
- <import resource="bundle-context-osgi.xml" />
-
- <context:annotation-config />
-
- <!-- Factory bean for views and this will be exported as service. -->
- <bean id="cyNetworkViewFactory"
-
class="org.cytoscape.view.model.internal.NetworkViewFactoryImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="cyServiceRegistrarRef" />
- </bean>
-
- <bean id="cyNetworkViewManager"
-
class="org.cytoscape.view.model.internal.CyNetworkViewManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 21:16:36 UTC (rev 26825)
@@ -0,0 +1,25 @@
+<?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";>
+
+ <import resource="bundle-context-osgi.xml" />
+
+ <context:annotation-config />
+
+ <!-- Factory bean for views and this will be exported as service. -->
+ <bean id="cyNetworkViewFactory"
+
class="org.cytoscape.view.model.internal.NetworkViewFactoryImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="cyServiceRegistrarRef" />
+ </bean>
+
+ <bean id="cyNetworkViewManager"
+
class="org.cytoscape.view.model.internal.CyNetworkViewManagerImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ </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.
