Author: kono
Date: 2010-08-12 18:05:25 -0700 (Thu, 12 Aug 2010)
New Revision: 21375
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Undo Support is broken. Cannot start Cytoscape anymore. Need to be fixed.
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-13 00:46:16 UTC (rev 21374)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-13 01:05:25 UTC (rev 21375)
@@ -1,33 +1,30 @@
<?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";
+ 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-2.5.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="undoSupportService"
- ref="undoSupport"
interface="org.cytoscape.work.undo.UndoSupport">
+ <osgi:service id="undoSupportService" ref="undoSupport"
+ interface="org.cytoscape.work.undo.UndoSupport">
</osgi:service>
-
- <osgi:service id="guiTunableInterceptorService"
- ref="guiTunableInterceptor"
interface="org.cytoscape.work.TunableInterceptor">
+
+ <osgi:service id="guiTunableInterceptorService"
ref="guiTunableInterceptor"
+ interface="org.cytoscape.work.TunableInterceptor">
</osgi:service>
-
- <osgi:service id="swingTaskManagerService"
- ref="swingTaskManager"
interface="org.cytoscape.work.TaskManager">
+
+ <osgi:service id="swingTaskManagerService" ref="swingTaskManager"
+ interface="org.cytoscape.work.TaskManager">
</osgi:service>
-
- <osgi:service id="guiHandlerFactoryService"
- ref="guiHandlerFactory"
interface="org.cytoscape.work.HandlerFactory">
+
+ <osgi:service id="guiHandlerFactoryService" ref="guiHandlerFactory"
+ interface="org.cytoscape.work.HandlerFactory">
</osgi:service>
-
- <osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=bookmarks)" />
- <osgi:reference id="bookmarksUtilServiceRef"
interface="org.cytoscape.property.bookmark.BookmarksUtil" />
-<!-- <osgi:reference id="fileUtilServiceRef"
interface="org.cytoscape.io.util.FileUtil"/>-->
-<!-- <osgi:reference id="streamUtilServiceRef"
interface="org.cytoscape.io.util.StreamUtil"/> -->
-
+ <osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
+ filter="(cyPropertyName=bookmarks)" />
+ <osgi:reference id="bookmarksUtilServiceRef"
+ interface="org.cytoscape.property.bookmark.BookmarksUtil" />
</beans>
Modified:
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-13 00:46:16 UTC (rev 21374)
+++
core3/work-swing-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-13 01:05:25 UTC (rev 21375)
@@ -1,33 +1,30 @@
<?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: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-2.5.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.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 -->
+ <!-- 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="undoSupport"
class="org.cytoscape.work.internal.UndoSupportImpl"/>
-
- <bean id="swingTaskManager"
class="org.cytoscape.work.internal.task.SwingTaskManager"/>
+ <context:annotation-config />
- <bean id="guiTunableInterceptor"
class="org.cytoscape.work.internal.tunables.GuiTunableInterceptor">
+ <bean id="undoSupport"
class="org.cytoscape.work.internal.UndoSupportImpl" />
+
+ <bean id="swingTaskManager"
class="org.cytoscape.work.internal.task.SwingTaskManager" />
+
+ <bean id="guiTunableInterceptor"
+
class="org.cytoscape.work.internal.tunables.GuiTunableInterceptor">
<constructor-arg ref="guiHandlerFactory" />
</bean>
<bean id="guiHandlerFactory"
class="org.cytoscape.work.internal.tunables.GUIHandlerFactory">
<constructor-arg ref="bookmarkServiceRef" />
<constructor-arg ref="bookmarksUtilServiceRef" />
-<!-- <constructor-arg ref="fileUtil"/>-->
-<!-- <constructor-arg ref="streamUtilServiceRef"/>-->
- </bean>
+ </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.
