More poms
diff --git a/taverna-workbench-activity-palette-impl/pom.xml b/taverna-workbench-activity-palette-impl/pom.xml
index 6feab09..ef85913 100644
--- a/taverna-workbench-activity-palette-impl/pom.xml
+++ b/taverna-workbench-activity-palette-impl/pom.xml
@@ -23,72 +23,75 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-palette-impl</artifactId>
+ <artifactId>taverna-activity-palette-impl</artifactId>
<packaging>bundle</packaging>
- <name>Activity Palette Impl</name>
- <description>Activity Palette Implementation</description>
+ <name>Apache Taverna Activity Palette Impl</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
</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>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>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>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
+ <version>${commons.beanutils.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<!-- TODO Remove non-test impl 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>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/taverna-workbench-activity-palette-ui/pom.xml b/taverna-workbench-activity-palette-ui/pom.xml
index 23d6fff..84d8d66 100644
--- a/taverna-workbench-activity-palette-ui/pom.xml
+++ b/taverna-workbench-activity-palette-ui/pom.xml
@@ -23,54 +23,54 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-palette-ui</artifactId>
+ <artifactId>taverna-activity-palette-ui</artifactId>
<packaging>bundle</packaging>
- <name>Activity Palette UI Component</name>
- <description>Activity Palette UI</description>
+ <name>Apache Taverna Activity Palette UI Component</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-icons-api</artifactId>
+ <artifactId>taverna-activity-icons-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-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>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>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-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>net.sf.taverna.t2.lang</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>uibuilder</artifactId>
- <version>${t2.lang.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-services-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
diff --git a/taverna-workbench-activity-tools/pom.xml b/taverna-workbench-activity-tools/pom.xml
index 9132ae1..53619a4 100644
--- a/taverna-workbench-activity-tools/pom.xml
+++ b/taverna-workbench-activity-tools/pom.xml
@@ -23,24 +23,24 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-tools</artifactId>
+ <artifactId>taverna-activity-tools</artifactId>
<packaging>bundle</packaging>
- <name>Activity tools</name>
- <description>Tools useful for ui-activitys</description>
+ <name>Apache Taverna Activity tools</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>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/taverna-workbench-configuration-api/pom.xml b/taverna-workbench-configuration-api/pom.xml
index c5d9a62..83ca7eb 100644
--- a/taverna-workbench-configuration-api/pom.xml
+++ b/taverna-workbench-configuration-api/pom.xml
@@ -23,15 +23,15 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>configuration-api</artifactId>
+ <artifactId>taverna-configuration-ui-api</artifactId>
<packaging>bundle</packaging>
- <name>Configuration Management API</name>
- <description>General configuration management</description>
+ <name>Apache Taverna Configuration Management UI API</name>
<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>
</dependencies>
</project>
diff --git a/taverna-workbench-configuration-impl/pom.xml b/taverna-workbench-configuration-impl/pom.xml
index 3665c8c..56b57df 100644
--- a/taverna-workbench-configuration-impl/pom.xml
+++ b/taverna-workbench-configuration-impl/pom.xml
@@ -23,53 +23,52 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>configuration-impl</artifactId>
+ <artifactId>taverna-configuration-ui-impl</artifactId>
<packaging>bundle</packaging>
- <name>Configuration Management Implementations</name>
- <description>General configuration management</description>
-
+ <name>Apache Taverna Configuration Management UI Impl</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>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>configuration-api</artifactId>
+ <artifactId>taverna-configuration-ui-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>
<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>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-impl</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
