Author: mes
Date: 2011-09-15 12:55:30 -0700 (Thu, 15 Sep 2011)
New Revision: 26817
Added:
core3/impl/branches/no-spring/property-impl/src/main/java/org/cytoscape/property/internal/CyActivator.java
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
core3/impl/branches/no-spring/property-impl/osgi.bnd
Log:
removed use of spring
Modified: core3/impl/branches/no-spring/property-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/property-impl/osgi.bnd 2011-09-15
19:48:25 UTC (rev 26816)
+++ core3/impl/branches/no-spring/property-impl/osgi.bnd 2011-09-15
19:55:30 UTC (rev 26817)
@@ -4,4 +4,5 @@
Import-Package: *
Private-Package: ${bundle.namespace}, ${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Added:
core3/impl/branches/no-spring/property-impl/src/main/java/org/cytoscape/property/internal/CyActivator.java
===================================================================
---
core3/impl/branches/no-spring/property-impl/src/main/java/org/cytoscape/property/internal/CyActivator.java
(rev 0)
+++
core3/impl/branches/no-spring/property-impl/src/main/java/org/cytoscape/property/internal/CyActivator.java
2011-09-15 19:55:30 UTC (rev 26817)
@@ -0,0 +1,36 @@
+
+package org.cytoscape.property.internal;
+
+import org.cytoscape.property.internal.bookmark.BookmarksUtilImpl;
+import org.cytoscape.property.internal.PropsReader;
+import org.cytoscape.property.internal.bookmark.BookmarkReader;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.session.events.SessionLoadedListener;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+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) {
+
+ BookmarkReader bookmarksReader = new
BookmarkReader("bookmarks.xml");
+ BookmarksUtilImpl bookmarksUtil = new BookmarksUtilImpl();
+
+ Properties bookmarksReaderProps = new Properties();
+ bookmarksReaderProps.setProperty("cyPropertyName","bookmarks");
+ bookmarksReaderProps.setProperty("serviceType","property");
+ registerService(bc,bookmarksReader,CyProperty.class,
bookmarksReaderProps);
+ registerService(bc,bookmarksReader,SessionLoadedListener.class,
bookmarksReaderProps);
+
+ Properties bookmarksUtilProps = new Properties();
+ bookmarksUtilProps.setProperty("serviceType","property.util");
+ registerService(bc,bookmarksUtil,BookmarksUtil.class,
bookmarksUtilProps);
+ }
+}
+
Deleted:
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:48:25 UTC (rev 26816)
+++
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-15 19:55:30 UTC (rev 26817)
@@ -1,33 +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";>
-
- <!--
- definitions using elements of the osgi namespace can be
included in
- this file. There is no requirement to keep these definitions in
a
- separate file if you do not want to. The rationale for keeping
these
- definitions separate is to facilitate integration testing of the
- bundle outside of an OSGi container
- -->
-
- <osgi:service id="bookmarkCyPropertyService" ref="bookmarksReader">
- <osgi:interfaces>
- <value>org.cytoscape.property.CyProperty</value>
- <value>org.cytoscape.session.events.SessionLoadedListener</value>
- </osgi:interfaces>
- <osgi:service-properties>
- <entry key="serviceType" value="property" />
- <entry key="cyPropertyName" value="bookmarks" />
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service id="bookmarksUtilService" ref="bookmarksUtil"
- interface="org.cytoscape.property.bookmark.BookmarksUtil">
- <osgi:service-properties>
- <entry key="serviceType" value="property.util" />
- </osgi:service-properties>
- </osgi:service>
-
-</beans>
Copied:
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-15 19:55:30 UTC (rev 26817)
@@ -0,0 +1,33 @@
+<?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";>
+
+ <!--
+ definitions using elements of the osgi namespace can be
included in
+ this file. There is no requirement to keep these definitions in
a
+ separate file if you do not want to. The rationale for keeping
these
+ definitions separate is to facilitate integration testing of the
+ bundle outside of an OSGi container
+ -->
+
+ <osgi:service id="bookmarkCyPropertyService" ref="bookmarksReader">
+ <osgi:interfaces>
+ <value>org.cytoscape.property.CyProperty</value>
+ <value>org.cytoscape.session.events.SessionLoadedListener</value>
+ </osgi:interfaces>
+ <osgi:service-properties>
+ <entry key="serviceType" value="property" />
+ <entry key="cyPropertyName" value="bookmarks" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service id="bookmarksUtilService" ref="bookmarksUtil"
+ interface="org.cytoscape.property.bookmark.BookmarksUtil">
+ <osgi:service-properties>
+ <entry key="serviceType" value="property.util" />
+ </osgi:service-properties>
+ </osgi:service>
+
+</beans>
Deleted:
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:48:25 UTC (rev 26816)
+++
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-15 19:55:30 UTC (rev 26817)
@@ -1,33 +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">
-
-
- <bean id="corePropsReader"
class="org.cytoscape.property.internal.PropsReader">
- <constructor-arg value="cytoscape3.props" />
- </bean>
-
- <bean id="bookmarksReader"
class="org.cytoscape.property.internal.bookmark.BookmarkReader">
- <constructor-arg value="bookmarks.xml" />
- </bean>
-
- <bean id="bookmarksUtil"
class="org.cytoscape.property.internal.bookmark.BookmarksUtilImpl" />
-
-</beans>
Copied:
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 26762,
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
core3/impl/branches/no-spring/property-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-15 19:55:30 UTC (rev 26817)
@@ -0,0 +1,33 @@
+<?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">
+
+
+ <bean id="corePropsReader"
class="org.cytoscape.property.internal.PropsReader">
+ <constructor-arg value="cytoscape3.props" />
+ </bean>
+
+ <bean id="bookmarksReader"
class="org.cytoscape.property.internal.bookmark.BookmarkReader">
+ <constructor-arg value="bookmarks.xml" />
+ </bean>
+
+ <bean id="bookmarksUtil"
class="org.cytoscape.property.internal.bookmark.BookmarksUtilImpl" />
+
+</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.
