Author: mes
Date: 2011-09-12 17:36:41 -0700 (Mon, 12 Sep 2011)
New Revision: 26773
Added:
core3/impl/branches/no-spring/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/equations-functions-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/equations-functions-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/equations-functions-impl/osgi.bnd
2011-09-13 00:32:14 UTC (rev 26772)
+++ core3/impl/branches/no-spring/equations-functions-impl/osgi.bnd
2011-09-13 00:36:41 UTC (rev 26773)
@@ -3,4 +3,5 @@
#-----------------------------------------------------------------
Import-Package: *
-
+Private-Package: org.cytoscape.editor.internal.*
+Bundle-Activator: org.cytoscape.editor.internal.CyActivator
Added:
core3/impl/branches/no-spring/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/equations-functions-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
2011-09-13 00:36:41 UTC (rev 26773)
@@ -0,0 +1,44 @@
+
+
+
+
+package org.cytoscape.equations.internal;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.equations.EquationCompiler;
+
+import org.cytoscape.equations.internal.SUIDToEdgeMapper;
+import org.cytoscape.equations.internal.SUIDToNodeMapper;
+import org.cytoscape.equations.internal.FunctionRegistrar;
+
+
+
+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) {
+
+ EquationCompiler compilerServiceRef =
getService(bc,EquationCompiler.class);
+ CyApplicationManager applicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
+
+ SUIDToEdgeMapper suidToEdgeMapper = new SUIDToEdgeMapper();
+ SUIDToNodeMapper suidToNodeMapper = new SUIDToNodeMapper();
+ FunctionRegistrar functionRegistrar = new
FunctionRegistrar(compilerServiceRef,applicationManagerServiceRef,suidToNodeMapper,suidToEdgeMapper);
+
+ registerAllServices(bc,suidToEdgeMapper, new Properties());
+ registerAllServices(bc,suidToNodeMapper, new Properties());
+
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 00:32:14 UTC (rev 26772)
+++
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 00:36:41 UTC (rev 26773)
@@ -1,20 +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">
-
- <!-- imports -->
- <osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EqnCompiler" />
- <osgi:reference id="applicationManagerServiceRef"
interface="org.cytoscape.application.CyApplicationManager" />
-
-
- <!-- listeners -->
- <osgi:service id="suidToEdgeMapperService" ref="suidToEdgeMapper"
- auto-export="interfaces">
- </osgi:service>
- <osgi:service id="suidToNodeMapperService" ref="suidToNodeMapper"
- auto-export="interfaces">
- </osgi:service>
-</beans>
Copied:
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-13 00:36:41 UTC (rev 26773)
@@ -0,0 +1,20 @@
+<?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">
+
+ <!-- imports -->
+ <osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EqnCompiler" />
+ <osgi:reference id="applicationManagerServiceRef"
interface="org.cytoscape.application.CyApplicationManager" />
+
+
+ <!-- listeners -->
+ <osgi:service id="suidToEdgeMapperService" ref="suidToEdgeMapper"
+ auto-export="interfaces">
+ </osgi:service>
+ <osgi:service id="suidToNodeMapperService" ref="suidToNodeMapper"
+ auto-export="interfaces">
+ </osgi:service>
+</beans>
Deleted:
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 00:32:14 UTC (rev 26772)
+++
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 00:36:41 UTC (rev 26773)
@@ -1,26 +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="suidToEdgeMapper"
class="org.cytoscape.equations.internal.SUIDToEdgeMapper" />
-
- <bean id="suidToNodeMapper"
class="org.cytoscape.equations.internal.SUIDToNodeMapper" />
-
- <bean id="functionRegistrar"
class="org.cytoscape.equations.internal.FunctionRegistrar>">
- <constructor-arg ref="compilerServiceRef" />
- <constructor-arg ref="applicationManagerServiceRef" />
- <constructor-arg ref="suidToNodeMapper" />
- <constructor-arg ref="suidToEdgeMapper" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/equations-functions-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-13 00:36:41 UTC (rev 26773)
@@ -0,0 +1,26 @@
+<?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="suidToEdgeMapper"
class="org.cytoscape.equations.internal.SUIDToEdgeMapper" />
+
+ <bean id="suidToNodeMapper"
class="org.cytoscape.equations.internal.SUIDToNodeMapper" />
+
+ <bean id="functionRegistrar"
class="org.cytoscape.equations.internal.FunctionRegistrar>">
+ <constructor-arg ref="compilerServiceRef" />
+ <constructor-arg ref="applicationManagerServiceRef" />
+ <constructor-arg ref="suidToNodeMapper" />
+ <constructor-arg ref="suidToEdgeMapper" />
+ </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.
