Author: kono
Date: 2011-08-11 18:37:56 -0700 (Thu, 11 Aug 2011)
New Revision: 26540
Modified:
core3/api/trunk/core-task-api/pom.xml
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
core3/api/trunk/pom.xml
core3/gui-distribution/trunk/pom.xml
core3/gui-distribution/trunk/startlevel-3/pom.xml
core3/impl/trunk/pom.xml
Log:
Other bundles had been refactored to use new application-api.
Modified: core3/api/trunk/core-task-api/pom.xml
===================================================================
--- core3/api/trunk/core-task-api/pom.xml 2011-08-12 01:37:18 UTC (rev
26539)
+++ core3/api/trunk/core-task-api/pom.xml 2011-08-12 01:37:56 UTC (rev
26540)
@@ -13,7 +13,6 @@
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
<name>${bundle.symbolicName}</name>
@@ -111,6 +110,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>application-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
2011-08-12 01:37:18 UTC (rev 26539)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/MapNetworkAttrTask.java
2011-08-12 01:37:56 UTC (rev 26540)
@@ -5,13 +5,13 @@
import java.util.List;
import java.util.Set;
+import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
Modified:
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
===================================================================
---
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-08-12 01:37:18 UTC (rev 26539)
+++
core3/api/trunk/plugin-api/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-08-12 01:37:56 UTC (rev 26540)
@@ -2,6 +2,7 @@
import java.util.Properties;
+import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.read.CyNetworkReaderManager;
@@ -19,7 +20,6 @@
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.property.CyProperty;
import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
Modified: core3/api/trunk/pom.xml
===================================================================
--- core3/api/trunk/pom.xml 2011-08-12 01:37:18 UTC (rev 26539)
+++ core3/api/trunk/pom.xml 2011-08-12 01:37:56 UTC (rev 26540)
@@ -1,7 +1,5 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -39,6 +37,7 @@
<module>service-api</module>
<module>swing-util-api</module>
<module>work-spring-api</module>
+ <module>application-api</module>
</modules>
<dependencyManagement>
@@ -72,4 +71,4 @@
<url>${scm.url.root}/api/trunk</url>
</scm>
-</project>
+</project>
\ No newline at end of file
Modified: core3/gui-distribution/trunk/pom.xml
===================================================================
--- core3/gui-distribution/trunk/pom.xml 2011-08-12 01:37:18 UTC (rev
26539)
+++ core3/gui-distribution/trunk/pom.xml 2011-08-12 01:37:56 UTC (rev
26540)
@@ -8,7 +8,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>gui-distribution</artifactId>
<version>3.0.0-M3-SNAPSHOT</version>
Modified: core3/gui-distribution/trunk/startlevel-3/pom.xml
===================================================================
--- core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-08-12 01:37:18 UTC
(rev 26539)
+++ core3/gui-distribution/trunk/startlevel-3/pom.xml 2011-08-12 01:37:56 UTC
(rev 26540)
@@ -210,6 +210,12 @@
<artifactId>webservice-api</artifactId>
<version>${cytoscape.api.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>application-api</artifactId>
+ <version>${cytoscape.api.version}</version>
+ </dependency>
<!-- Cytoscape Implementation Bundles -->
<dependency>
@@ -342,6 +348,12 @@
<artifactId>presentation-impl</artifactId>
<version>${cytoscape.impl.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>application-impl</artifactId>
+ <version>${cytoscape.impl.version}</version>
+ </dependency>
<!-- Other dependencies -->
<dependency>
Modified: core3/impl/trunk/pom.xml
===================================================================
--- core3/impl/trunk/pom.xml 2011-08-12 01:37:18 UTC (rev 26539)
+++ core3/impl/trunk/pom.xml 2011-08-12 01:37:56 UTC (rev 26540)
@@ -1,7 +1,5 @@
-<project
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
@@ -57,7 +55,8 @@
<module>webservice-ncbi-client-impl</module>
<!-- <module>work-headless-impl</module> -->
<module>work-swing-impl</module>
- </modules>
+ <module>application-impl</module>
+ </modules>
<properties>
<cytoscape.api.version>3.0.0-alpha6-SNAPSHOT</cytoscape.api.version>
@@ -78,6 +77,11 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
+ <artifactId>application-api</artifactId>
+ <version>${cytoscape.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
<version>${cytoscape.api.version}</version>
</dependency>
@@ -275,7 +279,7 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore />
+
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -286,4 +290,4 @@
</pluginManagement>
</build>
-</project>
+</project>
\ No newline at end of file
--
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.
