Merge branch 'shell-fix' into enterprise
diff --git a/README.md b/README.md
index ffbc69b..0341570 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@
To verify, now the repository folder should be empty:
- mvn clean install
+ mvn clean package
rm -rf ~/.taverna-commandline-*
cd target
unzip *.zip
@@ -184,7 +184,7 @@
git fetch --all # fetch all branches/editions
git checkout core # replace 'core' with your edition
- mvn clean install
+ mvn clean package
The packaging will take several minutes. The first time, this might take up to an
hour as several libraries are downloaded from Maven repositories.
@@ -228,7 +228,7 @@
To generate the installers, run:
- mvn clean install -Pdist
+ mvn clean package -Pdist
This process can take anything from 2 minutes to 30 minutes depending on your
hardware. You can speed up the process by adding
diff --git a/pom.xml b/pom.xml
index 690c494..c4d1882 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,10 +9,10 @@
</parent>
<groupId>net.sf.taverna.t2.taverna-workbench</groupId>
<artifactId>taverna-workbench-${edition}</artifactId>
- <name>Taverna Workbench Core</name>
+ <name>Taverna Workbench Enterprise</name>
<properties>
- <edition>core</edition>
+ <edition>enterprise</edition>
<raven.app.name>taverna-workbench-${edition}-${project.version}-${buildNumber}</raven.app.name>
<m2Repository />
</properties>
@@ -472,7 +472,6 @@
<scope>test</scope>
</dependency>
- <!--
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>bioinformatics-activities</artifactId>
@@ -486,9 +485,7 @@
<version>${t2.activities.version}</version>
<scope>test</scope>
</dependency>
- -->
- <!--
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity</artifactId>
@@ -508,7 +505,6 @@
<version>${t2.activities.version}</version>
<scope>test</scope>
</dependency>
- -->
<dependency>
<groupId>net.sf.taverna.t2.component</groupId>
@@ -532,7 +528,6 @@
<scope>test</scope>
</dependency>
- <!--
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>bioinformatics-activity-uis</artifactId>
@@ -566,7 +561,7 @@
<version>${t2.ui.activities.version}</version>
<scope>test</scope>
</dependency>
- -->
+
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>component-activity-ui</artifactId>
@@ -669,10 +664,230 @@
-->
-<!--
-
- -->
-
+ <artifactItem>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/axis/axis-jaxrpc/1.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/axis/axis-jaxrpc/1.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>axis</groupId>
+ <artifactId>axis-ant</artifactId>
+ <version>1.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/axis/axis-ant/1.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>axis</groupId>
+ <artifactId>axis-ant</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/axis/axis-ant/1.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/axis/axis-saaj/1.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>axis</groupId>
+ <artifactId>axis-saaj</artifactId>
+ <version>1.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/axis/axis-saaj/1.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/activation/activation/1.0.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.0.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/activation/activation/1.0.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.9</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-configuration/commons-configuration/1.9</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.9</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-configuration/commons-configuration/1.9</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ <version>1.0b3</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/xom/xom/1.0b3</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ <version>1.0b3</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/xom/xom/1.0b3</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/3.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/3.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ <version>2.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/arq/2.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/arq/2.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jenatest</artifactId>
+ <version>2.5.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/jenatest/2.5.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jenatest</artifactId>
+ <version>2.5.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/jenatest/2.5.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>iri</artifactId>
+ <version>0.5</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/iri/0.5</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>iri</artifactId>
+ <version>0.5</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/iri/0.5</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.5.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/jena/2.5.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.5.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/jena/2.5.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq-extra</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/arq-extra/2.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq-extra</artifactId>
+ <version>2.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/arq-extra/2.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>concurrent-jena</artifactId>
+ <version>1.3.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/concurrent-jena/1.3.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>concurrent-jena</artifactId>
+ <version>1.3.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/concurrent-jena/1.3.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>json-jena</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/json-jena/1.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>json-jena</artifactId>
+ <version>1.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/hp/hpl/jena/json-jena/1.0</outputDirectory>
+ </artifactItem>
<artifactItem>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@@ -737,63 +952,6 @@
<outputDirectory>${project.build.directory}/repository/com/fasterxml/oss-parent/12</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.6.4</outputDirectory>
- </artifactItem>
-
- <artifactItem>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- <version>1.0b3</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/xom/xom/1.0b3</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- <version>1.0b3</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/xom/xom/1.0b3</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.0</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.0</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.0</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.0</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1.1</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.1.1</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1.1</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/commons-collections/commons-collections/2.1.1</outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.10</version>
@@ -808,6 +966,34 @@
<outputDirectory>${project.build.directory}/repository/com/sun/xml/bind/jaxb-impl/2.1.10</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.6</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/sun/xml/bind/jaxb-impl/2.1.6</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.6</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/sun/xml/bind/jaxb-impl/2.1.6</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.8</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/com/ibm/icu/icu4j/3.8</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.8</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/com/ibm/icu/icu4j/3.8</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>2.6.1</version>
@@ -893,6 +1079,20 @@
</artifactItem>
<artifactItem>
<groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.0.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/xerces/xerces/2.0.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.0.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/xerces/xerces/2.0.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.8.1</version>
<type>jar</type>
@@ -978,6 +1178,20 @@
<artifactItem>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/xerces/xmlParserAPIs/2.0.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.0.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/xerces/xmlParserAPIs/2.0.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
<version>2.6.1</version>
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/xerces/xmlParserAPIs/2.6.1</outputDirectory>
@@ -1060,6 +1274,20 @@
<outputDirectory>${project.build.directory}/repository/commons-pool/commons-pool/1.3</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-pool/commons-pool/1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-pool/commons-pool/1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
@@ -1090,6 +1318,20 @@
<artifactItem>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-lang/commons-lang/2.3</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-lang/commons-lang/2.3</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>2.2</version>
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/commons-lang/commons-lang/2.2</outputDirectory>
@@ -1130,18 +1372,18 @@
<outputDirectory>${project.build.directory}/repository/commons-lang/commons-lang/1.0</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>uk.org.mygrid.resources.mimeutil</groupId>
- <artifactId>mime-util</artifactId>
- <version>2.1.2-3</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/uk/org/mygrid/resources/mimeutil/mime-util/2.1.2-3</outputDirectory>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-discovery/commons-discovery/0.2</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>uk.org.mygrid.resources.mimeutil</groupId>
- <artifactId>mime-util</artifactId>
- <version>2.1.2-3</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/uk/org/mygrid/resources/mimeutil/mime-util/2.1.2-3</outputDirectory>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-discovery/commons-discovery/0.2</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>log4j</groupId>
@@ -1242,6 +1484,48 @@
<outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.2</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.7</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-codec/commons-codec/1.7</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.5</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/antlr/antlr/2.7.5</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.5</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/antlr/antlr/2.7.5</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-beanutils/commons-beanutils-core/1.7.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-beanutils/commons-beanutils-core/1.7.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -1285,6 +1569,20 @@
</artifactItem>
<artifactItem>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging-api/1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging-api/1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
<type>jar</type>
@@ -1314,6 +1612,20 @@
<artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1.2</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.1.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.1.2</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0</version>
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/commons-logging/commons-logging/1.0</outputDirectory>
@@ -1566,6 +1878,20 @@
<artifactItem>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/commons-dbcp/commons-dbcp/1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/commons-dbcp/commons-dbcp/1.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
<type>jar</type>
<outputDirectory>${project.build.directory}/repository/commons-dbcp/commons-dbcp/1.2.2</outputDirectory>
@@ -1579,6 +1905,13 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.httpcomponents</groupId>
+ <artifactId>project</artifactId>
+ <version>4.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/project/4.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-core</artifactId>
<version>4.2.2</version>
<type>pom</type>
@@ -1593,24 +1926,31 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcomponents-core</artifactId>
+ <version>4.0.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcomponents-core/4.0.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcomponents-client</artifactId>
- <version>4.2.3</version>
+ <version>4.0.1</version>
<type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcomponents-client/4.2.3</outputDirectory>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcomponents-client/4.0.1</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.3</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpclient/4.2.3</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.3</version>
+ <version>4.0.1</version>
<type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpclient/4.2.3</outputDirectory>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpclient/4.0.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpclient/4.0.1</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.apache.httpcomponents</groupId>
@@ -1655,6 +1995,20 @@
<outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcore/4.2.4</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcore/4.0.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/httpcomponents/httpcore/4.0.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>2.11.0</version>
@@ -1683,6 +2037,20 @@
<outputDirectory>${project.build.directory}/repository/org/apache/jena/jena-iri/1.0.0</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.0.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/lucene/lucene-core/2.0.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.0.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/lucene/lucene-core/2.0.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.3.0</version>
@@ -1699,6 +2067,13 @@
<artifactItem>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
+ <version>28</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/commons/commons-parent/28</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
<version>17</version>
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/org/apache/commons/commons-parent/17</outputDirectory>
@@ -1713,6 +2088,13 @@
<artifactItem>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
+ <version>26</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/apache/commons/commons-parent/26</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
<version>5</version>
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/org/apache/commons/commons-parent/5</outputDirectory>
@@ -1762,6 +2144,20 @@
<artifactItem>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
+ <version>3.0.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/codehaus/woodstox/wstx-asl/3.0.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.0.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/codehaus/woodstox/wstx-asl/3.0.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
<version>3.2.9</version>
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/org/codehaus/woodstox/wstx-asl/3.2.9</outputDirectory>
@@ -1810,20 +2206,6 @@
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-jdk14/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.6.4</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-jdk14/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
<version>1.4.3</version>
<type>pom</type>
@@ -1831,13 +2213,6 @@
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-parent</artifactId>
- <version>1.5.6</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-parent/1.5.6</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.0</version>
<type>jar</type>
@@ -1853,20 +2228,6 @@
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
<type>jar</type>
<outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.5.8</outputDirectory>
@@ -1881,6 +2242,20 @@
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.6.4</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
<type>jar</type>
<outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.4.3</outputDirectory>
@@ -1894,20 +2269,6 @@
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.5.6</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-log4j12/1.5.6</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
<type>jar</type>
@@ -1934,7 +2295,6 @@
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.5.0</outputDirectory>
</artifactItem>
- <!--
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -1949,7 +2309,6 @@
<type>jar</type>
<outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.6.4</outputDirectory>
</artifactItem>
- -->
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -1965,34 +2324,6 @@
<outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.4.3</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.5.6</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/slf4j-api/1.5.6</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.4</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/jcl-over-slf4j/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.6.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/org/slf4j/jcl-over-slf4j/1.6.4</outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>org.ccil.cowan.tagsoup</groupId>
<artifactId>tagsoup</artifactId>
<version>0.9.7</version>
@@ -2007,6 +2338,48 @@
<outputDirectory>${project.build.directory}/repository/org/ccil/cowan/tagsoup/tagsoup/0.9.7</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>juh</artifactId>
+ <version>2.3.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/openoffice/juh/2.3.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>juh</artifactId>
+ <version>2.3.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/openoffice/juh/2.3.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>jurt</artifactId>
+ <version>2.3.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/openoffice/jurt/2.3.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>jurt</artifactId>
+ <version>2.3.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/openoffice/jurt/2.3.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>ridl</artifactId>
+ <version>2.3.1</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/org/openoffice/ridl/2.3.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.openoffice</groupId>
+ <artifactId>ridl</artifactId>
+ <version>2.3.1</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/org/openoffice/ridl/2.3.1</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
@@ -2021,6 +2394,20 @@
<outputDirectory>${project.build.directory}/repository/javax/activation/activation/1.1</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <type>pom</type>
+ <outputDirectory>${project.build.directory}/repository/javax/xml/stream/stax-api/1.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/repository/javax/xml/stream/stax-api/1.0</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
@@ -2062,34 +2449,6 @@
<type>pom</type>
<outputDirectory>${project.build.directory}/repository/javax/servlet/servlet-api/2.4</outputDirectory>
</artifactItem>
- <artifactItem>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.4</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/axis/axis-jaxrpc/1.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>1.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/axis/axis-jaxrpc/1.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.4</version>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/repository/axis/axis-saaj/1.4</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>1.4</version>
- <type>pom</type>
- <outputDirectory>${project.build.directory}/repository/axis/axis-saaj/1.4</outputDirectory>
- </artifactItem>
</artifactItems>
</configuration>
@@ -2134,8 +2493,26 @@
</snapshots>
<id>aduna-opensource.releases</id>
<name>Aduna Open Source - Maven releases</name>
+<!--
<url>http://repo.aduna-software.org/maven2/releases</url>
+-->
+ <url>http://build.mygrid.org.uk/maven/aduna</url>
</repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>aduna-software</id>
+ <name>Aduna Open Source - Maven releases</name>
+<!--
+ <url>http://repo.aduna-software.org/maven2/releases</url>
+-->
+ <url>http://build.mygrid.org.uk/maven/aduna</url>
+ </repository>
+
</repositories>
<scm>
diff --git a/src/main/install4j/taverna-workbench.install4j b/src/main/install4j/taverna-workbench.install4j
index d72f19c..f50bc0f 100644
--- a/src/main/install4j/taverna-workbench.install4j
+++ b/src/main/install4j/taverna-workbench.install4j
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="5.1.11" transformSequenceNumber="4">
<directoryPresets config="../../../target/taverna-workbench-dist/taverna.sh" />
- <application name="${compiler:product-name}" distributionSourceDir="" applicationId="5202-1944-9901-7953" mediaDir="../../../target/media" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="false" shortName="taverna-workbench-${compiler:edition}" publisher="myGrid" publisherWeb="http://www.taverna.org.uk/" version="2.5-SNAPSHOT" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" installerName="" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+ <application name="${compiler:product-name}" distributionSourceDir="" applicationId="2878-7082-3139-2294" mediaDir="../../../target/media" mediaFilePattern="${compiler:sys.shortName}-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="false" shortName="taverna-workbench-${compiler:edition}" publisher="myGrid" publisherWeb="http://www.taverna.org.uk/" version="2.5-SNAPSHOT" allPathsRelative="true" backupOnSave="false" autoSave="true" convertDotsToUnderscores="false" macSignature="????" installerName="" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
<principalLanguage id="en" customLocalizationFile="" />
<additionalLanguages />
@@ -19,7 +19,7 @@
<variable name="edition" value="snapshot" description="" category="" />
</variables>
<mergedProjects />
- <codeSigning macEnabled="false" macPkcs12File="/tmp/code-signing.pfx" windowsEnabled="false" windowsKeySource="pkcs12" windowsPvkFile="" windowsSpcFile="" windowsPkcs12File="/tmp/code-signing.pfx" />
+ <codeSigning macEnabled="true" macPkcs12File="/tmp/code-signing.pfx" windowsEnabled="true" windowsKeySource="pkcs12" windowsPvkFile="" windowsSpcFile="" windowsPkcs12File="/tmp/code-signing.pfx" />
</application>
<files keepModificationTimes="false" missingFilesStrategy="error" globalExcludeSuffixes="" defaultOverwriteMode="3" defaultUninstallMode="0" launcherOverwriteMode="3" defaultFileMode="644" defaultDirMode="755">
<filesets>
diff --git a/src/main/resources/README.txt b/src/main/resources/README.txt
index b8bbf43..1680df4 100644
--- a/src/main/resources/README.txt
+++ b/src/main/resources/README.txt
@@ -1,5 +1,5 @@
=======================
-Taverna workbench 2.5.0
+Taverna Workbench 2.5.0
=======================
http://www.taverna.org.uk/
http://www.mygrid.org.uk/
diff --git a/src/main/resources/conf/default_service_providers.xml b/src/main/resources/conf/default_service_providers.xml
index 3524e22..1402d9c 100644
--- a/src/main/resources/conf/default_service_providers.xml
+++ b/src/main/resources/conf/default_service_providers.xml
@@ -1,6 +1,5 @@
<serviceDescriptions xmlns="http://taverna.sf.net/2009/xml/servicedescription">
<providers>
- <!--
<provider>
<providerId xmlns="http://taverna.sf.net/2008/xml/t2flow">http://taverna.sf.net/2010/service-provider/biomart</providerId>
<configBean xmlns="http://taverna.sf.net/2008/xml/t2flow" encoding="xstream">
@@ -42,6 +41,7 @@
</net.sf.taverna.t2.activities.soaplab.servicedescriptions.SoaplabServiceProviderConfig>
</configBean>
</provider>
+ <!--
<provider>
<providerId xmlns="http://taverna.sf.net/2008/xml/t2flow">http://taverna.sf.net/2012/service-provider/component</providerId>
<configBean xmlns="http://taverna.sf.net/2008/xml/t2flow" encoding="xstream">
diff --git a/src/main/resources/conf/workbench-profile.properties b/src/main/resources/conf/workbench-profile.properties
index 5b3c544..368decb 100644
--- a/src/main/resources/conf/workbench-profile.properties
+++ b/src/main/resources/conf/workbench-profile.properties
@@ -1,4 +1,4 @@
servicecatalogue.base.url=https://www.biocatalogue.org
servicecatalogue.name=BioCatalogue
myexperiment.base.url=http://www.myexperiment.org
-myexperiment.starterpack=254
+myexperiment.starterpack=612
diff --git a/src/main/resources/plugins/plugins.xml b/src/main/resources/plugins/plugins.xml
index 15b96f9..8e36471 100644
--- a/src/main/resources/plugins/plugins.xml
+++ b/src/main/resources/plugins/plugins.xml
@@ -70,7 +70,6 @@
</compatibility>
</plugin>
-<!--
<plugin>
<provider>taverna.sf.net</provider>
<identifier>net.sf.taverna.t2.activities.bioinformatics</identifier>
@@ -106,9 +105,7 @@
</application>
</compatibility>
</plugin>
--->
-
-<!--
+
<plugin>
<provider>taverna.sf.net</provider>
<identifier>net.sf.taverna.t2.apiconsumer-activity</identifier>
@@ -142,9 +139,7 @@
</application>
</compatibility>
</plugin>
--->
-
-<!--
+
<plugin>
<provider>taverna.sf.net</provider>
<identifier>net.sf.taverna.t2.biomoby-activity</identifier>
@@ -178,7 +173,6 @@
</application>
</compatibility>
</plugin>
--->
<plugin>
@@ -255,7 +249,7 @@
</application>
</compatibility>
</plugin>
-<!--
+
<plugin>
<provider>taverna.sf.net</provider>
<identifier>net.sf.taverna.t2.webdav-activity</identifier>
@@ -282,11 +276,9 @@
<artifactId>webdav-activity-ui</artifactId>
<version>${t2.ui.activities.version}</version>
</dependency>
--->
<!-- For backwards compatibility with older
WebDAV local workers the remaining old versions
need to be pulled into the repository: -->
-<!--
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
@@ -302,10 +294,8 @@
<artifactId>sardine</artifactId>
<version>5.0_1_6</version>
</dependency>
--->
<!-- Any future versions of these dependencies also would need to
be listed here: -->
-<!--
</profile>
<compatibility>
<application>
@@ -313,7 +303,6 @@
</application>
</compatibility>
</plugin>
--->
<plugin>
<provider>taverna.sf.net</provider>
@@ -355,7 +344,6 @@
</compatibility>
</plugin>
- <!--
<plugin>
<provider>taverna.sf.net</provider>
<identifier>net.sf.taverna.t2.servicecatalogue</identifier>
@@ -384,7 +372,6 @@
</application>
</compatibility>
</plugin>
- -->
