Author: mes
Date: 2011-09-28 11:43:41 -0700 (Wed, 28 Sep 2011)
New Revision: 27016
Added:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/CyActivator.java
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
Removed:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/osgi.bnd
csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml
Log:
made to work with CyActivator
Modified: csplugins/trunk/ucsd/mes/provenance-tracker-impl/osgi.bnd
===================================================================
--- csplugins/trunk/ucsd/mes/provenance-tracker-impl/osgi.bnd 2011-09-28
18:26:46 UTC (rev 27015)
+++ csplugins/trunk/ucsd/mes/provenance-tracker-impl/osgi.bnd 2011-09-28
18:43:41 UTC (rev 27016)
@@ -3,6 +3,6 @@
#-----------------------------------------------------------------
-Spring-Context: META-INF/spring/*.xml
Private-Package: ${bundle.namespace}.*
+Bundle-Activator: ${bundle.namespace}.CyActivator
Modified: csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml
===================================================================
--- csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml 2011-09-28
18:26:46 UTC (rev 27015)
+++ csplugins/trunk/ucsd/mes/provenance-tracker-impl/pom.xml 2011-09-28
18:43:41 UTC (rev 27016)
@@ -12,7 +12,7 @@
<properties>
<bundle.symbolicName>org.cytoscape.provenance-tracker-impl</bundle.symbolicName>
<bundle.namespace>org.cytoscape.provenance.internal</bundle.namespace>
- <cytoscape.api.version>3.0.0-alpha7</cytoscape.api.version>
+
<cytoscape.api.version>3.0.0-alpha8-SNAPSHOT</cytoscape.api.version>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -93,5 +93,17 @@
<version>1.5.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>service-api</artifactId>
+ <version>${cytoscape.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Added:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/CyActivator.java
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/CyActivator.java
(rev 0)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/java/org/cytoscape/provenance/internal/CyActivator.java
2011-09-28 18:43:41 UTC (rev 27016)
@@ -0,0 +1,34 @@
+
+package org.cytoscape.provenance.internal;
+
+
+import org.cytoscape.provenance.internal.ProvenanceHandlerFactory;
+import org.cytoscape.provenance.internal.ProvenanceInterceptor;
+
+import org.cytoscape.work.TunableHandlerFactory;
+import org.cytoscape.work.TunableInterceptor;
+
+
+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) {
+
+ ProvenanceInterceptor provenanceInterceptor = new
ProvenanceInterceptor();
+ ProvenanceHandlerFactory provenanceHandlerFactory = new
ProvenanceHandlerFactory();
+
+
registerService(bc,provenanceInterceptor,TunableInterceptor.class, new
Properties());
+
registerService(bc,provenanceHandlerFactory,TunableHandlerFactory.class, new
Properties());
+
+
registerServiceListener(bc,provenanceInterceptor,"addTunableHandlerFactory","removeTunableHandlerFactory",TunableHandlerFactory.class);
+ }
+}
+
Deleted:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-28 18:26:46 UTC (rev 27015)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-09-28 18:43:41 UTC (rev 27016)
@@ -1,19 +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-2.5.xsd
- http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
- default-lazy-init="false">
-
- <!-- create TunableInterceptor services -->
-
- <osgi:service id="provenanceInterceptorService"
- ref="provenanceInterceptor"
interface="org.cytoscape.work.TunableInterceptor">
- </osgi:service>
-
- <osgi:service id="provenanceHandlerFactoryService"
- ref="provenanceHandlerFactory"
interface="org.cytoscape.work.TunableHandlerFactory">
- </osgi:service>
-
-</beans>
Copied:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(from rev 27015,
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml)
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
(rev 0)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml-legacy
2011-09-28 18:43:41 UTC (rev 27016)
@@ -0,0 +1,19 @@
+<?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-2.5.xsd
+ http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
+ default-lazy-init="false">
+
+ <!-- create TunableInterceptor services -->
+
+ <osgi:service id="provenanceInterceptorService"
+ ref="provenanceInterceptor"
interface="org.cytoscape.work.TunableInterceptor">
+ </osgi:service>
+
+ <osgi:service id="provenanceHandlerFactoryService"
+ ref="provenanceHandlerFactory"
interface="org.cytoscape.work.TunableHandlerFactory">
+ </osgi:service>
+
+</beans>
Deleted:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-28 18:26:46 UTC (rev 27015)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-09-28 18:43:41 UTC (rev 27016)
@@ -1,34 +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";
- xmlns:util="http://www.springframework.org/schema/util";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.5.xsd
- 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">
-
- <!-- 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="provenanceInterceptor"
class="org.cytoscape.provenance.internal.ProvenanceInterceptor">
- </bean>
-
- <bean id="provenanceHandlerFactory"
class="org.cytoscape.provenance.internal.ProvenanceHandlerFactory">
- </bean>
-
-
-</beans>
Copied:
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(from rev 27015,
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml)
===================================================================
---
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
(rev 0)
+++
csplugins/trunk/ucsd/mes/provenance-tracker-impl/src/main/resources/META-INF/spring/bundle-context.xml-legacy
2011-09-28 18:43:41 UTC (rev 27016)
@@ -0,0 +1,34 @@
+<?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:util="http://www.springframework.org/schema/util";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+ http://www.springframework.org/schema/context
+
http://www.springframework.org/schema/context/spring-context-2.5.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.5.xsd
+ 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">
+
+ <!-- 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="provenanceInterceptor"
class="org.cytoscape.provenance.internal.ProvenanceInterceptor">
+ </bean>
+
+ <bean id="provenanceHandlerFactory"
class="org.cytoscape.provenance.internal.ProvenanceHandlerFactory">
+ </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.
