Author: abeld
Date: 2009-03-07 10:29:05 -0800 (Sat, 07 Mar 2009)
New Revision: 16167
Added:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/view/
Removed:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/java/org/cytoscape/viewmodel/internal/
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context.xml
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
Log:
refactored-viewmodel: preparing viewmodel for merge to core3: dividing into
-api and -impl, step one
Copied: cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api
(from rev 16165,
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel)
Property changes on:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api
___________________________________________________________________
Name: svn:mergeinfo
+
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
===================================================================
--- cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel/osgi.bnd
2009-03-07 03:10:48 UTC (rev 16165)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/osgi.bnd
2009-03-07 18:29:05 UTC (rev 16167)
@@ -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,
Modified:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
===================================================================
--- cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel/pom.xml
2009-03-07 03:10:48 UTC (rev 16165)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/pom.xml
2009-03-07 18:29:05 UTC (rev 16167)
@@ -14,7 +14,7 @@
<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>
Deleted:
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-07 03:10:48 UTC (rev 16165)
+++
cytoscape3/branches/abeld-gsoc/dev/refactored-viewmodel/viewmodel-api/src/main/resources/META-INF/spring/bundle-context.xml
2009-03-07 18:29:05 UTC (rev 16167)
@@ -1,27 +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";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
-
- <!-- 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="cyNetworkViewFactory"
class="org.cytoscape.viewmodel.internal.RowOrientedNetworkViewFactoryImpl">
- <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>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
