Author: rodche
Date: 2011-12-09 11:59:50 -0800 (Fri, 09 Dec 2011)
New Revision: 27754
Removed:
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Log:
Removed legacy (osgi config) xml.
Deleted:
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
===================================================================
---
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-12-09 19:55:41 UTC (rev 27753)
+++
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-12-09 19:59:50 UTC (rev 27754)
@@ -1,72 +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="cySwingApplicationRef"
- interface="org.cytoscape.application.swing.CySwingApplication"
/>
-
- <osgi:reference id="taskManagerRef"
- interface="org.cytoscape.work.TaskManager" />
-
- <osgi:reference id="openBrowserRef"
- interface="org.cytoscape.util.swing.OpenBrowser" />
-
- <osgi:reference id="cyApplicationManagerRef"
- interface="org.cytoscape.application.CyApplicationManager" />
-
- <osgi:reference id="cyNetworkViewManagerRef"
- interface="org.cytoscape.view.model.CyNetworkViewManager" />
-
- <osgi:reference id="cyNetworkNamingRef"
- interface="org.cytoscape.session.CyNetworkNaming" />
-
- <osgi:reference id="cyNetworkFactoryRef"
- interface="org.cytoscape.model.CyNetworkFactory" />
-
- <osgi:reference id="cyNetworkViewFactoryRef"
- interface="org.cytoscape.view.model.CyNetworkViewFactory" />
-
- <osgi:reference id="fileUtilRef"
- interface="org.cytoscape.util.swing.FileUtil" />
-
- <osgi:reference id="streamUtilRef"
- interface="org.cytoscape.io.util.StreamUtil" />
-
- <osgi:reference id="visualMappingManagerRef"
- interface="org.cytoscape.view.vizmap.VisualMappingManager" />
-
- <osgi:reference id="visualStyleFactoryRef"
- interface="org.cytoscape.view.vizmap.VisualStyleFactory" />
-
- <osgi:reference id="discreteMappingFunctionFactoryRef"
-
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
- filter="(mapping.type=discrete)" />
-
- <osgi:reference id="passthroughMappingFunctionFactoryRef"
-
interface="org.cytoscape.view.vizmap.VisualMappingFunctionFactory"
- filter="(mapping.type=passthrough)" />
-
- <osgi:service ref="mapBioPaxToCytoscapeFactory"
- interface="org.cytoscape.biopax.MapBioPaxToCytoscapeFactory" />
-
- <osgi:service ref="bioPaxNetworkViewTaskFactory"
- interface="org.cytoscape.io.read.InputStreamTaskFactory" />
-
- <osgi:service ref="bioPaxContainer"
- interface="org.cytoscape.biopax.BioPaxContainer" />
-
- <osgi:service ref="bioPaxCytoPanelComponent"
- interface="org.cytoscape.application.swing.CytoPanelComponent"
/>
-
- <osgi:service ref="networkListener">
- <osgi:interfaces>
- <value>org.cytoscape.biopax.NetworkListener</value>
-
<value>org.cytoscape.model.events.RowsSetListener</value>
- </osgi:interfaces>
- </osgi:service>
-</beans>
Deleted:
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
===================================================================
---
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-12-09 19:55:41 UTC (rev 27753)
+++
core3/impl/trunk/biopax-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-12-09 19:59:50 UTC (rev 27754)
@@ -1,81 +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";
- 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/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="true">
-
- <context:annotation-config />
-
- <bean id="mapBioPaxToCytoscapeFactory"
class="org.cytoscape.biopax.internal.MapBioPaxToCytoscapeFactoryImpl" />
-
- <bean id="bioPaxFilter"
class="org.cytoscape.biopax.internal.BioPaxFilter">
- <constructor-arg ref="streamUtilRef" />
- </bean>
-
- <bean id="launchExternalBrowser"
class="org.cytoscape.biopax.internal.action.LaunchExternalBrowser">
- <constructor-arg ref="openBrowserRef" />
- </bean>
-
- <bean id="bioPaxFactory"
class="org.cytoscape.biopax.internal.BioPaxFactory">
- <constructor-arg ref="cyNetworkViewManagerRef" />
- <constructor-arg ref="fileUtilRef" />
- <constructor-arg ref="cyApplicationManagerRef" />
- <constructor-arg ref="bioPaxFilter" />
- <constructor-arg ref="taskManagerRef" />
- <constructor-arg ref="launchExternalBrowser" />
- <constructor-arg ref="cySwingApplicationRef" />
- </bean>
-
- <bean id="bioPaxDetailsPanel"
class="org.cytoscape.biopax.internal.view.BioPaxDetailsPanel">
- <constructor-arg ref="launchExternalBrowser" />
- </bean>
-
- <bean id="bioPaxContainer"
class="org.cytoscape.biopax.internal.view.BioPaxContainerImpl">
- <constructor-arg ref="launchExternalBrowser" />
- <constructor-arg ref="cyApplicationManagerRef" />
- <constructor-arg ref="cyNetworkViewManagerRef" />
- <constructor-arg ref="bioPaxDetailsPanel" />
- <constructor-arg ref="cySwingApplicationRef" />
- </bean>
-
- <bean id="networkListener"
class="org.cytoscape.biopax.internal.action.NetworkListenerImpl">
- <constructor-arg ref="bioPaxDetailsPanel"/>
- <constructor-arg ref="bioPaxContainer"/>
- <constructor-arg ref="mapBioPaxToCytoscapeFactory"/>
- <constructor-arg ref="cyNetworkViewManagerRef"/>
- </bean>
-
- <bean id="bioPaxCytoPanelComponent"
class="org.cytoscape.biopax.internal.view.BioPaxCytoPanelComponent">
- <constructor-arg ref="bioPaxContainer" />
- </bean>
-
- <bean id="bioPaxNetworkViewTaskFactory"
class="org.cytoscape.biopax.internal.BioPaxNetworkViewTaskFactory">
- <constructor-arg ref="bioPaxFilter"/>
- <constructor-arg ref="cyNetworkFactoryRef"/>
- <constructor-arg ref="cyNetworkViewFactoryRef"/>
- <constructor-arg ref="cyNetworkNamingRef"/>
- <constructor-arg ref="bioPaxContainer"/>
- <constructor-arg ref="networkListener"/>
- <constructor-arg ref="visualMappingManagerRef"/>
- <constructor-arg ref="bioPaxVisualStyleUtil"/>
- </bean>
-
- <bean id="bioPaxVisualStyleUtil"
class="org.cytoscape.biopax.internal.util.BioPaxVisualStyleUtil">
- <constructor-arg ref="visualStyleFactoryRef" />
- <constructor-arg ref="visualMappingManagerRef" />
- <constructor-arg ref="discreteMappingFunctionFactoryRef" />
- <constructor-arg ref="passthroughMappingFunctionFactoryRef" />
- </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.
