Author: mes Date: 2011-09-15 12:46:23 -0700 (Thu, 15 Sep 2011) New Revision: 26815
Added: core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy Removed: core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml Modified: core3/impl/branches/no-spring/presentation-impl/osgi.bnd Log: removed use of spring Modified: core3/impl/branches/no-spring/presentation-impl/osgi.bnd =================================================================== --- core3/impl/branches/no-spring/presentation-impl/osgi.bnd 2011-09-15 19:44:35 UTC (rev 26814) +++ core3/impl/branches/no-spring/presentation-impl/osgi.bnd 2011-09-15 19:46:23 UTC (rev 26815) @@ -4,3 +4,4 @@ Import-Package: * Private-Package: org.cytoscape.view.presentation.internal.* +Bundle-Activator: org.cytoscape.view.presentation.internal.CyActivator Deleted: core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml =================================================================== --- core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml 2011-09-15 19:44:35 UTC (rev 26814) +++ core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml 2011-09-15 19:46:23 UTC (rev 26815) @@ -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"> - - - <osgi:reference id="cyEventHelperServiceRef" interface="org.cytoscape.event.CyEventHelper" /> - - <!-- Export Rendering Engine Manager Bean as a Service --> - <osgi:service id="renderingEngineManagerService" ref="renderingEngineManager" - interface="org.cytoscape.view.presentation.RenderingEngineManager"> - <osgi:service-properties> - <entry key="service.type" value="manager" /> - </osgi:service-properties> - </osgi:service> - - - <osgi:set id="renderingEngineFactorySet" - interface="org.cytoscape.view.presentation.RenderingEngineFactory" - cardinality="0..N"> - <osgi:listener bind-method="addRenderingEngineFactory" - unbind-method="removeRenderingEngineFactory" ref="renderingEngineManager" /> - </osgi:set> - -</beans> Copied: core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy (from rev 26762, core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml) =================================================================== --- core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy (rev 0) +++ core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy 2011-09-15 19:46:23 UTC (rev 26815) @@ -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"> + + + <osgi:reference id="cyEventHelperServiceRef" interface="org.cytoscape.event.CyEventHelper" /> + + <!-- Export Rendering Engine Manager Bean as a Service --> + <osgi:service id="renderingEngineManagerService" ref="renderingEngineManager" + interface="org.cytoscape.view.presentation.RenderingEngineManager"> + <osgi:service-properties> + <entry key="service.type" value="manager" /> + </osgi:service-properties> + </osgi:service> + + + <osgi:set id="renderingEngineFactorySet" + interface="org.cytoscape.view.presentation.RenderingEngineFactory" + cardinality="0..N"> + <osgi:listener bind-method="addRenderingEngineFactory" + unbind-method="removeRenderingEngineFactory" ref="renderingEngineManager" /> + </osgi:set> + +</beans> Deleted: core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml =================================================================== --- core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml 2011-09-15 19:44:35 UTC (rev 26814) +++ core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml 2011-09-15 19:46:23 UTC (rev 26815) @@ -1,17 +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";> - - <context:annotation-config /> - - <!-- Rendering Engine Manager service bean --> - <bean id="renderingEngineManager" - class="org.cytoscape.view.presentation.internal.RenderingEngineManagerImpl"> - </bean> - -</beans> Copied: core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy (from rev 26762, core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml) =================================================================== --- core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy (rev 0) +++ core3/impl/branches/no-spring/presentation-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy 2011-09-15 19:46:23 UTC (rev 26815) @@ -0,0 +1,17 @@ +<?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";> + + <context:annotation-config /> + + <!-- Rendering Engine Manager service bean --> + <bean id="renderingEngineManager" + class="org.cytoscape.view.presentation.internal.RenderingEngineManagerImpl"> + </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.
