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 2016/04/28 00:56:03 UTC

[15/26] incubator-taverna-engine git commit: Moved taverna-platform-integration-tests to branch

Moved taverna-platform-integration-tests to branch

as it has not been updated and relies on .t2flow files we have not
yet checked provenance of


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/4f01028b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/4f01028b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/4f01028b

Branch: refs/heads/master
Commit: 4f01028b1e8fed441132dd3ecefe615360492aac
Parents: e68dd99
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Apr 27 23:46:42 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Apr 27 23:46:42 2016 +0100

----------------------------------------------------------------------
 taverna-platform-integration-tests/pom.xml      | 656 ------------
 .../org/apache/taverna/platform/ActivityIT.java |  66 --
 .../taverna/platform/CommandLineToolIT.java     |  86 --
 .../apache/taverna/platform/ExecutionIT.java    | 126 ---
 .../taverna/platform/LocalExecutionIT.java      | 115 ---
 .../taverna/platform/OSGIFrameworkIT.java       |  90 --
 .../org/apache/taverna/platform/PlatformIT.java | 373 -------
 .../java/org/apache/taverna/platform/RunIT.java | 998 -------------------
 .../apache/taverna/platform/RunParallelIT.java  |  91 --
 .../apache/taverna/platform/RunWorkflowsIT.java | 132 ---
 .../src/test/resources/log4j.properties         |  11 -
 .../security/tomcat_heater_certificate.pem      |  20 -
 .../t2flow/FetchTodaysXkcdComic.t2flow          | 343 -------
 .../src/test/resources/t2flow/GBSeqTest.t2flow  | 518 ----------
 .../test/resources/t2flow/apiconsumer.t2flow    | 178 ----
 .../src/test/resources/t2flow/beanshell.t2flow  | 137 ---
 .../src/test/resources/t2flow/biomart.t2flow    |  30 -
 .../src/test/resources/t2flow/dataflow.t2flow   | 217 ----
 .../src/test/resources/t2flow/in-out.t2flow     |  23 -
 .../src/test/resources/t2flow/input.txt         |   1 -
 .../src/test/resources/t2flow/iteration.t2flow  | 474 ---------
 .../test/resources/t2flow/localworker.t2flow    |  67 --
 .../src/test/resources/t2flow/rest.t2flow       | 154 ---
 .../secure-basic-authentication-https.t2flow    |  74 --
 .../t2flow/secure-basic-authentication.t2flow   |  74 --
 .../secure-digest-authentication-https.t2flow   | 107 --
 .../t2flow/secure-digest-authentication.t2flow  | 129 ---
 .../resources/t2flow/secure-ws-https.t2flow     | 180 ----
 .../src/test/resources/t2flow/secure-ws.t2flow  | 180 ----
 .../src/test/resources/t2flow/soaplab.t2flow    |  84 --
 .../resources/t2flow/spreadsheetimport.t2flow   | 646 ------------
 .../test/resources/t2flow/stringconstant.t2flow |  32 -
 .../src/test/resources/t2flow/tool.t2flow       | 158 ---
 .../test/resources/t2flow/wsdl-secure.t2flow    | 131 ---
 .../src/test/resources/t2flow/wsdl.t2flow       |  22 -
 .../test/resources/t2flow/xmlSplitter.t2flow    | 339 -------
 .../src/test/resources/t2flow/xpath.t2flow      | 127 ---
 37 files changed, 7189 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/pom.xml b/taverna-platform-integration-tests/pom.xml
