Author: mes
Date: 2010-08-10 17:34:23 -0700 (Tue, 10 Aug 2010)
New Revision: 21319
Modified:
core3/model-impl/trunk/osgi.bnd
core3/model-impl/trunk/pom.xml
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
extracted event impl code
Modified: core3/model-impl/trunk/osgi.bnd
===================================================================
--- core3/model-impl/trunk/osgi.bnd 2010-08-11 00:28:19 UTC (rev 21318)
+++ core3/model-impl/trunk/osgi.bnd 2010-08-11 00:34:23 UTC (rev 21319)
@@ -3,5 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Private-Package: ${bundle.namespace}.internal, ${bundle.namespace}.internal.*,
org.cytoscape.event.internal
+Private-Package: ${bundle.namespace}.internal, ${bundle.namespace}.internal.*
Modified: core3/model-impl/trunk/pom.xml
===================================================================
--- core3/model-impl/trunk/pom.xml 2010-08-11 00:28:19 UTC (rev 21318)
+++ core3/model-impl/trunk/pom.xml 2010-08-11 00:34:23 UTC (rev 21319)
@@ -104,30 +104,28 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>model-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>event-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model-api</artifactId>
+ <artifactId>event-api</artifactId>
<version>1.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
@@ -139,12 +137,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-mock</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.1</version>
Modified:
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-11 00:28:19 UTC (rev 21318)
+++
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-11 00:34:23 UTC (rev 21319)
@@ -6,6 +6,10 @@
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" />
+
<!-- Individual Service -->
<osgi:service id="cyNetworkFactoryService"
ref="cyNetworkFactory"
interface="org.cytoscape.model.CyNetworkFactory">
@@ -19,10 +23,6 @@
ref="cyRootNetworkFactory"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
</osgi:service>
- <osgi:service id="cyEventHelperService"
- ref="cyEventHelper"
interface="org.cytoscape.event.CyEventHelper">
- </osgi:service>
-
<osgi:service id="cyTableManagerService"
ref="cyTableManager"
interface="org.cytoscape.model.CyTableManager">
</osgi:service>
Modified:
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-11 00:28:19 UTC (rev 21318)
+++
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-08-11 00:34:23 UTC (rev 21319)
@@ -19,26 +19,14 @@
</bean>
<bean id="cyNetworkFactory"
class="org.cytoscape.model.internal.CyNetworkFactoryImpl">
- <constructor-arg ref="cyEventHelper" />
+ <constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="cyTableManager" />
</bean>
<bean id="cyDataTableFactory"
class="org.cytoscape.model.internal.CyDataTableFactoryImpl">
- <constructor-arg ref="cyEventHelper" />
+ <constructor-arg ref="cyEventHelperServiceRef" />
</bean>
<bean id="cyRootNetworkFactory"
class="org.cytoscape.model.internal.CyRootNetworkFactoryImpl"/>
- <bean id="cyListenerAdapter"
class="org.cytoscape.event.internal.CyListenerAdapter">
- <constructor-arg ref="bundleContext" />
- </bean>
-
- <bean id="cyMicroListenerAdapter"
class="org.cytoscape.event.internal.CyMicroListenerAdapter">
- <constructor-arg ref="bundleContext" />
- </bean>
-
- <bean id="cyEventHelper"
class="org.cytoscape.event.internal.CyEventHelperImpl">
- <constructor-arg ref="cyListenerAdapter" />
- <constructor-arg ref="cyMicroListenerAdapter" />
- </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.
