Author: mes
Date: 2011-09-12 16:46:44 -0700 (Mon, 12 Sep 2011)
New Revision: 26767
Added:
core3/impl/branches/no-spring/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/application-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/application-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/application-impl/osgi.bnd 2011-09-12
23:44:08 UTC (rev 26766)
+++ core3/impl/branches/no-spring/application-impl/osgi.bnd 2011-09-12
23:46:44 UTC (rev 26767)
@@ -3,4 +3,5 @@
#-----------------------------------------------------------------
Private-Package:
org.cytoscape.application.internal,org.cytoscape.application.internal.*
+Bundle-Activator: org.cytoscape.application.internal.CyActivator
Added:
core3/impl/branches/no-spring/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/application-impl/src/main/java/org/cytoscape/application/internal/CyActivator.java
2011-09-12 23:46:44 UTC (rev 26767)
@@ -0,0 +1,64 @@
+
+
+
+
+package org.cytoscape.application.internal;
+
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.model.CyNetworkManager;
+
+import org.cytoscape.application.internal.CyApplicationManagerImpl;
+import org.cytoscape.application.internal.CyApplicationConfigurationImpl;
+import org.cytoscape.application.internal.CyApplicationCoreProperty;
+import org.cytoscape.application.internal.ShutdownHandler;
+import org.cytoscape.application.internal.CyVersion;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener;
+
+
+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);
+ CyNetworkViewManager cyNetworkViewManagerServiceRef =
getService(bc,CyNetworkViewManager.class);
+
+ CyApplicationManagerImpl cyApplicationManager = new
CyApplicationManagerImpl(cyEventHelperServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef);
+ ShutdownHandler cytoscapeShutdown = new
ShutdownHandler(cyEventHelperServiceRef);
+ CyApplicationConfigurationImpl cyApplicationConfiguration = new
CyApplicationConfigurationImpl();
+ CyApplicationCoreProperty cyApplicationCoreProperty = new
CyApplicationCoreProperty(cyApplicationConfiguration);
+ CyVersion cytoscapeVersion = new
CyVersion(cyApplicationCoreProperty);
+
+
registerService(bc,cyApplicationManager,CyApplicationManager.class, new
Properties());
+
registerService(bc,cyApplicationManager,NetworkAboutToBeDestroyedListener.class,
new Properties());
+
registerService(bc,cyApplicationManager,NetworkViewAboutToBeDestroyedListener.class,
new Properties());
+ registerAllServices(bc,cytoscapeShutdown, new Properties());
+ registerAllServices(bc,cytoscapeVersion, new Properties());
+ registerAllServices(bc,cyApplicationConfiguration, new
Properties());
+
+ Properties cyApplicationCorePropertyProps = new Properties();
+
cyApplicationCorePropertyProps.setProperty("cyPropertyName","cytoscape3.props");
+
cyApplicationCorePropertyProps.setProperty("serviceType","property");
+ registerAllServices(bc,cyApplicationCoreProperty,
cyApplicationCorePropertyProps);
+
+
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-12 23:44:08 UTC (rev 26766)
+++
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-12 23:46:44 UTC (rev 26767)
@@ -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">
-
-
- <!-- Export Services -->
- <osgi:service id="cyApplicationManagerService"
ref="cyApplicationManager">
- <osgi:interfaces>
-
<value>org.cytoscape.application.CyApplicationManager</value>
-
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener</value>
-
<value>org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener</value>
- </osgi:interfaces>
- </osgi:service>
-
- <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
- <osgi:reference id="cyNetworkManagerServiceRef"
- interface="org.cytoscape.model.CyNetworkManager" />
- <osgi:reference id="cyNetworkViewManagerServiceRef"
- interface="org.cytoscape.view.model.CyNetworkViewManager" />
-
- <osgi:service id="cytoscapeShutdownService" ref="cytoscapeShutdown"
auto-export="interfaces" />
- <osgi:service id="cytoscapeVersionService" ref="cytoscapeVersion"
auto-export="interfaces" />
- <osgi:service id="cyApplicationConfigurationService"
ref="cyApplicationConfiguration" auto-export="interfaces" />
-
- <osgi:service id="cyApplicationCorePropertyService"
ref="cyApplicationCoreProperty" auto-export="interfaces" >
- <osgi:service-properties>
- <entry key="serviceType" value="property" />
- <entry key="cyPropertyName" value="cytoscape3.props" />
- </osgi:service-properties>
- </osgi:service>
-
-</beans>
Copied:
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-12 23:46:44 UTC (rev 26767)
@@ -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">
+
+
+ <!-- Export Services -->
+ <osgi:service id="cyApplicationManagerService"
ref="cyApplicationManager">
+ <osgi:interfaces>
+
<value>org.cytoscape.application.CyApplicationManager</value>
+
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener</value>
+
<value>org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener</value>
+ </osgi:interfaces>
+ </osgi:service>
+
+ <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
+ <osgi:reference id="cyNetworkManagerServiceRef"
+ interface="org.cytoscape.model.CyNetworkManager" />
+ <osgi:reference id="cyNetworkViewManagerServiceRef"
+ interface="org.cytoscape.view.model.CyNetworkViewManager" />
+
+ <osgi:service id="cytoscapeShutdownService" ref="cytoscapeShutdown"
auto-export="interfaces" />
+ <osgi:service id="cytoscapeVersionService" ref="cytoscapeVersion"
auto-export="interfaces" />
+ <osgi:service id="cyApplicationConfigurationService"
ref="cyApplicationConfiguration" auto-export="interfaces" />
+
+ <osgi:service id="cyApplicationCorePropertyService"
ref="cyApplicationCoreProperty" auto-export="interfaces" >
+ <osgi:service-properties>
+ <entry key="serviceType" value="property" />
+ <entry key="cyPropertyName" value="cytoscape3.props" />
+ </osgi:service-properties>
+ </osgi:service>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-12 23:44:08 UTC (rev 26766)
+++
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-12 23:46:44 UTC (rev 26767)
@@ -1,48 +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="cyApplicationManager"
-
class="org.cytoscape.application.internal.CyApplicationManagerImpl">
- <constructor-arg ref="cyEventHelperServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
- <constructor-arg ref="cyNetworkViewManagerServiceRef" />
- </bean>
-
- <!-- Cytoscape Version -->
- <bean name="cytoscapeVersion"
class="org.cytoscape.application.internal.CyVersion"
depends-on="cyApplicationCoreProperty">
- <constructor-arg ref="cyApplicationCoreProperty" />
- </bean>
-
- <!-- shutdown support -->
- <bean name="cytoscapeShutdown"
class="org.cytoscape.application.internal.ShutdownHandler">
- <constructor-arg ref="cyEventHelperServiceRef" />
- </bean>
-
- <bean id="cyApplicationConfiguration"
class="org.cytoscape.application.internal.CyApplicationConfigurationImpl" />
-
- <bean id="cyApplicationCoreProperty"
class="org.cytoscape.application.internal.CyApplicationCoreProperty">
- <constructor-arg ref="cyApplicationConfiguration" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/application-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-12 23:46:44 UTC (rev 26767)
@@ -0,0 +1,48 @@
+<?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="cyApplicationManager"
+
class="org.cytoscape.application.internal.CyApplicationManagerImpl">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
+ </bean>
+
+ <!-- Cytoscape Version -->
+ <bean name="cytoscapeVersion"
class="org.cytoscape.application.internal.CyVersion"
depends-on="cyApplicationCoreProperty">
+ <constructor-arg ref="cyApplicationCoreProperty" />
+ </bean>
+
+ <!-- shutdown support -->
+ <bean name="cytoscapeShutdown"
class="org.cytoscape.application.internal.ShutdownHandler">
+ <constructor-arg ref="cyEventHelperServiceRef" />
+ </bean>
+
+ <bean id="cyApplicationConfiguration"
class="org.cytoscape.application.internal.CyApplicationConfigurationImpl" />
+
+ <bean id="cyApplicationCoreProperty"
class="org.cytoscape.application.internal.CyApplicationCoreProperty">
+ <constructor-arg ref="cyApplicationConfiguration" />
+ </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.
