Author: abeld
Date: 2009-03-12 00:43:52 -0700 (Thu, 12 Mar 2009)
New Revision: 16211
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/CyMain.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/PassthroughMappingCalculator.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/pom.xml
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
refactored-viewmodel: prepare for merge to core3
seperate column-oriented viewmodel, vizmap into -api and -impl, step 5:
fix pom.xml, osgi.bnd, bundle-context*.xml files
This version appears to compile, but for some reason doesn't run right
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/pom.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/pom.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -154,26 +154,21 @@
<scope>test</scope>
</dependency>
-<!-- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>vizmap</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency> -->
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap</artifactId>
+ <artifactId>vizmap-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/CyMain.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/CyMain.java
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/CyMain.java
2009-03-12 07:43:52 UTC (rev 16211)
@@ -45,7 +45,7 @@
import org.cytoscape.presentation.NetworkPresentationFactory;
import org.cytoscape.presentation.TextPresentation;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
import org.cytoscape.vizmap.*;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/PassthroughMappingCalculator.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/PassthroughMappingCalculator.java
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/java/cytoscape/PassthroughMappingCalculator.java
2009-03-12 07:43:52 UTC (rev 16211)
@@ -41,7 +41,7 @@
import org.cytoscape.model.*;
-import org.cytoscape.viewmodel.*;
+import org.cytoscape.view.model.*;
import org.cytoscape.vizmap.*;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/column-oriented-integration_test/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -10,7 +10,7 @@
</osgi:reference>
<osgi:reference id="cyNetworkViewFactoryServiceRef"
- interface="org.cytoscape.viewmodel.CyNetworkViewFactory">
+ interface="org.cytoscape.view.model.CyNetworkViewFactory">
</osgi:reference>
<osgi:reference id="networkPresentationFactoryServiceRef"
@@ -22,6 +22,6 @@
</osgi:reference>
<osgi:reference id="visualPropertyCatalogServiceRef"
- interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:reference>
</beans>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/osgi.bnd
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/osgi.bnd
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/osgi.bnd
2009-03-12 07:43:52 UTC (rev 16211)
@@ -3,6 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Private-Package:
${bundle.symbolicName}.internal,${bundle.symbolicName}.events.internal
-Export-Package: ${bundle.symbolicName},${bundle.symbolicName}.events,
+Export-Package: ${bundle.namespace},${bundle.namespace}.events,
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/pom.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/pom.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -9,12 +9,12 @@
<properties>
<bundle.symbolicName>org.cytoscape.viewmodel</bundle.symbolicName>
- <bundle.namespace>org.cytoscape.viewmodel</bundle.namespace>
+ <bundle.namespace>org.cytoscape.view.model</bundle.namespace>
</properties>
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-api</artifactId>
<version>1.0-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
@@ -104,7 +104,7 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/java/org/cytoscape/view/model/CyNetworkView.java
2009-03-12 07:43:52 UTC (rev 16211)
@@ -38,7 +38,6 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.GraphObject;
-import org.cytoscape.view.model.internal.ColumnOrientedViewColumn;
import java.util.List;
import java.util.Set;
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -8,14 +8,14 @@
<!-- Individual Service -->
<osgi:service id="cyNetworkViewFactoryService"
- ref="cyNetworkViewFactory"
interface="org.cytoscape.viewmodel.CyNetworkViewFactory">
+ ref="cyNetworkViewFactory"
interface="org.cytoscape.view.model.CyNetworkViewFactory">
<osgi:service-properties>
<entry key="service.type" value="factory" />
</osgi:service-properties>
</osgi:service>
<osgi:service id="visualPropertyCatalogService"
- ref="visualPropertyCatalog"
interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ ref="visualPropertyCatalog"
interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:service>
<osgi:reference id="cyEventHelperServiceRef"
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -15,13 +15,4 @@
<context:annotation-config/>
- <bean id="cyNetworkViewFactory"
class="org.cytoscape.viewmodel.internal.ColumnOrientedNetworkViewFactoryImpl">
- <property name="eventHelper" ref="cyEventHelperServiceRef"></property>
- <property name="bundleContext" ref="bundleContext"></property>
- </bean>
-
- <bean id="visualPropertyCatalog"
class="org.cytoscape.viewmodel.internal.VisualPropertyCatalogImpl">
- <property name="bundleContext" ref="bundleContext"></property>
- </bean>
-
</beans>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/osgi.bnd
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/osgi.bnd
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/osgi.bnd
2009-03-12 07:43:52 UTC (rev 16211)
@@ -3,6 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Private-Package:
${bundle.symbolicName}.internal,${bundle.symbolicName}.events.internal
-Export-Package: ${bundle.symbolicName},${bundle.symbolicName}.events,
+Private-Package:
${bundle.namespace}.internal,${bundle.namespace}.events.internal
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/pom.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/pom.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -9,12 +9,12 @@
<properties>
<bundle.symbolicName>org.cytoscape.viewmodel</bundle.symbolicName>
- <bundle.namespace>org.cytoscape.viewmodel</bundle.namespace>
+ <bundle.namespace>org.cytoscape.view.model</bundle.namespace>
</properties>
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-impl</artifactId>
<version>1.0-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
@@ -104,11 +104,17 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>viewmodel-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
<version>1.0</version>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -8,14 +8,14 @@
<!-- Individual Service -->
<osgi:service id="cyNetworkViewFactoryService"
- ref="cyNetworkViewFactory"
interface="org.cytoscape.viewmodel.CyNetworkViewFactory">
+ ref="cyNetworkViewFactory"
interface="org.cytoscape.view.model.CyNetworkViewFactory">
<osgi:service-properties>
<entry key="service.type" value="factory" />
</osgi:service-properties>
</osgi:service>
<osgi:service id="visualPropertyCatalogService"
- ref="visualPropertyCatalog"
interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ ref="visualPropertyCatalog"
interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:service>
<osgi:reference id="cyEventHelperServiceRef"
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-impl-columns/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -15,12 +15,12 @@
<context:annotation-config/>
- <bean id="cyNetworkViewFactory"
class="org.cytoscape.viewmodel.internal.ColumnOrientedNetworkViewFactoryImpl">
+ <bean id="cyNetworkViewFactory"
class="org.cytoscape.view.model.internal.ColumnOrientedNetworkViewFactoryImpl">
<property name="eventHelper" ref="cyEventHelperServiceRef"></property>
<property name="bundleContext" ref="bundleContext"></property>
</bean>
- <bean id="visualPropertyCatalog"
class="org.cytoscape.viewmodel.internal.VisualPropertyCatalogImpl">
+ <bean id="visualPropertyCatalog"
class="org.cytoscape.view.model.internal.VisualPropertyCatalogImpl">
<property name="bundleContext" ref="bundleContext"></property>
</bean>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/osgi.bnd
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/osgi.bnd
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/osgi.bnd
2009-03-12 07:43:52 UTC (rev 16211)
@@ -3,6 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Private-Package:
${bundle.symbolicName}.internal,${bundle.symbolicName}.events.internal
-Export-Package: ${bundle.symbolicName},${bundle.symbolicName}.events,
+Export-Package: ${bundle.namespace},${bundle.namespace}.events,
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/pom.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/pom.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap</artifactId>
+ <artifactId>vizmap-api</artifactId>
<version>1.0-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
@@ -104,12 +104,12 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -14,6 +14,6 @@
</osgi:reference>
<osgi:reference id="visualPropertyCatalogRef"
- interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:reference>
</beans>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-api-columns/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -16,9 +16,4 @@
<context:annotation-config />
- <bean id="visualStyleCatalog"
class="org.cytoscape.vizmap.internal.VisualStyleCatalogImpl">
- <property name="eventHelper" ref="cyEventHelperServiceRef"></property>
- <property name="visualPropertyCatalog"
ref="visualPropertyCatalogRef"></property>
- </bean>
-
</beans>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/osgi.bnd
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/osgi.bnd
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/osgi.bnd
2009-03-12 07:43:52 UTC (rev 16211)
@@ -3,6 +3,5 @@
#-----------------------------------------------------------------
Spring-Context: META-INF/spring/*.xml
-Private-Package:
${bundle.symbolicName}.internal,${bundle.symbolicName}.events.internal
-Export-Package: ${bundle.symbolicName},${bundle.symbolicName}.events,
+Private-Package:
${bundle.namespace}.internal,${bundle.namespace}.events.internal
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/pom.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/pom.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/pom.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
- <artifactId>vizmap</artifactId>
+ <artifactId>vizmap-impl</artifactId>
<version>1.0-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
@@ -104,15 +104,20 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>model</artifactId>
+ <artifactId>model-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>viewmodel</artifactId>
+ <artifactId>viewmodel-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>vizmap-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
<version>1.0</version>
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:10:32 UTC (rev 16210)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/vizmap-impl-columns/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-12 07:43:52 UTC (rev 16211)
@@ -14,6 +14,6 @@
</osgi:reference>
<osgi:reference id="visualPropertyCatalogRef"
- interface="org.cytoscape.viewmodel.VisualPropertyCatalog">
+ interface="org.cytoscape.view.model.VisualPropertyCatalog">
</osgi:reference>
</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
-~----------~----~----~----~------~----~------~--~---