deleted file mode 100644
index 3e448a0..0000000
--- a/taverna-platform-integration-tests/pom.xml
+++ /dev/null
@@ -1,656 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.taverna.engine</groupId>
-		<artifactId>apache-taverna-engine</artifactId>
-		<version>3.1.0-incubating-SNAPSHOT</version>
-	</parent>
-	<artifactId>taverna-integration-tests</artifactId>
-	<name>Apache Taverna Platform integration tests</name>
-	<properties>
-		<spring.dm.version>2.0.0.M1</spring.dm.version>
-		<spring.version>3.0.0.RC1</spring.version>
-	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<forkMode>pertest</forkMode>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>generate-test-resources</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<!-- xerces and xalan are required for the tests but the test framework -->
-								<!-- fails to run if they are put on the test classpath by maven -->
-								<!-- This ensures they are pulled into the local repository -->
-								<artifactItem>
-									<groupId>org.apache.xalan</groupId>
-									<artifactId>com.springsource.org.apache.xalan</artifactId>
-									<version>2.7.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.xerces</groupId>
-									<artifactId>com.springsource.org.apache.xerces</artifactId>
-									<version>2.9.1</version>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}/tmp</outputDirectory>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- Spring OSGI testing framework -->
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-test</artifactId>
-			<version>${spring.dm.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-annotation</artifactId>
-			<version>${spring.dm.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-core</artifactId>
-			<version>${spring.dm.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-extender</artifactId>
-			<version>${spring.dm.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.aop</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.asm</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.beans</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.context</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.core</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jdbc</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.orm</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.transaction</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>com.springsource.org.apache.derby</artifactId>
-			<version>10.5.1000001.764942</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>com.springsource.org.apache.derby.client</artifactId>
-			<version>10.5.1000001.764942</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>com.springsource.org.apache.derby.drda</artifactId>
-			<version>10.5.1000001.764942</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aopalliance</groupId>
-			<artifactId>com.springsource.org.aopalliance</artifactId>
-			<version>1.0.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>com.springsource.org.aspectj.runtime</artifactId>
-			<version>1.6.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
-			<version>1.6.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.objectweb.asm</groupId>
-			<artifactId>com.springsource.org.objectweb.asm</artifactId>
-			<version>2.2.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.api</artifactId>
-			<version>1.5.6</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.log4j</artifactId>
-			<version>1.5.6</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-			<version>1.5.6</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Equinox OSGI Framework -->
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-			<version>3.6.0.v20100517</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Felix OSGI Framework -->
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.main</artifactId>
-			<version>3.2.2</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- OSGI Enterprise Services -->
-		<dependency>
-			<groupId>org.apache.aries.jndi</groupId>
-			<artifactId>org.apache.aries.jndi</artifactId>
-			<version>0.3</version>
-		</dependency>
-
-		<!-- Taverna OSGI Services -->
-		<!-- <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>xml-parser-service</artifactId> 
-			<version>${taverna.osgi.version}</version> <exclusions> <exclusion> <groupId>org.apache.xerces</groupId> 
-			<artifactId>com.springsource.org.apache.xerces</artifactId> </exclusion> 
-			</exclusions> </dependency> -->
-
-		<dependency>
-			<groupId>org.apache.taverna.osgi</groupId>
-			<artifactId>xml-transformer-service</artifactId>
-			<version>${taverna.osgi.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.xalan</groupId>
-					<artifactId>com.springsource.org.apache.xalan</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- Taverna -->
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-workflowmodel-api</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-workflowmodel-extensions</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-workflowmodel-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-reference-api</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-reference-types</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>reference-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-observer</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<!-- is this needed here? (Why?) -->
-		<!-- <dependency> <groupId>${project.parent.groupId}</groupId> <artifactId>ui</artifactId> 
-			<version>${project.parent.version}</version> </dependency> -->
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-credential-manager</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-credential-manager-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.taverna.osgi</groupId>
-			<artifactId>taverna-configuration-api</artifactId>
-			<version>${taverna.osgi.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.taverna.osgi</groupId>
-			<artifactId>taverna-configuration-impl</artifactId>
-			<version>${taverna.osgi.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.taverna.osgi</groupId>
-			<artifactId>taverna-app-configuration-api</artifactId>
-			<version>${taverna.osgi.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.taverna.osgi</groupId>
-			<artifactId>taverna-app-configuration-impl</artifactId>
-			<version>${taverna.osgi.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-database-configuration-api</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-database-configuration-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
-		<!-- Taverna Platform -->
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-capability-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-execution-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-run-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-execution-local</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-report-api</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
-		<!-- Scufl2 -->
-		<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-t2flow</artifactId>
-			<version>${taverna.language.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.taverna.language</groupId>
-			<artifactId>taverna-scufl2-wfbundle</artifactId>
-			<version>${taverna.language.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.taverna.language</groupId>
-			<artifactId>taverna-scufl2-ucfpackage</artifactId>
-			<version>${taverna.language.version}</version>
-		</dependency>
-
-		<!-- Taverna CommandLine Tool -->
-		<dependency>
-			<groupId>org.apache.taverna.commandline</groupId>
-			<artifactId>taverna-commandline-common</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Dependencies declared as provided by some poms - specified here to 
-			ensure that they are in the local repository for the testing framework -->
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<version>1.4</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-pool</groupId>
-			<artifactId>commons-pool</artifactId>
-			<version>1.5.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.xml</groupId>
-			<artifactId>com.springsource.com.sun.xml.bind</artifactId>
-			<version>2.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-			<version>1.2.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-			<version>1.1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.jms</groupId>
-			<artifactId>com.springsource.javax.jms</artifactId>
-			<version>1.1.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>com.springsource.javax.mail</artifactId>
-			<version>1.4.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-			<version>2.5.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>com.springsource.javax.transaction</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.wsdl</groupId>
-			<artifactId>com.springsource.javax.wsdl</artifactId>
-			<version>1.6.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.soap</groupId>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
-			<version>1.3.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.rpc</groupId>
-			<artifactId>com.springsource.javax.xml.rpc</artifactId>
-			<version>1.1.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.stream</groupId>
-			<artifactId>com.springsource.javax.xml.stream</artifactId>
-			<version>1.0.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>com.springsource.org.apache.axis</artifactId>
-			<version>1.4.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.codec</artifactId>
-			<version>1.4.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.csv</artifactId>
-			<version>1.0.0.BUILD-20080106</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.discovery</artifactId>
-			<version>0.4.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.httpclient</artifactId>
-			<version>3.1.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.io</artifactId>
-			<version>1.4.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
-			<version>2.5.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
-			<version>1.1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.net</artifactId>
-			<version>1.4.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.cli</artifactId>
-			<version>1.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>com.springsource.org.apache.httpcomponents.httpclient</artifactId>
-			<version>4.1.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcore</groupId>
-			<artifactId>com.springsource.org.apache.httpcomponents.httpcore</artifactId>
-			<version>4.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ws.security</groupId>
-			<artifactId>wss4j</artifactId>
-			<version>1.5.12</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xml</groupId>
-			<artifactId>com.springsource.org.apache.xml.resolver</artifactId>
-			<version>1.2.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
-			<artifactId>com.springsource.org.apache.xmlbeans</artifactId>
-			<version>2.4.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-			<version>1.3.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xalan</groupId>
-			<artifactId>com.springsource.org.apache.xml.serializer</artifactId>
-			<version>2.7.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xml</groupId>
-			<artifactId>com.springsource.org.apache.xml.security</artifactId>
-			<version>1.4.2</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.xalan</groupId>
-					<artifactId>com.springsource.org.apache.xalan</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-
-		<!--
-		<dependency>
-			<groupId>org.apache.ws</groupId>
-			<artifactId>com.springsource.org.apache.ws.security</artifactId>
-			<version>1.5.8</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.xalan</groupId>
-					<artifactId>com.springsource.org.apache.xalan</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.beanshell</groupId>
-			<artifactId>com.springsource.bsh</artifactId>
-			<version>2.0.0.b4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.biomart</groupId>
-			<artifactId>martservice</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		-->
-
-		<dependency>
-			<groupId>org.dom4j</groupId>
-			<artifactId>com.springsource.org.dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jaxen</groupId>
-			<artifactId>com.springsource.org.jaxen</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jdom</groupId>
-			<artifactId>com.springsource.org.jdom</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-	<!-- 
-	<dependency>
-		<groupId>org.odftoolkit</groupId>
-		<artifactId>odfdom-java.bundle</artifactId>
-		<version>0.7.0</version>
-		<exclusions>
-			<exclusion>
-				<groupId>org.apache.xerces</groupId>
-				<artifactId>com.springsource.org.apache.xerces</artifactId>
-			</exclusion>
-		</exclusions>
-	</dependency> 
-	-->
-		<dependency>
-			<groupId>org.opensaml</groupId>
-			<artifactId>com.springsource.org.opensaml</artifactId>
-			<version>1.1.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.xalan</groupId>
-					<artifactId>com.springsource.org.apache.xalan</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.xmlpull</groupId>
-			<artifactId>com.springsource.org.xmlpull</artifactId>
-			<version>1.1.3.4-O</version>
-		</dependency>
-	</dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ActivityIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ActivityIT.java b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ActivityIT.java
deleted file mode 100644
index 7548e37..0000000
--- a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ActivityIT.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.taverna.platform;
-
-import java.net.URI;
-import java.util.List;
-
-import org.apache.taverna.platform.capability.api.ActivityConfigurationException;
-import org.apache.taverna.platform.capability.api.ActivityNotFoundException;
-import org.osgi.framework.ServiceReference;
-
-
-public class ActivityIT extends PlatformIT {
-
-	public void testGetActivityURIs() {
-		ServiceReference activityServiceReference = bundleContext.getServiceReference("org.apache.taverna.platform.capability.api.ActivityService");
-		ActivityService activityService = (ActivityService) bundleContext.getService(activityServiceReference);
-		List<URI> activityURIs = activityService.getActivityURIs();
-		System.out.println("================= Available Activities ===================");
-		for (URI uri : activityURIs) {
-			System.out.println(uri);
-		}
-		System.out.println("==========================================================");
-		System.out.println("");
-	}
-
-	public void testCreateActivity() throws ActivityNotFoundException, ActivityConfigurationException {
-		ServiceReference activityServiceReference = bundleContext.getServiceReference("org.apache.taverna.platform.capability.api.ActivityService");
-		ActivityService activityService = (ActivityService) bundleContext.getService(activityServiceReference);
-		List<URI> activityURIs = activityService.getActivityURIs();
-		for (URI uri : activityURIs) {
-			System.out.println("Creating activity " + uri);
-			Activity<?> activity = activityService.createActivity(uri, null);
-		}
-	}
-
-	public void testGetActivityConfigurationDefinition() throws Exception {
-		ServiceReference activityServiceReference = bundleContext.getServiceReference("org.apache.taverna.platform.capability.api.ActivityService");
-		ActivityService activityService = (ActivityService) bundleContext.getService(activityServiceReference);
-
-		List<URI> activityURIs = activityService.getActivityURIs();
-		System.out.println("============ Activity Configuration Definitions ==========");
-		for (URI uri : activityURIs) {
-			ConfigurationDefinition configurationDefinition = activityService.getActivityConfigurationDefinition(uri);
-			System.out.println(configurationDefinition);
-		}
-		System.out.println("==========================================================");
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/CommandLineToolIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/CommandLineToolIT.java b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/CommandLineToolIT.java
deleted file mode 100644
index 1a3110e..0000000
--- a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/CommandLineToolIT.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.taverna.platform;
-
-import org.osgi.framework.ServiceReference;
-
-import org.apache.taverna.platform.run.api.RunService;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleReader;
-
-public class CommandLineToolIT extends PlatformIT {
-
-	private RunService runService;
-	private WorkflowBundleIO workflowBundleIO;
-	private WorkflowBundleReader workflowReader;
-
-	protected void setup() throws Exception {
-		super.setup();
-		if (runService == null) {
-			ServiceReference runServiceReference = bundleContext
-					.getServiceReference("org.apache.taverna.platform.run.api.RunService");
-			runService = (RunService) bundleContext.getService(runServiceReference);
-		}
-
-		if (workflowReader == null) {
-			ServiceReference workflowBundleReaderServiceReference = bundleContext
-					.getServiceReferences("org.apache.taverna.scufl2.api.io.WorkflowBundleReader",
-							"(mediaType=application/vnd.taverna.t2flow+xml)")[0];
-			workflowBundleReader = (WorkflowBundleReader) bundleContext
-					.getService(workflowBundleReaderServiceReference);
-		}
-
-		if (workflowBundleIO == null) {
-			ServiceReference workflowBundleIOServiceReference = bundleContext
-					.getServiceReference("org.apache.taverna.scufl2.api.io.WorkflowBundleIO");
-			workflowBundleIO = (WorkflowBundleIO) bundleContext
-					.getService(workflowBundleIOServiceReference);
-		}
-	}
-
-	public void testCommandLineTool() throws Exception {
-
-		setup();
-
-		CommandLineTool cmdTool = new CommandLineTool();
-		cmdTool.setRunService(runService);
-		cmdTool.setCredentialManager(credentialManager);
-		cmdTool.setWorkflowBundleIO(workflowBundleIO);
-		cmdTool.setCommandLineArgumentsService(new CommandLineArguments() {
-			public String[] getCommandLineArguments() {
-				return new String[] { "-outputdoc", "/tmp/taverna3/baclava-output1.xml",
-						"/Users/alex/Desktop/t2flows/simple-wf-no-inputs-one-output.t2flow" };
-			}
-
-		});
-		cmdTool.run();
-
-		cmdTool.setCommandLineArgumentsService(new CommandLineArguments() {
-			public String[] getCommandLineArguments() {
-				return new String[] { "-inputvalue", "in", "Taverna 3 Platform rules",
-						"-outputdoc", "/tmp/taverna3/baclava-output2.xml",
-						"/Users/alex/Desktop/t2flows/simple-wf-one-input-one-output.t2flow" };
-			}
-
-		});
-		cmdTool.run();
-
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ExecutionIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ExecutionIT.java b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ExecutionIT.java
deleted file mode 100644
index 3537353..0000000
--- a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/ExecutionIT.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.taverna.platform;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.osgi.framework.ServiceReference;
-
-import org.apache.taverna.platform.execution.api.AbstractExecutionEnvironment;
-import org.apache.taverna.platform.execution.api.AbstractExecutionService;
-import org.apache.taverna.platform.execution.api.Execution;
-import org.apache.taverna.platform.execution.api.ExecutionEnvironment;
-import org.apache.taverna.platform.execution.api.ExecutionEnvironmentService;
-import org.apache.taverna.platform.execution.api.InvalidWorkflowException;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.core.Workflow;
-import org.apache.taverna.scufl2.api.profiles.Profile;
-
-public class ExecutionIT extends PlatformIT {
-
-	private ExecutionEnvironmentService executionEnvironmentService;
-
-	protected void setup() throws Exception {
-		super.setup();
-		ServiceReference[] executionServiceReferences = bundleContext.getServiceReferences(
-				"org.apache.taverna.platform.execution.api.ExecutionEnvironmentService", null);
-		assertEquals(1, executionServiceReferences.length);
-		executionEnvironmentService = (ExecutionEnvironmentService) bundleContext
-				.getService(executionServiceReferences[0]);
-
-	}
-
-	public void testGetExecutionEnvironments() throws Exception {
-		setup();
-
-		Set<ExecutionEnvironment> executionEnvironments = executionEnvironmentService
-				.getExecutionEnvironments();
-		int size = executionEnvironments.size();
-
-		bundleContext.registerService("org.apache.taverna.platform.execution.api.ExecutionService",
-				new AbstractExecutionService("test id", "test name", "test description") {
-					public Set<ExecutionEnvironment> getExecutionEnvivonments() {
-						return Collections
-								.<ExecutionEnvironment> singleton(new AbstractExecutionEnvironment(
-										"test id", "test name", "test description", this) {
-									public List<URI> getDispatchLayerURIs() {
-										return Collections.singletonList(URI
-												.create("http://ns.taverna.org.uk/2010/dispatchlayer/testDispatchLayer"));
-									}
-
-									public List<URI> getActivityURIs() {
-										return Collections.singletonList(URI
-												.create("http://ns.taverna.org.uk/2010/activity/testActivity"));
-									}
-
-									public boolean dispatchLayerExists(URI uri) {
-										return false;
-									}
-
-									public boolean activityExists(URI uri) {
-										return false;
-									}
-
-									public ConfigurationDefinition getActivityConfigurationDefinition(
-											URI uri) throws ActivityNotFoundException,
-											ActivityConfigurationException {
-										return null;
-									}
-
-									public ConfigurationDefinition getDispatchLayerConfigurationDefinition(
-											URI uri) throws DispatchLayerNotFoundException,
-											DispatchLayerConfigurationException {
-										return null;
-									}
-								});
-					}
-
-					protected Execution createExecutionImpl(WorkflowBundle workflowBundle,
-							Workflow workflow, Profile profile, Map<String, Data> inputs) throws InvalidWorkflowException {
-						return null;
-					}
-				}, null);
-
-
-		executionEnvironments = executionEnvironmentService
-				.getExecutionEnvironments();
-		assertEquals(size + 1, executionEnvironments.size());
-
-		for (ExecutionEnvironment executionEnvironment : executionEnvironments) {
-			System.out.println(executionEnvironment);
-		}
-	}
-
-	public void testGetExecutionEnvironmentsProfile() throws Exception {
-		setup();
-
-		WorkflowBundle workflowBundle = loadWorkflow("/t2flow/beanshell.t2flow");
-
-		Set<ExecutionEnvironment> executionEnvironments = executionEnvironmentService
-				.getExecutionEnvironments(workflowBundle.getMainProfile());
-		assertTrue(executionEnvironments.size() > 0);
-
-		System.out.println(executionEnvironments.iterator().next());
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/LocalExecutionIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/LocalExecutionIT.java b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/LocalExecutionIT.java
deleted file mode 100644
index 290744b..0000000
--- a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/LocalExecutionIT.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.taverna.platform;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.osgi.framework.ServiceReference;
-
-import org.apache.taverna.platform.execution.api.ExecutionEnvironment;
-import org.apache.taverna.platform.execution.api.ExecutionService;
-import org.apache.taverna.platform.report.State;
-import org.apache.taverna.platform.report.WorkflowReport;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.core.Workflow;
-import org.apache.taverna.scufl2.api.profiles.Profile;
-
-public class LocalExecutionIT extends PlatformIT {
-
-	private ExecutionService executionService;
-	private Set<ExecutionEnvironment> executionEnvironments;
-
-	protected void setup() throws Exception {
-		super.setup();
-		if (executionService == null) {
-			ServiceReference[] executionServiceReferences = bundleContext.getServiceReferences(
-					"org.apache.taverna.platform.execution.api.ExecutionService",
-					"(org.springframework.osgi.bean.name=localExecution)");
-			assertEquals(1, executionServiceReferences.length);
-			executionService = (ExecutionService) bundleContext
-					.getService(executionServiceReferences[0]);
-			executionEnvironments = executionService.getExecutionEnvivonments();
-			assertEquals(1, executionEnvironments.size());
-		}
-		if (dataService == null) {
-			ServiceReference dataServiceReference = bundleContext
-					.getServiceReference("org.apache.taverna.platform.data.DataService");
-			dataService = (DataService) bundleContext.getService(dataServiceReference);
-		}
-	}
-
-	public void testLocalExecution() throws Exception {
-		setup();
-
-		WorkflowBundle workflowBundle = loadWorkflow("/t2flow/in-out.t2flow");
-		Workflow workflow = workflowBundle.getMainWorkflow();
-		Profile profile = workflowBundle.getMainProfile();
-		for (ExecutionEnvironment executionEnvironment : executionEnvironments) {
-			Map<String, Data> inputs = Collections.singletonMap("in", dataService.create("test-input"));
-
-			String executionId = executionService.createExecution(executionEnvironment,
-					workflowBundle, workflow, profile, inputs);
-			WorkflowReport report = executionService.getWorkflowReport(executionId);
-			assertEquals(State.CREATED, report.getState());
-			executionService.start(executionId);
-
-			Map<String, Data> results = report.getOutputs();
-			assertNotNull(results);
-			waitForResults(results, report, "out");
-
-			Object result = results.get("out").getValue();
-			assertEquals("test-input", result);
-			assertEquals(State.COMPLETED, report.getState());
-			System.out.println(report);
-		}
-	}
-
-	public void testLocalExecution2() throws Exception {
-		setup();
-
-		WorkflowBundle workflowBundle = loadWorkflow("/t2flow/beanshell.t2flow");
-		Workflow workflow = workflowBundle.getMainWorkflow();
-		Profile profile = workflowBundle.getMainProfile();
-
-		for (ExecutionEnvironment executionEnvironment : executionEnvironments) {
-			Map<String, Data> inputs = Collections.singletonMap("in", dataService.create("test-input"));
-
-			String executionId = executionService.createExecution(executionEnvironment,
-					workflowBundle, workflow, profile, inputs);
-			WorkflowReport report = executionService.getWorkflowReport(executionId);
-			System.out.println(report);
-			assertEquals(State.CREATED, report.getState());
-			executionService.start(executionId);
-			System.out.println(report);
-
-			Map<String, Data> results = report.getOutputs();
-			waitForResults(results, report, "out");
-
-			List<Data> result = results.get("out").getElements();
-			assertEquals(1000, result.size());
-			assertEquals("test-input:0", result.get(0).getValue());
-			assertEquals(State.COMPLETED, report.getState());
-			System.out.println(report);
-		}
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/OSGIFrameworkIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/OSGIFrameworkIT.java b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/OSGIFrameworkIT.java
deleted file mode 100644
index 64bd86b..0000000
--- a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/OSGIFrameworkIT.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.taverna.platform;
-
-import java.io.IOException;
-
-import org.osgi.framework.Bundle;
-import org.springframework.osgi.util.OsgiStringUtils;
-
-public class OSGIFrameworkIT extends PlatformIT {
-
-	public void testOsgiEnvironment() throws Exception {
-		Bundle[] bundles = bundleContext.getBundles();
-		for (int i = 0; i < bundles.length; i++) {
-			System.out.println(OsgiStringUtils.nullSafeName(bundles[i]));
-		}
-		System.out.println();
-	}
-
-	protected String[] getTestFrameworkBundlesNames() {
-		String[] frameworkBundles = super.getTestFrameworkBundlesNames();
-		System.out.println("Test Framework bundles:");
-		for (String bundle : frameworkBundles) {
-			System.out.println("  " + bundle);
-		}
-		return frameworkBundles;
-	}
-
-	protected String[] getTestBundlesNames() {
-		String[] frameworkBundles = super.getTestBundlesNames();
-		System.out.println("Framework bundles:");
-		for (String bundle : frameworkBundles) {
-			System.out.println("  " + bundle);
-		}
-		return frameworkBundles;
-	}
-
-	public void testPrintConfig() throws IOException {
-		Resource[] bundles = getTestBundles();
-		Resource[] testBundles = getTestFrameworkBundles();
-		StringBuilder sb = new StringBuilder();
-		StringBuilder sb2 = new StringBuilder();
-		System.out.println("mkdir platform");
-		System.out.println("mkdir platform/configuration");
-		sb2.append("cp ");
-		sb.append("osgi.bundles=");
-		boolean printComma = false;
-		for (Resource resource : bundles) {
-			if (printComma) {
-				sb.append(", ");
-				sb2.append(" ");
-			}
-			sb.append(resource.getFilename() + "@start");
-			sb2.append(resource.getFile());
-			printComma = true;
-		}
-		for (Resource resource : testBundles) {
-			if (!resource.getFilename().contains("test")) {
-				if (printComma) {
-					sb.append(", ");
-					sb2.append(" ");
-				}
-				sb.append(resource.getFilename() + "@start");
-				sb2.append(resource.getFile());
-				printComma = true;
-			}
-		}
-		sb2.append(" platform");
-		System.out.println("echo \"" + sb.toString() + "\" > platform/configuration/config.ini");
-		System.out.println(sb2.toString());
-		System.out.println("zip platform.zip platform/*");
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/4f01028b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/PlatformIT.java
----------------------------------------------------------------------
diff --git a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/PlatformIT.java b/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/PlatformIT.java
deleted file mode 100644
index d6909df..0000000
--- a/taverna-platform-integration-tests/src/test/java/org/apache/taverna/platform/PlatformIT.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.taverna.platform;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-
-
-import org.eclipse.osgi.framework.internal.core.Constants;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.jndi.JNDIContextManager;
-import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
-import org.springframework.osgi.test.platform.OsgiPlatform;
-import org.springframework.osgi.test.platform.Platforms;
-
-import org.apache.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.configuration.database.DatabaseConfiguration;
-import org.apache.taverna.platform.report.State;
-import org.apache.taverna.platform.report.WorkflowReport;
-import org.apache.taverna.scufl2.api.container.WorkflowBundle;
-import org.apache.taverna.scufl2.api.io.WorkflowBundleReader;
-import org.apache.taverna.scufl2.translator.t2flow.T2FlowReader;
-import org.apache.taverna.security.credentialmanager.CredentialManager;
-import org.apache.taverna.security.credentialmanager.MasterPasswordProvider;
-
-public class PlatformIT extends AbstractConfigurableBundleCreatorTests {
-
-	protected WorkflowBundleReader workflowBundleReader;
-	protected CredentialManager credentialManager;
-	protected MasterPasswordProvider masterPasswordProvider;
-	protected DatabaseConfiguration databaseConfiguration;
-	protected JNDIContextManager jndiContextManager;
-	protected ApplicationConfiguration applicationConfiguration;
-
-	protected String getPlatformName() {
-		// return Platforms.FELIX;
-		return Platforms.EQUINOX;
-	}
-
-	@Override
-	protected OsgiPlatform createPlatform() {
-		OsgiPlatform platform = super.createPlatform();
-		Properties config = platform.getConfigurationProperties();
-		config.setProperty("org.osgi.framework.system.packages.extra",
-				"com.sun.org.apache.xml.internal.utils");
-		return platform;
-	}
-
-	@Override
-	protected String[] getTestBundlesNames() {
-		return new String[] {
-				"com.jcraft.jsch, com.springsource.com.jcraft.jsch, 0.1.41",
-				"com.sun.xml, com.springsource.com.sun.xml.bind, 2.2.0",
-				"com.sun.xml, com.springsource.com.sun.xml.fastinfoset, 1.2.2",
-				"com.thoughtworks.xstream, com.springsource.com.thoughtworks.xstream, 1.2.2",
-				"commons-dbcp, commons-dbcp, 1.4",
-				"commons-pool, commons-pool, 1.5.6",
-				"javax.activation, com.springsource.javax.activation, 1.1.1",
-				"javax.jms, com.springsource.javax.jms, 1.1.0",
-				"javax.mail, com.springsource.javax.mail, 1.4.0",
-				"javax.servlet, com.springsource.javax.servlet, 2.5.0",
-				"javax.transaction, com.springsource.javax.transaction, 1.1.0",// for derby client
-				"javax.wsdl, com.springsource.javax.wsdl, 1.6.1",
-				"javax.xml.bind, com.springsource.javax.xml.bind, 2.2.0",
-				"javax.xml.rpc, com.springsource.javax.xml.rpc, 1.1.0",
-				"javax.xml.soap, com.springsource.javax.xml.soap, 1.3.0",
-				"javax.xml.stream, com.springsource.javax.xml.stream, 1.0.1",
-				"org.antlr, com.springsource.antlr, 2.7.6",
-				"org.apache.aries, org.apache.aries.util, 0.3",
-				"org.apache.aries.proxy, org.apache.aries.proxy.api, 0.3",
-				"org.apache.aries.jndi, org.apache.aries.jndi, 0.3",
-				"org.apache.axis, com.springsource.org.apache.axis, 1.4.0",
-				"org.apache.commons, com.springsource.org.apache.commons.cli, 1.2.0",
-				"org.apache.commons, com.springsource.org.apache.commons.codec, 1.4.0",
-				"org.apache.commons, com.springsource.org.apache.commons.csv, 1.0.0.BUILD-20080106",
-				"org.apache.commons, com.springsource.org.apache.commons.collections, 3.2.0",
-				"org.apache.commons, com.springsource.org.apache.commons.discovery, 0.4.0",
-				"org.apache.commons, com.springsource.org.apache.commons.httpclient, 3.1.0",
-				"org.apache.commons, com.springsource.org.apache.commons.io, 1.4.0",
-				"org.apache.commons, com.springsource.org.apache.commons.lang, 2.5.0",
-				"org.apache.commons, com.springsource.org.apache.commons.logging, 1.1.1",
-				"org.apache.commons, com.springsource.org.apache.commons.net, 1.4.1",
-				// "org.apache.derby, derby, 10.5.3.0_1",
-				"org.apache.derby, com.springsource.org.apache.derby, 10.5.1000001.764942",
-				"org.apache.derby, com.springsource.org.apache.derby.client, 10.5.1000001.764942",
-				"org.apache.derby, com.springsource.org.apache.derby.drda, 10.5.1000001.764942",
-				"org.apache.httpcomponents, com.springsource.org.apache.httpcomponents.httpclient, 4.1.1",
-				"org.apache.httpcore, com.springsource.org.apache.httpcomponents.httpcore, 4.1",
-				"org.apache.log4j, com.springsource.org.apache.log4j, 1.2.16",
-				"org.apache.ws, com.springsource.org.apache.ws.security, 1.5.8",
-				// "org.apache.ws.security, wss4j, 1.5.12",
-				"org.apache.xml, com.springsource.org.apache.xml.resolver, 1.2.0",
-				"org.apache.xmlbeans, com.springsource.org.apache.xmlbeans, 2.4.0",
-				"org.apache.xmlcommons, com.springsource.org.apache.xmlcommons, 1.3.4",
-				"org.apache.xalan, com.springsource.org.apache.xalan, 2.7.1",
-				"org.apache.xalan, com.springsource.org.apache.xml.serializer, 2.7.1",
-				"org.apache.xerces, com.springsource.org.apache.xerces, 2.9.1",
-				"org.apache.xml, com.springsource.org.apache.xml.security, 1.4.2",
-				"org.aspectj, com.springsource.org.aspectj.runtime, 1.6.0",
-				"org.aspectj, com.springsource.org.aspectj.weaver, 1.6.0",
-				"org.beanshell, com.springsource.bsh, 2.0.0.b4",
-				"org.biomart, martservice, 2.0-SNAPSHOT",
-				"org.bouncycastle, bcprov-jdk16, 1.46",
-				"org.dom4j, com.springsource.org.dom4j, 1.6.1",
-				"org.hibernate, com.springsource.org.hibernate, 3.2.6.ga",
-				"org.jaxen, com.springsource.org.jaxen, 1.1.1",
-				"org.jboss.javassist, com.springsource.javassist, 3.3.0.ga",
-				"org.jdom, com.springsource.org.jdom, 1.1.0",
-				"org.jvnet.staxex, com.springsource.org.jvnet.staxex, 1.0.0",
-				"org.objectweb.asm, com.springsource.org.objectweb.asm, 1.5.3",
-				"org.objectweb.asm, com.springsource.org.objectweb.asm.attrs, 1.5.3",
-				"org.opensaml, com.springsource.org.opensaml, 1.1.0",
-				"org.springframework, org.springframework.jdbc, 3.0.0.RC1",
-				"org.springframework, org.springframework.orm, 3.0.0.RC1",
-				"org.springframework, org.springframework.transaction, 3.0.0.RC1",
-				// "org.springframework, org.springframework.beans, 3.0.5.RELEASE",
-				// "org.springframework, org.springframework.core, 3.0.5.RELEASE",
-				// "org.springframework, org.springframework.context, 3.0.5.RELEASE",
-				// "org.springframework, org.springframework.transaction, 3.0.5.RELEASE",
-				"org.xmlpull, com.springsource.org.xmlpull, 1.1.3.4-O",
-				"net.sf.taverna, wsdl-generic, 1.10-SNAPSHOT",
-				"net.sf.taverna.jedit, jedit-syntax, 2.2.4-SNAPSHOT",
-				"net.sf.taverna.t2.activities, apiconsumer-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, beanshell-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, biomart-activity, 2.0-SNAPSHOT",
-				// "net.sf.taverna.t2.activities, biomoby-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, dataflow-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, dependency-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, external-tool-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, localworker-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, rest-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, rshell-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, soaplab-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, spreadsheet-import-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, stringconstant-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, wsdl-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.activities, xpath-activity, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, provenance-derby, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, provenance-mysql, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, provenanceconnector, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, reference-api, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, reference-core-extensions, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, reference-impl, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, workflowmodel-api, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, workflowmodel-core-extensions, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.core, workflowmodel-impl, 2.0-SNAPSHOT",
-				// "net.sf.taverna.t2.infrastructure, appconfig, 3.0-SNAPSHOT",
-				"net.sf.taverna.t2.lang, ui, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.lang, observer, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.security, credential-manager, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2.security, credential-manager-impl, 2.0-SNAPSHOT",
-				"net.sourceforge.cglib, com.springsource.net.sf.cglib, 2.1.3",
-				"org.apache.taverna.configuration, taverna-app-configuration-api, 0.1.0-SNAPSHOT",
-				"org.apache.taverna.configuration, taverna-app-configuration-impl, 0.1.0-SNAPSHOT",
-				"org.apache.taverna.configuration, taverna-configuration-api, 0.1.0-SNAPSHOT",
-				"org.apache.taverna.configuration, taverna-configuration-impl, 0.1.0-SNAPSHOT",
-				"org.apache.taverna.configuration, taverna-database-configuration-api, 0.1.0-SNAPSHOT",
-				"org.apache.taverna.configuration, taverna-database-configuration-impl, 0.1.0-SNAPSHOT",
-				"org.apache.taverna.platform, report, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, data, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, execution-local, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, execution-remote, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, taverna-capability-api, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, taverna-capability-impl, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, taverna-execution-api, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, taverna-execution-impl, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, taverna-run-api, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.platform, taverna-run-impl, 0.1.2-SNAPSHOT",
-				"org.apache.taverna.osgi.services, xml-parser-service, 0.0.1-SNAPSHOT",
-				"org.apache.taverna.osgi.services, xml-transformer-service, 0.0.1-SNAPSHOT",
-				// FIXME: Add the other scufl2 modules
-				"org.apache.taverna.scufl2, scufl2-api, 0.9.2",
-				"org.apache.taverna.scufl2, scufl2-rdfxml, 0.9.2",
-				"org.apache.taverna.scufl2, scufl2-ucfpackage, 0.9.2",
-				"org.apache.taverna.scufl2, scufl2-t2flow, 0.9.2",
-				"org.apache.taverna.scufl2, scufl2-validation, 0.9.2",
-				"org.apache.taverna.scufl2, scufl2-validation-correctness, 0.9.2",
-				"org.apache.taverna.scufl2, scufl2-validation-structural, 0.9.2",
-				"net.sf.taverna.t2, results, 2.0-SNAPSHOT",
-				"net.sf.taverna.t2, baclava, 0.1-SNAPSHOT",
-		// "net.sf.taverna.t2.taverna-commandline, taverna-commandline-common, 2.0-SNAPSHOT"
-		};
-	}
-
-	protected void setup() throws Exception {
-
-		if (masterPasswordProvider == null) {
-			masterPasswordProvider = new MasterPasswordProvider() {
-				public String getMasterPassword(boolean firstTime) {
-					return "test";
-				}
-
-				public void setMasterPassword(String password) {
-				}
-
-				public int getProviderPriority() {
-					return 0;
-				}
-			};
-			bundleContext.registerService(
-					"net.sf.taverna.t2.security.credentialmanager.MasterPasswordProvider",
-					masterPasswordProvider, null);
-		}
-
-		if (credentialManager == null) {
-			ServiceReference credentialManagerReference = bundleContext
-					.getServiceReference("net.sf.taverna.t2.security.credentialmanager.CredentialManager");
-			credentialManager = (CredentialManager) bundleContext
-					.getService(credentialManagerReference);
-		}
-
-		if (workflowBundleReader == null) {
-			ServiceReference[] workflowBundleReaderReferences = bundleContext.getServiceReferences(
-					"org.apache.taverna.scufl2.api.io.WorkflowBundleReader", null);
-			for (ServiceReference serviceReference : workflowBundleReaderReferences) {
-				workflowBundleReader = (WorkflowBundleReader) bundleContext
-						.getService(serviceReference);
-				if (workflowBundleReader.getMediaTypes().contains(
-						T2FlowReader.APPLICATION_VND_TAVERNA_T2FLOW_XML)) {
-					break;
-				}
-			}
-		}
-
-		if (databaseConfiguration == null) {
-			ServiceReference databaseConfigurationReference = bundleContext
-					.getServiceReference("org.apache.taverna.configuration.database.DatabaseConfiguration");
-			databaseConfiguration = (DatabaseConfiguration) bundleContext
-					.getService(databaseConfigurationReference);
-			ServiceReference jndiContextManagerReference = bundleContext
-					.getServiceReference("org.osgi.service.jndi.JNDIContextManager");
-			jndiContextManager = (JNDIContextManager) bundleContext
-					.getService(jndiContextManagerReference);
-			ServiceReference applicationConfigurationReference = bundleContext
-					.getServiceReference("org.apache.taverna.configuration.app.ApplicationConfiguration");
-			applicationConfiguration = (ApplicationConfiguration) bundleContext
-					.getService(applicationConfigurationReference);
-		}
-
-	}
-
-	public void testOsgiPlatformStarts() throws Exception {
-		System.out.println(Constants.FRAMEWORK_VENDOR + " = "
-				+ bundleContext.getProperty(Constants.FRAMEWORK_VENDOR));
-		System.out.println(Constants.FRAMEWORK_VERSION + " = "
-				+ bundleContext.getProperty(Constants.FRAMEWORK_VERSION));
-		System.out.println(Constants.FRAMEWORK_EXECUTIONENVIRONMENT + " = "
-				+ bundleContext.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT));
-		System.out.println(Constants.OSGI_IMPL_VERSION_KEY + " = "
-				+ bundleContext.getProperty(Constants.OSGI_IMPL_VERSION_KEY));
-	}
-
-	public WorkflowBundle loadWorkflow(String t2FlowFile) throws Exception {
-		URL wfResource = getClass().getResource(t2FlowFile);
-		assertNotNull(wfResource);
-		return workflowBundleReader.readBundle(wfResource.openStream(),
-				T2FlowReader.APPLICATION_VND_TAVERNA_T2FLOW_XML);
-	}
-
-	public File loadFile(String fileName) throws IOException, FileNotFoundException {
-		File file = File.createTempFile("platform-test", null);
-		InputStream inputStream = getClass().getResource(fileName).openStream();
-		OutputStream outputStream = new FileOutputStream(file);
-		byte[] buffer = new byte[64];
-		int length = -1;
-		while ((length = inputStream.read(buffer)) >= 0) {
-			outputStream.write(buffer, 0, length);
-		}
-		outputStream.flush();
-		outputStream.close();
-		return file;
-	}
-
-//	public void printErrors(Data data) {
-//			ErrorDocument error = (ErrorDocument) data.getValue();
-//			String message = error.getMessage();
-//			if (message != null) {
-//				System.out.println(message);
-//			}
-//			String exceptionMessage = error.getExceptionMessage();
-//			if (exceptionMessage != null) {
-//				System.out.println(exceptionMessage);
-//			}
-//			for (StackTraceElementBean stackTraceElementBean : error.getStackTraceStrings()) {
-//				System.out.println(stackTraceElementBean.getClassName());
-//				System.out.println(stackTraceElementBean.getMethodName());
-//				System.out.println(stackTraceElementBean.getLineNumber());
-//			}
-////			Set<T2Reference> errorReferences = error.getErrorReferences();
-////			for (T2Reference t2Reference : errorReferences) {
-////				printErrors(referenceService, t2Reference);
-////			}
-//	}
-//
-//	public boolean checkResult(Data result, String expectedResult) {
-//		if (result.isError()) {
-//			printErrors(result);
-//			return false;
-//		} else {
-//			Object resultObject = result.getValue();
-//			String resultValue = null;
-//			if (resultObject instanceof byte[]) {
-//				resultValue = new String((byte[]) resultObject);
-//			} else {
-//				resultValue = (String) resultObject;
-//			}
-//
-//			if (resultValue.startsWith(expectedResult)) {
-//				return true;
-//			} else {
-//				System.out.println("Expected: " + expectedResult + ", Actual: " + resultValue);
-//				return false;
-//			}
-//		}
-//	}
-
-	public boolean waitForState(WorkflowReport report, State state) throws InterruptedException {
-		return waitForState(report, state, true);
-	}
-
-	public boolean waitForState(WorkflowReport report, State state, boolean printReport)
-			throws InterruptedException {
-		int wait = 0;
-		while (!report.getState().equals(state) && wait++ < 30) {
-			if (printReport)
-				System.out.println(report);
-			Thread.sleep(500);
-		}
-		return report.getState().equals(state);
-	}
-
-//	public void waitForResults(Map<String, Data> results, WorkflowReport report, String... ports)
-//			throws InterruptedException {
-//		int wait = 0;
-//		while (!resultsReady(results, ports) && wait++ < 20) {
-//			System.out.println(report);
-//			Thread.sleep(500);
-//		}
-//	}
-//
-//	private boolean resultsReady(Map<String, Data> results, String... ports) {
-//		for (String port : ports) {
-//			if (!results.containsKey(port)) {
-//				return false;
-//			}
-//		}
-//		return true;
-//	}
-
-}