You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/03/20 22:33:07 UTC
incubator-taverna-workbench git commit: org.apache.taverna poms
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 52fd79dd4 -> 6af0f543d
org.apache.taverna poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/6af0f543
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/6af0f543
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/6af0f543
Branch: refs/heads/master
Commit: 6af0f543d1e30f298ce1e2394f9002ff71dd3532
Parents: 52fd79d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Mar 20 17:12:23 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Mar 20 21:33:01 2015 +0000
----------------------------------------------------------------------
taverna-helper-api/pom.xml | 17 ++++--
taverna-httpproxy-config/pom.xml | 16 +++---
taverna-iteration-strategy-ui/pom.xml | 30 ++++------
taverna-loop-ui/pom.xml | 28 +++++-----
taverna-menu-api/pom.xml | 9 +--
taverna-menu-impl/pom.xml | 28 ++++------
taverna-menu-items/pom.xml | 34 +++++------
taverna-monitor-view/pom.xml | 29 ++++------
taverna-parallelize-ui/pom.xml | 12 ++--
.../LocalTestLauncher.bat | 14 -----
.../log4j.properties | 4 --
taverna-perspective-biocatalogue/pom.xml | 39 +++++++------
taverna-perspective-design/pom.xml | 34 +++++------
taverna-perspective-myexperiment/pom.xml | 59 +++++++-------------
taverna-plugin-manager/pom.xml | 20 +++----
taverna-plugins-gui/pom.xml | 24 ++++----
taverna-reference-ui/pom.xml | 28 ++++++----
taverna-renderers-api/pom.xml | 8 +--
taverna-renderers-exts/pom.xml | 23 ++++----
taverna-renderers-impl/pom.xml | 20 +++----
taverna-report-api/pom.xml | 37 +++---------
taverna-report-explainer/pom.xml | 41 +++++++-------
taverna-report-impl/pom.xml | 20 +++----
taverna-report-view/pom.xml | 42 +++++++-------
taverna-results-view/pom.xml | 4 +-
taverna-run-ui/pom.xml | 2 +-
taverna-selection-api/pom.xml | 33 +++--------
27 files changed, 279 insertions(+), 376 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-helper-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-helper-api/pom.xml b/taverna-helper-api/pom.xml
index 4b40e30..8ff4776 100644
--- a/taverna-helper-api/pom.xml
+++ b/taverna-helper-api/pom.xml
@@ -23,9 +23,9 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<packaging>bundle</packaging>
- <name>Help System</name>
+ <name>Apache Taverna Help System</name>
<build>
<plugins>
<plugin>
@@ -43,31 +43,36 @@
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>taverna-workbench-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
+ <version>${javahelp.version}</version>
<scope>provided</scope>
</dependency>
<!-- Required by javahelp -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>com.springsource.javax.servlet</artifactId>
+ <version>${javax.servlet.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+ <version>${javax.servlet.jsp.version}</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>com.springsource.javax.el</artifactId>
+ <version>${javax.el.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-httpproxy-config/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-httpproxy-config/pom.xml b/taverna-httpproxy-config/pom.xml
index 9513f1c..833866e 100644
--- a/taverna-httpproxy-config/pom.xml
+++ b/taverna-httpproxy-config/pom.xml
@@ -24,22 +24,22 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>httpproxy-config</artifactId>
- <packaging>bundle</packaging>
- <name>HTTP Proxy configuration</name>
+ <packaging>taverna-bundle</packaging>
+ <name>Apache Taverna HTTP Proxy configuration</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
- <artifactId>taverna-configuration-api</artifactId>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-osgi-api</artifactId>
<version>${taverna.configuration.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-iteration-strategy-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-iteration-strategy-ui/pom.xml b/taverna-iteration-strategy-ui/pom.xml
index ce47f16..7766ba1 100644
--- a/taverna-iteration-strategy-ui/pom.xml
+++ b/taverna-iteration-strategy-ui/pom.xml
@@ -23,55 +23,49 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>iteration-strategy-ui</artifactId>
+ <artifactId>taverna-iteration-strategy-ui</artifactId>
<packaging>bundle</packaging>
- <name>Menu generation API</name>
- <description>An SPI system for building UI menues</description>
+ <name>Apache Taverna Iteration Strategy UI</name>
<dependencies>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-api</artifactId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
+ <artifactId>taverna-contextual-views-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-impl</artifactId>
+ <artifactId>taverna-workflowmodel-impl</artifactId>
<version>${taverna.engine.version}</version>
<!-- <scope>test</scope> -->
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-loop-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-loop-ui/pom.xml b/taverna-loop-ui/pom.xml
index 36130b4..edcc6f2 100644
--- a/taverna-loop-ui/pom.xml
+++ b/taverna-loop-ui/pom.xml
@@ -23,60 +23,60 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>loop-ui</artifactId>
+ <artifactId>taverna-loop-ui</artifactId>
<packaging>bundle</packaging>
- <name>Loop layer contextual view</name>
+ <name>Apache Taverna Loop layer contextual view</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
+ <artifactId>taverna-contextual-views-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
-
-
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <!--
<dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <groupId>org.apache.taverna.workbench.commonactivities</groupId>
<artifactId>beanshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>${taverna.workbench.commonactivities.version}</version>
</dependency>
+ -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-impl</artifactId>
+ <artifactId>taverna-edits-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-impl</artifactId>
+ <artifactId>taverna-file-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-impl</artifactId>
+ <artifactId>taverna-contextual-views-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-impl</artifactId>
+ <artifactId>taverna-selection-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-menu-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-menu-api/pom.xml b/taverna-menu-api/pom.xml
index ad0e3d5..acd361b 100644
--- a/taverna-menu-api/pom.xml
+++ b/taverna-menu-api/pom.xml
@@ -23,21 +23,22 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<packaging>bundle</packaging>
- <name>Menu generation API</name>
+ <name>Apache Taverna Menu generation API</name>
<description>An SPI system for building UI menus</description>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
+ <artifactId>taverna-selection-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-menu-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-menu-impl/pom.xml b/taverna-menu-impl/pom.xml
index b9898ed..731c54d 100644
--- a/taverna-menu-impl/pom.xml
+++ b/taverna-menu-impl/pom.xml
@@ -23,10 +23,9 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>menu-impl</artifactId>
+ <artifactId>taverna-menu-impl</artifactId>
<packaging>bundle</packaging>
- <name>Menu generation implementation</name>
- <description>The main workbench ui</description>
+ <name>Apache Taverna Menu generation impl</name>
<build>
<plugins>
<plugin>
@@ -44,39 +43,34 @@
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <version>${javahelp.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-menu-items/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-menu-items/pom.xml b/taverna-menu-items/pom.xml
index 07566e2..093aff6 100644
--- a/taverna-menu-items/pom.xml
+++ b/taverna-menu-items/pom.xml
@@ -23,65 +23,65 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>menu-items</artifactId>
+ <artifactId>taverna-menu-items</artifactId>
<packaging>bundle</packaging>
- <name>Additional menu items</name>
+ <name>Apache Taverna menu items</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
+ <artifactId>taverna-selection-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>design-ui</artifactId>
+ <artifactId>taverna-design-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-view</artifactId>
+ <artifactId>taverna-graph-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<!-- TODO remove dependencies on implementations -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-impl</artifactId>
+ <artifactId>taverna-contextual-views-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-monitor-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-monitor-view/pom.xml b/taverna-monitor-view/pom.xml
index 962367f..ecbf602 100644
--- a/taverna-monitor-view/pom.xml
+++ b/taverna-monitor-view/pom.xml
@@ -23,44 +23,44 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>monitor-view</artifactId>
+ <artifactId>taverna-monitor-view</artifactId>
<packaging>bundle</packaging>
- <name>Monitor View</name>
+ <name>Apache Taverna Monitor View</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-model</artifactId>
+ <artifactId>taverna-graph-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>results-view</artifactId>
+ <artifactId>taverna-results-view</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-view</artifactId>
+ <artifactId>taverna-graph-view</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-report-api</artifactId>
- <version>${platform.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-run-api</artifactId>
- <version>${platform.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
@@ -71,12 +71,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-parallelize-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-parallelize-ui/pom.xml b/taverna-parallelize-ui/pom.xml
index e74c474..1ce4e6d 100644
--- a/taverna-parallelize-ui/pom.xml
+++ b/taverna-parallelize-ui/pom.xml
@@ -23,28 +23,28 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>parallelize-ui</artifactId>
+ <artifactId>taverna-parallelize-ui</artifactId>
<packaging>bundle</packaging>
- <name>Parallelize layer contextual view</name>
+ <name>Apache Taverna Parallelize layer contextual view</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
+ <artifactId>taverna-contextual-views-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
+ <artifactId>taverna-selection-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-perspective-biocatalogue/LocalTestLauncher.bat
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/LocalTestLauncher.bat b/taverna-perspective-biocatalogue/LocalTestLauncher.bat
deleted file mode 100644
index 1c7f299..0000000
--- a/taverna-perspective-biocatalogue/LocalTestLauncher.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo.
-del biocatalogue-perspective-local-launch.jar
-echo Deleted old JAR file if it was there.
-cd target\classes
-jar cfM ..\..\biocatalogue-perspective-local-launch.jar *.*
-cd ..\..
-echo JAR assembly done, launching app...
-
-java -cp .;.\biocatalogue-perspective-local-launch.jar;c:/Users/Sergey/.m2/repository/net/sf/taverna/t2/workbench/ui-api/0.2/ui-api-0.2.jar;c:\Users\Sergey\.m2\repository\net\sf\taverna\t2\lang\ui\1.0\ui-1.0.jar;c:\Users\Sergey\.m2\repository\net\sf\taverna\t2\ui-components\workflow-view\1.0\workflow-view-1.0.jar;c:\Users\Sergey\.m2\repository\net\sf\taverna\t2\ui-activities\wsdl-activity-ui\0.7\wsdl-activity-ui-0.7.jar;C:\Users\Sergey\.m2\repository\log4j\log4j\1.2.13\log4j-1.2.13.jar;C:\Users\Sergey\.m2\repository\net\sf\taverna\t2\workbench\commons-icons\0.2\commons-icons-0.2.jar;c:\Users\Sergey\.m2\repository\BrowserLauncher2\BrowserLauncher2\1.3\BrowserLauncher2-1.3.jar;C:\Users\Sergey\.m2\repository\jdom\jdom\1.0\jdom-1.0.jar;"c:\Program Files\Java\xmlbeans-2.4.0\lib\xbean.jar";"c:\Program Files\Java\xmlbeans-2.4.0\lib\jsr173_1.0_api.jar";.\lib\lablib-checkboxtree-3.1.jar;.\lib\core-renderer.jar;.\lib\commons-lang-2.4.jar net.sf.taverna.t2.ui.perspectives.biocatalogue.TestJFra
meForLocalLaunch
-
-del biocatalogue-perspective-local-launch.jar
-echo Cleanup done - deleted old the JAR file that was used for the current launch.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-perspective-biocatalogue/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/log4j.properties b/taverna-perspective-biocatalogue/log4j.properties
deleted file mode 100644
index fcd1d0c..0000000
--- a/taverna-perspective-biocatalogue/log4j.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-log4j.rootLogger=DEBUG, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-perspective-biocatalogue/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-biocatalogue/pom.xml b/taverna-perspective-biocatalogue/pom.xml
index 4188449..c5f556d 100644
--- a/taverna-perspective-biocatalogue/pom.xml
+++ b/taverna-perspective-biocatalogue/pom.xml
@@ -23,10 +23,11 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>perspective-biocatalogue</artifactId>
- <name>BioCatalogue Perspective</name>
+ <artifactId>taverna-perspective-biocatalogue</artifactId>
+ <name>Apache Taverna BioCatalogue Perspective</name>
<repositories>
<repository>
+ <!-- FIXME: Avoid this repository -->
<releases />
<snapshots>
<enabled>false</enabled>
@@ -42,53 +43,53 @@
<version>${project.parent.version}</version> </dependency> -->
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-impl</artifactId>
+ <artifactId>taverna-workflowmodel-impl</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<!-- required for providing contextual views in the bottom-left area of
Design perspective -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
+ <artifactId>taverna-contextual-views-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- required for inserting a SOAP processor into the current workflow -->
<dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>wsdl-activity-ui</artifactId>
+ <groupId>org.apache.taverna.workbench.commonactivities</groupId>
+ <artifactId>taverna-wsdl-activity-ui</artifactId>
<version>${t2.ui.activities.version}</version>
</dependency>
<!-- required for importing REST processors into the current workflow -->
<dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>rest-activity-ui</artifactId>
+ <groupId>org.apache.taverna.workbench.commonactivities</groupId>
+ <artifactId>taverna-rest-activity-ui</artifactId>
<version>${t2.ui.activities.version}</version>
</dependency>
<!-- required for inserting a processor into the current workflow -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- required registering with and opening help window -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper</artifactId>
+ <artifactId>taverna-helper</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -103,13 +104,14 @@
<version>${jdom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.5.0</version>
+ <version>${xmlbeans.version}</version>
</dependency>
<!-- FlyingSaucer XHTML Renderer -->
@@ -175,4 +177,5 @@
</plugin>
</plugins>
</build>
+ <packaging>bundle</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-perspective-design/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-design/pom.xml b/taverna-perspective-design/pom.xml
index 627c52c..f7aa365 100644
--- a/taverna-perspective-design/pom.xml
+++ b/taverna-perspective-design/pom.xml
@@ -23,64 +23,64 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>perspective-design</artifactId>
+ <artifactId>taverna-perspective-design</artifactId>
<packaging>bundle</packaging>
- <name>Design perspective</name>
+ <name>Apache Taverna Design perspective</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>selection-api</artifactId>
+ <artifactId>taverna-selection-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-ui</artifactId>
+ <artifactId>taverna-activity-palette-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-view</artifactId>
+ <artifactId>taverna-graph-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-explorer</artifactId>
+ <artifactId>taverna-workflow-explorer</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- <dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-view</artifactId>
+ <artifactId>taverna-report-view</artifactId>
<version>${project.parent.version}</version>
</dependency> -->
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -90,9 +90,9 @@
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-perspective-myexperiment/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-myexperiment/pom.xml b/taverna-perspective-myexperiment/pom.xml
index 82dded6..11c66f7 100644
--- a/taverna-perspective-myexperiment/pom.xml
+++ b/taverna-perspective-myexperiment/pom.xml
@@ -23,68 +23,45 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>perspective-myexperiment</artifactId>
- <name>myExperiment perspective</name>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>
- http://www.mygrid.org.uk/maven/snapshot-repository
- </url>
- </repository>
-
- </repositories>
+ <artifactId>taverna-perspective-myexperiment</artifactId>
+ <name>Apache Taverna myExperiment perspective</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>dataflow-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-dataflow-activity-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
@@ -93,8 +70,10 @@
<version>${jdom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
+ <packaging>bundle</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-plugin-manager/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-plugin-manager/pom.xml b/taverna-plugin-manager/pom.xml
index dc996d1..61869d9 100644
--- a/taverna-plugin-manager/pom.xml
+++ b/taverna-plugin-manager/pom.xml
@@ -23,24 +23,24 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>plugin-manager</artifactId>
+ <artifactId>taverna-plugin-manager</artifactId>
<packaging>bundle</packaging>
- <name>Taverna Workbench Plugin Manager</name>
+ <name>Apache Taverna Workbench Plugin Manager</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-plugin-api</artifactId>
- <version> ${taverna.commons.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
@@ -50,15 +50,15 @@
</dependency>
<!-- <dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-download-impl</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-plugin-impl</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency> -->
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-plugins-gui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/pom.xml b/taverna-plugins-gui/pom.xml
index d3eca15..b12ff2f 100644
--- a/taverna-plugins-gui/pom.xml
+++ b/taverna-plugins-gui/pom.xml
@@ -23,40 +23,36 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>plugins-gui</artifactId>
- <name>Raven plugin manager GUI</name>
+ <artifactId>taverna-plugins-gui</artifactId>
+ <name>Apache Taverna Plugin manager GUI</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-plugin-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons.io.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
+ <packaging>bundle</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-reference-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-reference-ui/pom.xml b/taverna-reference-ui/pom.xml
index 3d54f71..733af15 100644
--- a/taverna-reference-ui/pom.xml
+++ b/taverna-reference-ui/pom.xml
@@ -23,9 +23,9 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>reference-ui</artifactId>
+ <artifactId>taverna-reference-ui</artifactId>
<packaging>bundle</packaging>
- <name>T2 reference manager user interface</name>
+ <name>Apache Taverna reference manager user interface</name>
<description>
UI Support for the T2Reference system, including support for
construction and registration of new entities through a UI
@@ -35,47 +35,51 @@
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-view</artifactId>
+ <artifactId>taverna-graph-view</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-view</artifactId>
+ <artifactId>taverna-report-view</artifactId>
<version>${project.version}</version>
</dependency> -->
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>net.sf.taverna.t2</groupId>
<artifactId>baclava</artifactId>
<version>${t2.baclava.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-run-api</artifactId>
- <version>${platform.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
- <artifactId>databundle</artifactId>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-renderers-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-api/pom.xml b/taverna-renderers-api/pom.xml
index 43dd94e..0ad2c0d 100644
--- a/taverna-renderers-api/pom.xml
+++ b/taverna-renderers-api/pom.xml
@@ -23,14 +23,14 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>renderers-api</artifactId>
+ <artifactId>taverna-renderers-api</artifactId>
<packaging>bundle</packaging>
- <name>Renderers API</name>
+ <name>Apache Taverna Renderers API</name>
<dependencies>
<dependency>
<groupId>org.apache.taverna.language</groupId>
- <artifactId>databundle</artifactId>
- <version>${taverna.databundle.version}</version>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-renderers-exts/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-exts/pom.xml b/taverna-renderers-exts/pom.xml
index 373d4d5..64f5523 100644
--- a/taverna-renderers-exts/pom.xml
+++ b/taverna-renderers-exts/pom.xml
@@ -23,24 +23,25 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>renderers-exts</artifactId>
- <name>Renderers extensions</name>
+ <artifactId>taverna-renderers-exts</artifactId>
+ <name>Apache Taverna Renderers extensions</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>renderers-api</artifactId>
+ <artifactId>taverna-renderers-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-impl</artifactId>
+ <artifactId>taverna-workbench-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>databundle</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${taverna.language.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>uk.org.mygrid.resources</groupId>
<artifactId>Jmol</artifactId>
@@ -51,6 +52,7 @@
<artifactId>seqvista-hacked</artifactId>
<version>NO-VERSION</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-swing</artifactId>
@@ -61,17 +63,12 @@
<artifactId>com.springsource.org.apache.commons.io</artifactId>
<version>${commons.io.version}</version>
</dependency>
+
<dependency>
<groupId>org.icepdf</groupId>
<artifactId>icepdf-viewer</artifactId>
- <!-- <version>${org.icepdf.version}</version> -->
- <version>4.1.1-taverna</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <version>${org.icepdf.version}</version>
</dependency>
</dependencies>
+ <packaging>bundle</packaging>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-renderers-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-impl/pom.xml b/taverna-renderers-impl/pom.xml
index 89e1d8c..e7fc672 100644
--- a/taverna-renderers-impl/pom.xml
+++ b/taverna-renderers-impl/pom.xml
@@ -43,38 +43,36 @@
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>renderers-api</artifactId>
+ <artifactId>taverna-renderers-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
- <artifactId>databundle</artifactId>
+ <artifactId>taverna-databundle</artifactId>
<version>${taverna.databundle.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<dependency>
<groupId>org.fife.ui.hex</groupId>
<artifactId>hexeditor</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${org.fife.ui.hexeditor.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-report-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-api/pom.xml b/taverna-report-api/pom.xml
index d32e8b4..5eb5126 100644
--- a/taverna-report-api/pom.xml
+++ b/taverna-report-api/pom.xml
@@ -23,52 +23,31 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<packaging>bundle</packaging>
- <name>Reporting API</name>
+ <name>Apache Taverna Reporting API</name>
<description>
API for creating reports about dataflows in the workbench.
</description>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>taverna-scufl2-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository
- </url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- </repositories>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-report-explainer/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-explainer/pom.xml b/taverna-report-explainer/pom.xml
index 9ca8d50..2b42d4f 100644
--- a/taverna-report-explainer/pom.xml
+++ b/taverna-report-explainer/pom.xml
@@ -23,26 +23,26 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>report-explainer</artifactId>
+ <artifactId>taverna-report-explainer</artifactId>
<packaging>bundle</packaging>
- <name>Report explainer</name>
+ <name>Apache Taverna Report explainer</name>
<description>
Explanations of reports
</description>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>retry-ui</artifactId>
+ <artifactId>>taverna-retry-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>dataflow-activity-ui</artifactId>
+ <artifactId>>taverna-dataflow-activity-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -50,6 +50,7 @@
<artifactId>taverna-disabled-activity-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <!-- FIXME: Why are these needed here? -->
<dependency>
<groupId>org.apache.taverna.commonactivities</groupId>
<artifactId>taverna-wsdl-activity</artifactId>
@@ -60,54 +61,52 @@
<artifactId>taverna-dataflow-activity</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-api</artifactId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>configuration-impl</artifactId>
+ <artifactId>taverna-configuration-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-view</artifactId>
+ <artifactId>taverna-report-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>design-ui</artifactId>
+ <artifactId>taverna-design-ui</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
+ <!-- FIXME: why is this needed? -->
<groupId>org.apache.taverna.engine</groupId>
<artifactId>workflowmodel-impl</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>BrowserLauncher2</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-report-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-impl/pom.xml b/taverna-report-impl/pom.xml
index d0c6c16..5ad5269 100644
--- a/taverna-report-impl/pom.xml
+++ b/taverna-report-impl/pom.xml
@@ -23,9 +23,9 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>report-impl</artifactId>
+ <artifactId>taverna-report-impl</artifactId>
<packaging>bundle</packaging>
- <name>Reporting Implementation</name>
+ <name>Apache Taverna Reporting Implementation</name>
<dependencies>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
@@ -34,23 +34,23 @@
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>taverna-report-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>taverna-file-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>taverna-edits-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-report-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-report-view/pom.xml b/taverna-report-view/pom.xml
index febf81c..a0b47f0 100644
--- a/taverna-report-view/pom.xml
+++ b/taverna-report-view/pom.xml
@@ -23,78 +23,74 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>report-view</artifactId>
+ <artifactId>taverna-report-view</artifactId>
<packaging>bundle</packaging>
- <name>Reporting view</name>
+ <name>Apache Taverna Reporting view</name>
<description>
View of reports about dataflows in the workbench.
</description>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
- <version>${t2.lang.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- <dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-impl</artifactId>
+ <artifactId>taverna-workbench-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
--> <dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>configuration-api</artifactId>
+ <artifactId>taverna-configuration-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-results-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-results-view/pom.xml b/taverna-results-view/pom.xml
index c0aa290..a5c4f0f 100644
--- a/taverna-results-view/pom.xml
+++ b/taverna-results-view/pom.xml
@@ -23,9 +23,9 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>results-view</artifactId>
+ <artifactId>taverna-results-view</artifactId>
<packaging>bundle</packaging>
- <name>Results and outputs from a workflow run</name>
+ <name>Apache Taverna Results and outputs from a workflow run</name>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-run-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-run-ui/pom.xml b/taverna-run-ui/pom.xml
index a71b48a..44a6aee 100644
--- a/taverna-run-ui/pom.xml
+++ b/taverna-run-ui/pom.xml
@@ -23,7 +23,7 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>run-ui</artifactId>
+ <artifactId>taverna-run-ui</artifactId>
<packaging>bundle</packaging>
<name>Results UI</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6af0f543/taverna-selection-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-selection-api/pom.xml b/taverna-selection-api/pom.xml
index e2e3492..5c31efd 100644
--- a/taverna-selection-api/pom.xml
+++ b/taverna-selection-api/pom.xml
@@ -23,47 +23,28 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>selection-api</artifactId>
+ <artifactId>taverna-selection-api</artifactId>
<packaging>bundle</packaging>
- <name>Selection API</name>
+ <name>Apache Taverna Selection API</name>
<description>API for handling selection in the workbench.</description>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>taverna-workbench-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository
- </url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- </repositories>
</project>
\ No newline at end of file