Author: mes
Date: 2011-09-15 13:02:45 -0700 (Thu, 15 Sep 2011)
New Revision: 26819
Added:
core3/impl/branches/no-spring/sbml-impl/src/main/java/org/cytoscape/sbml/internal/CyActivator.java
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/sbml-impl/osgi.bnd
core3/impl/branches/no-spring/sbml-impl/pom.xml
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/sbml-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/sbml-impl/osgi.bnd 2011-09-15 20:00:16 UTC
(rev 26818)
+++ core3/impl/branches/no-spring/sbml-impl/osgi.bnd 2011-09-15 20:02:45 UTC
(rev 26819)
@@ -2,6 +2,6 @@
# Use this file to add customized Bnd instructions for the bundle
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
+Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Private-Package: ${bundle.namespace}.internal.*
Export-Package:
!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${pom.version}"
Modified: core3/impl/branches/no-spring/sbml-impl/pom.xml
===================================================================
--- core3/impl/branches/no-spring/sbml-impl/pom.xml 2011-09-15 20:00:16 UTC
(rev 26818)
+++ core3/impl/branches/no-spring/sbml-impl/pom.xml 2011-09-15 20:02:45 UTC
(rev 26819)
@@ -108,11 +108,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>service-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>event-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
Added:
core3/impl/branches/no-spring/sbml-impl/src/main/java/org/cytoscape/sbml/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/sbml-impl/src/main/java/org/cytoscape/sbml/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/sbml-impl/src/main/java/org/cytoscape/sbml/internal/CyActivator.java
2011-09-15 20:02:45 UTC (rev 26819)
@@ -0,0 +1,44 @@
+
+package org.cytoscape.sbml.internal;
+
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.io.util.StreamUtil;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+
+import org.cytoscape.sbml.internal.SBMLFileFilter;
+import org.cytoscape.sbml.internal.SBMLNetworkViewTaskFactory;
+
+import org.cytoscape.io.read.InputStreamTaskFactory;
+
+
+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) {
+
+ CyNetworkFactory cyNetworkFactoryServiceRef =
getService(bc,CyNetworkFactory.class);
+ CyNetworkViewFactory cyNetworkViewFactoryServiceRef =
getService(bc,CyNetworkViewFactory.class);
+ StreamUtil streamUtilRef = getService(bc,StreamUtil.class);
+
+ SBMLFileFilter sbmlFilter = new SBMLFileFilter("SBML files
(*.xml)",streamUtilRef);
+ SBMLNetworkViewTaskFactory sbmlNetworkViewTaskFactory = new
SBMLNetworkViewTaskFactory(sbmlFilter,cyNetworkFactoryServiceRef,cyNetworkViewFactoryServiceRef);
+
+
+ Properties sbmlNetworkViewTaskFactoryProps = new Properties();
+
sbmlNetworkViewTaskFactoryProps.setProperty("serviceType","sbmlNetworkViewTaskFactory");
+
sbmlNetworkViewTaskFactoryProps.setProperty("readerDescription","SBML file
reader");
+
sbmlNetworkViewTaskFactoryProps.setProperty("readerId","sbmlNetworkViewReader");
+
registerService(bc,sbmlNetworkViewTaskFactory,InputStreamTaskFactory.class,
sbmlNetworkViewTaskFactoryProps);
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:00:16 UTC (rev 26818)
+++
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 20:02:45 UTC (rev 26819)
@@ -1,27 +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 OSGi services -->
-
- <osgi:reference id="cyNetworkFactoryServiceRef"
- interface="org.cytoscape.model.CyNetworkFactory" />
-
- <osgi:reference id="cyNetworkViewFactoryServiceRef"
-
interface="org.cytoscape.view.model.CyNetworkViewFactory" />
-
- <osgi:reference id="streamUtilRef"
- interface="org.cytoscape.io.util.StreamUtil" />
-
- <osgi:service id="sbmlNetworkViewReaderFactoryService"
ref="sbmlNetworkViewTaskFactory"
- interface="org.cytoscape.io.read.InputStreamTaskFactory">
- <osgi:service-properties>
- <entry key="serviceType"
value="sbmlNetworkViewTaskFactory" />
- <entry key="readerId" value="sbmlNetworkViewReader" />
- <entry key="readerDescription" value="SBML file reader"
/>
- </osgi:service-properties>
- </osgi:service>
-</beans>
Copied:
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 20:02:45 UTC (rev 26819)
@@ -0,0 +1,27 @@
+<?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 OSGi services -->
+
+ <osgi:reference id="cyNetworkFactoryServiceRef"
+ interface="org.cytoscape.model.CyNetworkFactory" />
+
+ <osgi:reference id="cyNetworkViewFactoryServiceRef"
+
interface="org.cytoscape.view.model.CyNetworkViewFactory" />
+
+ <osgi:reference id="streamUtilRef"
+ interface="org.cytoscape.io.util.StreamUtil" />
+
+ <osgi:service id="sbmlNetworkViewReaderFactoryService"
ref="sbmlNetworkViewTaskFactory"
+ interface="org.cytoscape.io.read.InputStreamTaskFactory">
+ <osgi:service-properties>
+ <entry key="serviceType"
value="sbmlNetworkViewTaskFactory" />
+ <entry key="readerId" value="sbmlNetworkViewReader" />
+ <entry key="readerDescription" value="SBML file reader"
/>
+ </osgi:service-properties>
+ </osgi:service>
+</beans>
Deleted:
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:00:16 UTC (rev 26818)
+++
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 20:02:45 UTC (rev 26819)
@@ -1,34 +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";
- 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">
-
- <context:annotation-config />
-
- <bean id="sbmlFilter"
class="org.cytoscape.sbml.internal.SBMLFileFilter">
- <constructor-arg value="SBML files (*.xml)" />
- <constructor-arg ref="streamUtilRef" />
- </bean>
-
- <bean id="sbmlNetworkViewTaskFactory"
class="org.cytoscape.sbml.internal.SBMLNetworkViewTaskFactory">
- <constructor-arg ref="sbmlFilter" />
- <constructor-arg ref="cyNetworkFactoryServiceRef" />
- <constructor-arg ref="cyNetworkViewFactoryServiceRef" />
- </bean>
-</beans>
Copied:
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/sbml-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 20:02:45 UTC (rev 26819)
@@ -0,0 +1,34 @@
+<?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";
+ 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">
+
+ <context:annotation-config />
+
+ <bean id="sbmlFilter"
class="org.cytoscape.sbml.internal.SBMLFileFilter">
+ <constructor-arg value="SBML files (*.xml)" />
+ <constructor-arg ref="streamUtilRef" />
+ </bean>
+
+ <bean id="sbmlNetworkViewTaskFactory"
class="org.cytoscape.sbml.internal.SBMLNetworkViewTaskFactory">
+ <constructor-arg ref="sbmlFilter" />
+ <constructor-arg ref="cyNetworkFactoryServiceRef" />
+ <constructor-arg ref="cyNetworkViewFactoryServiceRef" />
+ </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.
