Author: mes
Date: 2010-11-02 14:44:33 -0700 (Tue, 02 Nov 2010)
New Revision: 22690
Modified:
core3/model-impl/trunk/src/integration/java/integration/ITSpringIntegration.java
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:
removed use of the name cydatatable
Modified:
core3/model-impl/trunk/src/integration/java/integration/ITSpringIntegration.java
===================================================================
---
core3/model-impl/trunk/src/integration/java/integration/ITSpringIntegration.java
2010-11-02 21:15:40 UTC (rev 22689)
+++
core3/model-impl/trunk/src/integration/java/integration/ITSpringIntegration.java
2010-11-02 21:44:33 UTC (rev 22690)
@@ -18,13 +18,13 @@
public ITSpringIntegration() {
super( "org.cytoscape.model-impl",
- new String[] { "org.cytoscape, event-api, 1.0-SNAPSHOT",
- "org.cytoscape, event-impl, 1.0-SNAPSHOT",
- "org.cytoscape, model-api, 1.0-SNAPSHOT",
- "org.cytoscape, model-impl, 1.0-SNAPSHOT",
- "org.cytoscape, integration-test-support,
1.0-SNAPSHOT" ,
+ new String[] { "org.cytoscape, event-api, 3.0.0-alpha1",
+ "org.cytoscape, event-impl, 3.0.0-alpha1",
+ "org.cytoscape, model-api, 3.0.0-alpha1",
+ "org.cytoscape, model-impl,
3.0.0-alpha2-SNAPSHOT",
+ "org.cytoscape, integration-test-support,
3.0.0-alpha2" ,
},
- new String[] { "cyNetworkFactory", "cyDataTableFactory",
+ new String[] { "cyNetworkFactory", "cyTableFactory",
"cyRootNetworkFactory",
"cyTableManager" },
new Class[] { CyNetworkFactory.class,
CyTableFactory.class,
CyRootNetworkFactory.class,
CyTableManager.class },
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-11-02 21:15:40 UTC (rev 22689)
+++
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-11-02 21:44:33 UTC (rev 22690)
@@ -15,8 +15,8 @@
ref="cyNetworkFactory"
interface="org.cytoscape.model.CyNetworkFactory">
</osgi:service>
- <osgi:service id="cyDataTableFactoryService"
- ref="cyDataTableFactory"
interface="org.cytoscape.model.CyTableFactory">
+ <osgi:service id="cyTableFactoryService"
+ ref="cyTableFactory"
interface="org.cytoscape.model.CyTableFactory">
</osgi:service>
<osgi:service id="cyRootNetworkFactoryService"
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-11-02 21:15:40 UTC (rev 22689)
+++
core3/model-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-11-02 21:44:33 UTC (rev 22690)
@@ -18,7 +18,7 @@
<bean id="cyTableManager"
class="org.cytoscape.model.internal.CyTableManagerImpl">
</bean>
- <bean id="cyDataTableFactory"
class="org.cytoscape.model.internal.CyTableFactoryImpl">
+ <bean id="cyTableFactory"
class="org.cytoscape.model.internal.CyTableFactoryImpl">
<constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="cyTableManager" />
</bean>
@@ -26,7 +26,7 @@
<bean id="cyNetworkFactory"
class="org.cytoscape.model.internal.CyNetworkFactoryImpl">
<constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="cyTableManager" />
- <constructor-arg ref="cyDataTableFactory" />
+ <constructor-arg ref="cyTableFactory" />
</bean>
<bean id="cyNetworkManager"
class="org.cytoscape.model.internal.CyNetworkManagerImpl">
--
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.
