Author: mes
Date: 2011-09-13 09:26:10 -0700 (Tue, 13 Sep 2011)
New Revision: 26774
Added:
core3/impl/branches/no-spring/equations-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/equations-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/equations-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/equations-impl/osgi.bnd 2011-09-13
00:36:41 UTC (rev 26773)
+++ core3/impl/branches/no-spring/equations-impl/osgi.bnd 2011-09-13
16:26:10 UTC (rev 26774)
@@ -3,5 +3,5 @@
#-----------------------------------------------------------------
-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/equations-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/equations-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/equations-impl/src/main/java/org/cytoscape/equations/internal/CyActivator.java
2011-09-13 16:26:10 UTC (rev 26774)
@@ -0,0 +1,35 @@
+
+package org.cytoscape.equations.internal;
+
+import org.cytoscape.equations.internal.EquationCompilerImpl;
+import org.cytoscape.equations.internal.EquationParserImpl;
+import org.cytoscape.equations.internal.interpreter.InterpreterImpl;
+import org.cytoscape.equations.Interpreter;
+import org.cytoscape.equations.EquationCompiler;
+
+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) {
+
+
+ InterpreterImpl interpreter = new InterpreterImpl();
+ EquationParserImpl parser = new EquationParserImpl();
+ EquationCompilerImpl compiler = new
EquationCompilerImpl(parser);
+
+ registerService(bc,compiler,EquationCompiler.class, new
Properties());
+ registerService(bc,interpreter,Interpreter.class, new
Properties());
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 00:36:41 UTC (rev 26773)
+++
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-13 16:26:10 UTC (rev 26774)
@@ -1,12 +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">
-
- <!-- Services provided by this bundle -->
-
- <osgi:service id="compilerService" ref="compiler"
interface="org.cytoscape.equations.EquationCompiler" />
- <osgi:service id="interpreterService" ref="interpreter"
interface="org.cytoscape.equations.Interpreter" />
-</beans>
Copied:
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-13 16:26:10 UTC (rev 26774)
@@ -0,0 +1,12 @@
+<?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">
+
+ <!-- Services provided by this bundle -->
+
+ <osgi:service id="compilerService" ref="compiler"
interface="org.cytoscape.equations.EquationCompiler" />
+ <osgi:service id="interpreterService" ref="interpreter"
interface="org.cytoscape.equations.Interpreter" />
+</beans>
Deleted:
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 00:36:41 UTC (rev 26773)
+++
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-13 16:26:10 UTC (rev 26774)
@@ -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: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="interpreter"
class="org.cytoscape.equations.internal.interpreter.InterpreterImpl" />
-
- <bean id="compiler"
class="org.cytoscape.equations.internal.EquationCompilerImpl">
- <constructor-arg ref="parser" />
- </bean>
-
- <bean id="parser"
class="org.cytoscape.equations.internal.EquationParserImpl" />
-</beans>
Copied:
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/equations-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-13 16:26:10 UTC (rev 26774)
@@ -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: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="interpreter"
class="org.cytoscape.equations.internal.interpreter.InterpreterImpl" />
+
+ <bean id="compiler"
class="org.cytoscape.equations.internal.EquationCompilerImpl">
+ <constructor-arg ref="parser" />
+ </bean>
+
+ <bean id="parser"
class="org.cytoscape.equations.internal.EquationParserImpl" />
+</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.
