Author: kono
Date: 2011-05-01 03:46:35 -0700 (Sun, 01 May 2011)
New Revision: 24882

Modified:
   
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
   core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Spring config files are fixed.

Modified: 
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
--- 
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
   2011-04-30 01:34:44 UTC (rev 24881)
+++ 
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
   2011-05-01 10:46:35 UTC (rev 24882)
@@ -6,7 +6,7 @@
     default-lazy-init="false">
 
        <osgi:service id="cyLayoutsService"
-               ref="cyLayouts" interface="org.cytoscape.view.layout.CyLayouts">
+               ref="cyLayouts" 
interface="org.cytoscape.view.layout.CyLayoutAlgorithmManager">
        </osgi:service>
 
        <osgi:service id="gridNodeLayoutService"

Modified: 
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- 
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml    
    2011-04-30 01:34:44 UTC (rev 24881)
+++ 
core3/layout-api/trunk/src/main/resources/META-INF/spring/bundle-context.xml    
    2011-05-01 10:46:35 UTC (rev 24882)
@@ -13,11 +13,13 @@
            http://www.springframework.org/schema/lang 
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
             http://www.springframework.org/schema/osgi 
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
     default-lazy-init="false">
+    
+    <import resource="bundle-context-osgi.xml" />
 
     <context:annotation-config />
 
-
        <bean id="cyLayouts" 
class="org.cytoscape.view.layout.internal.CyLayoutsImpl"/>
+       
        <bean id="gridNodeLayout" 
class="org.cytoscape.view.layout.internal.algorithms.GridNodeLayout">
                <constructor-arg ref="undoSupportServiceRef"/>
        </bean>

-- 
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.

Reply via email to