You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:54:09 UTC
[01/49] incubator-taverna-workbench-product git commit: git-svn-id:
https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15150
bf327186-88b3-11dd-a302-d386e5130c1c
Repository: incubator-taverna-workbench-product
Updated Branches:
refs/heads/master [created] 7e665d1bb
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15150 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/a11b1e1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/a11b1e1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/a11b1e1f
Branch: refs/heads/master
Commit: a11b1e1f2fff8927af515919acea02882b08e8a6
Parents:
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Sep 28 12:06:27 2012 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Sep 28 12:06:27 2012 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/49] incubator-taverna-workbench-product git commit: Correct jar
path for windows BAT
Posted by st...@apache.org.
Correct jar path for windows BAT
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15218 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/0f8e6daf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/0f8e6daf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/0f8e6daf
Branch: refs/heads/master
Commit: 0f8e6daf54c8d2bd2f1414ff4c0e09405bbfe882
Parents: 43a4389
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:21:41 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:21:41 2012 +0000
----------------------------------------------------------------------
taverna-workbench-product/src/main/etc/taverna.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/0f8e6daf/taverna-workbench-product/src/main/etc/taverna.bat
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/taverna.bat b/taverna-workbench-product/src/main/etc/taverna.bat
index 8bba381..7da12f3 100644
--- a/taverna-workbench-product/src/main/etc/taverna.bat
+++ b/taverna-workbench-product/src/main/etc/taverna.bat
@@ -14,4 +14,4 @@ set ARGS=%ARGS% "-Dlog4j.configuration=file:///%TAVERNA_HOME%conf/log4j.properti
set ARGS=%ARGS% "-Djava.util.logging.config.file=%TAVERNA_HOME%conf/logging.properties"
set ARGS=%ARGS% "-Dtaverna.app.startup=%TAVERNA_HOME%."
-java %ARGS% -jar "%TAVERNA_HOME%lib\taverna-command-line-0.1.1.jar" %*
+java %ARGS% -jar "%TAVERNA_HOME%lib\taverna-workbench-0.1.0-SNAPSHOT.jar" %*
[05/49] incubator-taverna-workbench-product git commit: git-svn-id:
https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15177
bf327186-88b3-11dd-a302-d386e5130c1c
Posted by st...@apache.org.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15177 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/8c0d141b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/8c0d141b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/8c0d141b
Branch: refs/heads/master
Commit: 8c0d141b4e104b0d3c767d68b1a75aa014d41e30
Parents: 026c0de
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Oct 1 16:46:33 2012 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Oct 1 16:46:33 2012 +0000
----------------------------------------------------------------------
taverna-workbench-product/pom.xml | 40 +++++++++++-----------------------
1 file changed, 13 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/8c0d141b/taverna-workbench-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/pom.xml b/taverna-workbench-product/pom.xml
index 36981b1..27b0920 100644
--- a/taverna-workbench-product/pom.xml
+++ b/taverna-workbench-product/pom.xml
@@ -36,16 +36,18 @@
</dependency>
<!-- Java Extension Implementations -->
- <!-- <dependency>
- <groupId>com.sun.xml</groupId>
- <artifactId>com.springsource.com.sun.xml.bind</artifactId>
- <version>2.2.0</version>
- </dependency> -->
+ <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <version>2.2.0</version> </dependency> -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>com.springsource.javax.xml.bind</artifactId>
<version>2.2.0</version>
</dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>com.springsource.javax.activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
<dependency> <!-- required by bsh -->
<groupId>javax.servlet</groupId>
<artifactId>com.springsource.javax.servlet</artifactId>
@@ -90,17 +92,9 @@
</dependency>
<!-- Taverna Activities -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>all-activities</artifactId>
- <version>${t2.activities.version}</version>
- <exclusions>
- <exclusion>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomoby-activity</artifactId>
- </exclusion>
- </exclusions>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>beanshell-activity</artifactId>
@@ -118,17 +112,9 @@
</dependency>
<!-- Taverna Activities UI -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>all-activity-uis</artifactId>
- <version>${t2.activities.version}</version>
- <exclusions>
- <exclusion>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomoby-activity-ui</artifactId>
- </exclusion>
- </exclusions>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>beanshell-activity-ui</artifactId>
[40/49] incubator-taverna-workbench-product git commit: T3-954 Open
workflow runs with spaces
Posted by st...@apache.org.
T3-954 Open workflow runs with spaces
newer robundle
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16444 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/8bb5341c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/8bb5341c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/8bb5341c
Branch: refs/heads/master
Commit: 8bb5341c0ab695c444d85c390062bafb0a7a3803
Parents: f770f06
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Dec 6 17:32:54 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Dec 6 17:32:54 2013 +0000
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/8bb5341c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3de4ba0..65bb0cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -620,6 +620,12 @@
<artifactId>databundle</artifactId>
<version>0.2.0</version>
</dependency>
+ <dependency>
+ <!-- Newer robundle to fix T3-954 -->
+ <groupId>org.purl.wf4ever.robundle</groupId>
+ <artifactId>robundle</artifactId>
+ <version>0.1.2-SNAPSHOT</version>
+ </dependency>
<!-- HTTP client needed by Data Bundle -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
[10/49] incubator-taverna-workbench-product git commit: Removed
eclipse's .project
Posted by st...@apache.org.
Removed eclipse's .project
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15222 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/76b67ac9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/76b67ac9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/76b67ac9
Branch: refs/heads/master
Commit: 76b67ac90cbad22e48f285388c2ddac6c50c480a
Parents: 4e8c4cf
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:23:01 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:23:01 2012 +0000
----------------------------------------------------------------------
taverna-workbench-product/.project | 23 -----------------------
1 file changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/76b67ac9/taverna-workbench-product/.project
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/.project b/taverna-workbench-product/.project
deleted file mode 100644
index 17b3c53..0000000
--- a/taverna-workbench-product/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>taverna-workbench-product</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
[36/49] incubator-taverna-workbench-product git commit: T3-887 Added
REST activity UI. T3-891 Added parallelize UI. T3-892 Added retry UI.
Posted by st...@apache.org.
T3-887 Added REST activity UI.
T3-891 Added parallelize UI.
T3-892 Added retry UI.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16147 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/2b888f1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/2b888f1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/2b888f1a
Branch: refs/heads/master
Commit: 2b888f1ababd0fd39a60e8c7cc2eebadffa4d870
Parents: ab0e746
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 16 13:18:14 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 16 13:18:14 2013 +0000
----------------------------------------------------------------------
pom.xml | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/2b888f1a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f72e98f..918fb68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,6 +373,11 @@
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>rest-activity-ui</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>rshell-activity-ui</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -504,12 +509,18 @@
<artifactId>menu-items</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
- <version>2.0-SNAPSHOT</version> </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>parallelize-ui</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>renderers-exts</artifactId>
<version>2.0-SNAPSHOT</version> </dependency> -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>retry-ui</artifactId>
- <version>2.0-SNAPSHOT</version> </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>retry-ui</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<!-- Taverna Platform -->
[39/49] incubator-taverna-workbench-product git commit: Newer
scufl2/databundle releases
Posted by st...@apache.org.
Newer scufl2/databundle releases
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16442 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/f770f067
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/f770f067
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/f770f067
Branch: refs/heads/master
Commit: f770f0671b9af9287181ec9c999f0a6440e26126
Parents: 535a63c
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Dec 4 17:08:21 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Dec 4 17:08:21 2013 +0000
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/f770f067/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ffa7cb9..3de4ba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -591,34 +591,34 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-api</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-rdfxml</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-t2flow</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-structural</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-correctness</artifactId>
- <version>0.13.0</version>
+ <version>0.13.1</version>
</dependency>
<!-- Data bundle -->
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.2.0</version>
</dependency>
<!-- HTTP client needed by Data Bundle -->
<dependency>
[18/49] incubator-taverna-workbench-product git commit: git-svn-id:
https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15763
bf327186-88b3-11dd-a302-d386e5130c1c
Posted by st...@apache.org.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15763 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/5703f932
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/5703f932
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/5703f932
Branch: refs/heads/master
Commit: 5703f932b273046ca8f53472e954f09ca9209399
Parents: 6718c2a
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon May 13 13:54:37 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon May 13 13:54:37 2013 +0000
----------------------------------------------------------------------
src/main/assembly/dependencies-component.xml | 33 +++++++++--------------
1 file changed, 12 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5703f932/src/main/assembly/dependencies-component.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/dependencies-component.xml b/src/main/assembly/dependencies-component.xml
index 539fa7b..486574c 100644
--- a/src/main/assembly/dependencies-component.xml
+++ b/src/main/assembly/dependencies-component.xml
@@ -3,39 +3,30 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
- <dependencySets>
+ <!-- <dependencySets>
<dependencySet>
<useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>/bundles</outputDirectory>
+ <outputDirectory>/lib/${artifact.groupId}</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<excludes>
- <!-- Exclude anything in lib/ (except configuration) -->
- <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
- <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
- <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
- <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
- <!-- Exclude ourselves -->
+ Exclude ourselves
<exclude>uk.org.taverna.workbench:taverna-workbench-product</exclude>
</excludes>
</dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>uk.org.taverna.workbench:taverna-workbench</include>
- <include>uk.org.taverna.osgi:osgi-launcher</include>
- <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
- <include>org.osgi:org.osgi.core</include>
- <include>org.eclipse.osgi:org.eclipse.osgi</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ </dependencySets> -->
<fileSets>
<fileSet>
<directory>src/main/etc</directory>
<fileMode>0755</fileMode>
<outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/taverna-tmp</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
+
</component>
\ No newline at end of file
[49/49] incubator-taverna-workbench-product git commit: travis.yml
Posted by st...@apache.org.
travis.yml
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/7e665d1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/7e665d1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/7e665d1b
Branch: refs/heads/master
Commit: 7e665d1bb2ef0f177a8840836fc8f6a52cf1e809
Parents: 32d9613
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Wed May 28 14:35:12 2014 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Wed May 28 14:35:12 2014 +0100
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/7e665d1b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..dff5f3a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1 @@
+language: java
[37/49] incubator-taverna-workbench-product git commit: T3-888 Added
XPath activity UI.
Posted by st...@apache.org.
T3-888 Added XPath activity UI.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16166 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/4a92404b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/4a92404b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/4a92404b
Branch: refs/heads/master
Commit: 4a92404bf6af9307b345f72e3435c78f6862e6cc
Parents: 2b888f1
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 16 16:47:09 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 16 16:47:09 2013 +0000
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4a92404b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 918fb68..49a826b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -406,6 +406,11 @@
<artifactId>unrecognized-activity-ui</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>xpath-activity-ui</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<!-- Taverna Workbench -->
<dependency>
[12/49] incubator-taverna-workbench-product git commit: ignores
corrected
Posted by st...@apache.org.
ignores corrected
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15227 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/b812414e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/b812414e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/b812414e
Branch: refs/heads/master
Commit: b812414e28bf8dc971f215190086cb89b0a34b93
Parents: e5b0204
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:37:40 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:37:40 2012 +0000
----------------------------------------------------------------------
.gitignore | Bin 94 -> 41 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/b812414e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7f653e7..456c7e0 100644
Binary files a/.gitignore and b/.gitignore differ
[32/49] incubator-taverna-workbench-product git commit: Added REST
activity. Added data management configuration UI.
Posted by st...@apache.org.
Added REST activity.
Added data management configuration UI.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16081 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/8dd432c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/8dd432c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/8dd432c4
Branch: refs/heads/master
Commit: 8dd432c4ca1028b661e0b65ca85a8e75d3ef7622
Parents: f7c3e5f
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 2 10:27:39 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 2 10:27:39 2013 +0000
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/8dd432c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c733048..c57b3e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,11 +316,11 @@
<artifactId>localworker-activity</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
- <!-- <dependency>
+ <dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>rest-activity</artifactId>
<version>2.0.1-SNAPSHOT</version>
- </dependency> -->
+ </dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>rshell-activity</artifactId>
@@ -495,6 +495,11 @@
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>data-management-config-ui</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>run-ui</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
[15/49] incubator-taverna-workbench-product git commit:
${scufl2.version} from taverna-parent
Posted by st...@apache.org.
${scufl2.version} from taverna-parent
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15243 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/2fbcf4a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/2fbcf4a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/2fbcf4a9
Branch: refs/heads/master
Commit: 2fbcf4a9ce2c66fd6c7e987582569e02a680f342
Parents: 85ae9c2
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Oct 9 08:43:08 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Oct 9 08:43:08 2012 +0000
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/2fbcf4a9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e8ba65..d33f46d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,22 +244,22 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-rdfxml</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-t2flow</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-structural</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>${scufl2.version}</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-correctness</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>${scufl2.version}</version>
</dependency>
<!-- Taverna Security -->
[08/49] incubator-taverna-workbench-product git commit: ignores
Posted by st...@apache.org.
ignores
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15219 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/9c70593a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/9c70593a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/9c70593a
Branch: refs/heads/master
Commit: 9c70593aa2a7fe2fa5b41b7e8e2cf3c47f537fa9
Parents: 0f8e6da
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:21:59 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:21:59 2012 +0000
----------------------------------------------------------------------
.gitignore | Bin 0 -> 110 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/9c70593a/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7b169e0
Binary files /dev/null and b/.gitignore differ
[23/49] incubator-taverna-workbench-product git commit: Updated
plugin dependency version.
Posted by st...@apache.org.
Updated plugin dependency version.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15980 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/c10cf9b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/c10cf9b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/c10cf9b9
Branch: refs/heads/master
Commit: c10cf9b9c4bf1e22bd1e27cd6a879226e4181ad9
Parents: 552fb28
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Jul 29 14:53:47 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Jul 29 14:53:47 2013 +0000
----------------------------------------------------------------------
pom.xml | 6 +++---
src/main/etc/taverna.bat | 2 +-
src/main/etc/taverna.sh | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/c10cf9b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 129f456..2cc281f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,17 +78,17 @@
<plugin>
<groupId>net.sf.taverna.t2.maven.plugins</groupId>
<artifactId>taverna-maven-plugin</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.3.1-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<buildNumber>${buildNumber}</buildNumber>
- <!-- <updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</updateSite> -->
+ <updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</updateSite>
<updateSite>http://localhost/~david/taverna/updates/taverna-workbench/</updateSite>
<pluginSite>http://localhost/~david/taverna/plugins/taverna-workbench/</pluginSite>
<frameworkConfigurations>
<frameworkConfiguration>
<name>org.osgi.framework.bootdelegation</name>
- <!-- <value>sun.*,com.sun.*,java.*,org.xml.*,org.w3c.*,apple.*,com.apple.*</value> -->
+ <value>sun.*,com.sun.*,java.*,org.xml.*,org.w3c.*,apple.*,com.apple.*</value>
<value>sun.*,com.sun.*,java.*,org.w3c.*,apple.*,com.apple.*</value>
</frameworkConfiguration>
<frameworkConfiguration>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/c10cf9b9/src/main/etc/taverna.bat
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.bat b/src/main/etc/taverna.bat
index 7da12f3..bc38e57 100644
--- a/src/main/etc/taverna.bat
+++ b/src/main/etc/taverna.bat
@@ -14,4 +14,4 @@ set ARGS=%ARGS% "-Dlog4j.configuration=file:///%TAVERNA_HOME%conf/log4j.properti
set ARGS=%ARGS% "-Djava.util.logging.config.file=%TAVERNA_HOME%conf/logging.properties"
set ARGS=%ARGS% "-Dtaverna.app.startup=%TAVERNA_HOME%."
-java %ARGS% -jar "%TAVERNA_HOME%lib\taverna-workbench-0.1.0-SNAPSHOT.jar" %*
+java %ARGS% -jar "%TAVERNA_HOME%lib\uk.org.taverna.workbench\taverna-workbench-0.1.0-SNAPSHOT.jar" %*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/c10cf9b9/src/main/etc/taverna.sh
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.sh b/src/main/etc/taverna.sh
index 60e54c8..d3ef159 100644
--- a/src/main/etc/taverna.sh
+++ b/src/main/etc/taverna.sh
@@ -17,7 +17,7 @@ if test -x "$JAVA_HOME/bin/java"; then
fi
# 300 MB memory, 140 MB for classes
-exec "$javabin" -Xmx300m -XX:MaxPermSize=140m \
+exec "$javabin" -Xmx300m -XX:MaxPermSize=400m \
"-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
"-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
"-Dtaverna.app.startup=$taverna_home" \
[25/49] incubator-taverna-workbench-product git commit: Added
explicit slf4j versions.
Posted by st...@apache.org.
Added explicit slf4j versions.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16056 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/b712b2b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/b712b2b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/b712b2b3
Branch: refs/heads/master
Commit: b712b2b38b81a2711b1ab05e1b3f80ae5156809a
Parents: 924969f
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Sep 16 16:44:32 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Sep 16 16:44:32 2013 +0000
----------------------------------------------------------------------
pom.xml | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/b712b2b3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01267ae..7b7a0ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,19 @@
</distributionManagement>
<dependencies>
+ <!-- Workaround for slf4j api/impl version mismatch -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.0</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- Spring DM -->
<dependency>
<groupId>net.sourceforge.cglib</groupId>
@@ -512,11 +525,6 @@
</dependency>
<dependency>
<groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-data-inmemory-impl</artifactId>
- <version>${platform.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
<artifactId>taverna-run-impl</artifactId>
<version>${platform.version}</version>
</dependency>
[41/49] incubator-taverna-workbench-product git commit: T3-954: newer
databundle
Posted by st...@apache.org.
T3-954: newer databundle
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16445 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/a4442796
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/a4442796
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/a4442796
Branch: refs/heads/master
Commit: a4442796e0f115491764a61341338832ad0de6a2
Parents: 8bb5341
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Dec 6 17:42:03 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Dec 6 17:42:03 2013 +0000
----------------------------------------------------------------------
pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/a4442796/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 65bb0cf..b9428ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -618,14 +618,8 @@
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
- <version>0.2.0</version>
- </dependency>
- <dependency>
- <!-- Newer robundle to fix T3-954 -->
- <groupId>org.purl.wf4ever.robundle</groupId>
- <artifactId>robundle</artifactId>
- <version>0.1.2-SNAPSHOT</version>
- </dependency>
+ <version>0.2.1</version>
+ </dependency>
<!-- HTTP client needed by Data Bundle -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
[04/49] incubator-taverna-workbench-product git commit: git-svn-id:
https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15176
bf327186-88b3-11dd-a302-d386e5130c1c
Posted by st...@apache.org.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15176 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/026c0de3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/026c0de3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/026c0de3
Branch: refs/heads/master
Commit: 026c0de3e46d092d92c041cad7080204a48d0ec7
Parents: 5af9b53
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Oct 1 16:24:06 2012 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Oct 1 16:24:06 2012 +0000
----------------------------------------------------------------------
taverna-workbench-product/pom.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/026c0de3/taverna-workbench-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/pom.xml b/taverna-workbench-product/pom.xml
index 40ce91a..36981b1 100644
--- a/taverna-workbench-product/pom.xml
+++ b/taverna-workbench-product/pom.xml
@@ -90,7 +90,7 @@
</dependency>
<!-- Taverna Activities -->
- <dependency>
+ <!-- <dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>all-activities</artifactId>
<version>${t2.activities.version}</version>
@@ -100,6 +100,21 @@
<artifactId>biomoby-activity</artifactId>
</exclusion>
</exclusions>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>beanshell-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomart-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>stringconstant-activity</artifactId>
+ <version>${t2.activities.version}</version>
</dependency>
<!-- Taverna Activities UI -->
[30/49] incubator-taverna-workbench-product git commit: Changed
update and plugin site locations. Removed references to taverna-parent
properties for versions.
Posted by st...@apache.org.
Changed update and plugin site locations.
Removed references to taverna-parent properties for versions.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16070 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/e9730ff3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/e9730ff3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/e9730ff3
Branch: refs/heads/master
Commit: e9730ff3765909e265b2df47e7d7ceb964e15de9
Parents: 361caa7
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Sep 27 16:16:42 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Sep 27 16:16:42 2013 +0000
----------------------------------------------------------------------
pom.xml | 180 +++++++++++++++++++++++++++++------------------------------
1 file changed, 89 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/e9730ff3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 85c229e..c733048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,18 +19,24 @@
</activation>
<properties>
<assembly.descriptor>src/main/assembly/developer-assembly.xml</assembly.descriptor>
+ <profile.updateSite>http://dev.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
+ <profile.pluginSite>http://dev.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
</properties>
</profile>
<profile>
<id>nightly</id>
<properties>
<assembly.descriptor>src/main/assembly/nightly-assembly.xml</assembly.descriptor>
+ <profile.updateSite>http://dev.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
+ <profile.pluginSite>http://dev.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
</properties>
</profile>
<profile>
<id>release</id>
<properties>
<assembly.descriptor>src/main/assembly/release-assembly.xml</assembly.descriptor>
+ <profile.updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
+ <profile.pluginSite>http://www.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
</properties>
</profile>
</profiles>
@@ -82,9 +88,8 @@
<extensions>true</extensions>
<configuration>
<buildNumber>${buildNumber}</buildNumber>
- <updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</updateSite>
- <updateSite>http://localhost/~david/taverna/updates/taverna-workbench/</updateSite>
- <pluginSite>http://localhost/~david/taverna/plugins/taverna-workbench/</pluginSite>
+ <updateSite>${profile.updateSite}</updateSite>
+ <pluginSite>${profile.pluginSite}</pluginSite>
<frameworkConfigurations>
<frameworkConfiguration>
<name>org.osgi.framework.bootdelegation</name>
@@ -169,15 +174,9 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.4</version>
+ <version>1.7.5</version>
</dependency>
- <!-- Spring DM -->
- <dependency>
- <groupId>net.sourceforge.cglib</groupId>
- <artifactId>com.springsource.net.sf.cglib</artifactId>
- <version>2.1.3</version>
- </dependency>
<!-- Explicit org.osgi.* with <scope>provided as these are also provided by
the felix osgi package.
@@ -194,31 +193,35 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
- <!-- -->
+ <!-- Spring DM -->
+ <dependency>
+ <groupId>net.sourceforge.cglib</groupId>
+ <artifactId>com.springsource.net.sf.cglib</artifactId>
+ <version>2.1.3</version>
+ </dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-annotation</artifactId>
- <version>${spring.dm.version}</version>
+ <version>2.0.0.M1</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-extender</artifactId>
- <version>${spring.dm.version}</version>
+ <version>2.0.0.M1</version>
</dependency>
+
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.context</artifactId>
- <version>${spring.version}</version>
+ <version>3.0.5.RELEASE</version>
</dependency>
<!-- Java Extension Implementations -->
- <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
- <version>2.2.0</version> </dependency> -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>com.springsource.javax.xml.bind</artifactId>
@@ -252,24 +255,24 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>com.springsource.javax.mail</artifactId>
- <version>${mail.version}</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>com.springsource.org.apache.commons.codec</artifactId>
- <version>${commons.codec.version}</version>
+ <version>1.4.0</version>
</dependency>
- <!-- OSGi Enterprise Services -->
+ <!-- OSGi Compendium Services -->
<dependency>
<groupId>uk.org.taverna.osgi.services</groupId>
<artifactId>xml-parser-service</artifactId>
- <version>${osgi.services.version}</version>
+ <version>0.1.1</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.osgi.services</groupId>
<artifactId>xml-transformer-service</artifactId>
- <version>${osgi.services.version}</version>
+ <version>0.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -286,127 +289,124 @@
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>apiconsumer-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>beanshell-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomart-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>dataflow-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<!-- <dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>external-tool-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>localworker-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<!-- <dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>rest-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>rshell-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>soaplab-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>spreadsheet-import-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>stringconstant-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>wsdl-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>xpath-activity</artifactId>
- <version>${t2.activities.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<!-- Taverna Activities UI -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>apiconsumer-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>beanshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>biomart-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>dataflow-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>localworker-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>rshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>spreadsheet-import-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>soaplab-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>wsdl-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>unrecognized-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- Taverna Workbench -->
@@ -418,52 +418,52 @@
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>workbench-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>activity-palette-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>configuration-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>edits-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>file-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>menu-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>renderers-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>selection-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>httpproxy-config</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>plugin-manager</artifactId>
- <version>${t2.ui.impl.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
@@ -471,92 +471,90 @@
<version>2.0.1-SNAPSHOT</version>
</dependency>
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-impl</groupId> <artifactId>report-impl</artifactId>
- <version>${t2.ui.impl.version}</version> </dependency> -->
+ <version>2.0-SNAPSHOT</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>perspective-design</artifactId>
- <version>${t2.ui.components.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>perspective-results</artifactId>
- <version>${t2.ui.components.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>contextual-views</artifactId>
- <version>${t2.ui.components.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>credential-manager-ui</artifactId>
- <version>${t2.ui.components.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>run-ui</artifactId>
- <version>${t2.ui.components.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>loop-ui</artifactId>
- <version>${t2.ui.exts.version}</version> </dependency> -->
+ <version>2.0-SNAPSHOT</version> </dependency> -->
<groupId>net.sf.taverna.t2.ui-exts</groupId>
<artifactId>menu-items</artifactId>
- <version>${t2.ui.exts.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
- <version>${t2.ui.exts.version}</version> </dependency> -->
+ <version>2.0-SNAPSHOT</version> </dependency> -->
<!-- <dependency>
<groupId>net.sf.taverna.t2.ui-exts</groupId>
<artifactId>renderers-exts</artifactId>
- <version>${t2.ui.exts.version}</version>
+ <version>2.0-SNAPSHOT</version>
</dependency> -->
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>retry-ui</artifactId>
- <version>${t2.ui.exts.version}</version> </dependency> -->
+ <version>2.0-SNAPSHOT</version> </dependency> -->
<!-- Taverna Platform -->
<dependency>
<groupId>uk.org.taverna.platform</groupId>
<artifactId>taverna-capability-impl</artifactId>
- <version>${platform.version}</version>
+ <version>0.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.platform</groupId>
<artifactId>taverna-run-impl</artifactId>
- <version>${platform.version}</version>
+ <version>0.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.platform</groupId>
<artifactId>taverna-execution-impl</artifactId>
- <version>${platform.version}</version>
+ <version>0.1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.platform</groupId>
<artifactId>taverna-execution-local</artifactId>
- <version>${platform.version}</version>
+ <version>0.1.3-SNAPSHOT</version>
</dependency>
- <!-- Taverna Configuration -->
+ <!-- Taverna Commons -->
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
<artifactId>taverna-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.configuration</groupId>
<artifactId>taverna-database-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
-
- <!-- Taverna Commons -->
<dependency>
<groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-download-impl</artifactId>
@@ -582,22 +580,22 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-rdfxml</artifactId>
- <version>${scufl2.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-t2flow</artifactId>
- <version>${scufl2.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-structural</artifactId>
- <version>${scufl2.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-correctness</artifactId>
- <version>${scufl2.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- Data bundle -->
@@ -631,41 +629,41 @@
<dependency>
<groupId>net.sf.taverna.t2.security</groupId>
<artifactId>credential-manager-impl</artifactId>
- <version>${t2.security.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<!-- Taverna Workflow Engine -->
<dependency>
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>workflowmodel-impl</artifactId>
- <version>${t2.core.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>workflowmodel-core-extensions</artifactId>
- <version>${t2.core.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>reference-impl</artifactId>
- <version>${t2.core.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>reference-core-extensions</artifactId>
- <version>${t2.core.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<!-- Taverna Provenance -->
<dependency>
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>provenance-derby</artifactId>
- <version>${t2.core.provenance.derby.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.core</groupId>
<artifactId>provenance-mysql</artifactId>
- <version>${t2.core.provenance.mysql.version}</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
[27/49] incubator-taverna-workbench-product git commit: newer slf4j,
not excluding httpcomponents
Posted by st...@apache.org.
newer slf4j, not excluding httpcomponents
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16061 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/bcf9b070
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/bcf9b070
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/bcf9b070
Branch: refs/heads/master
Commit: bcf9b07064a9b506ba72255d77fe734edb233b82
Parents: 046e5c5
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Sep 20 11:39:04 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Sep 20 11:39:04 2013 +0000
----------------------------------------------------------------------
pom.xml | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/bcf9b070/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e20789d..b75fa97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,12 +163,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.0</version>
+ <version>1.7.5</version>
<scope>runtime</scope>
</dependency>
@@ -605,37 +605,27 @@
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
<version>0.1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <!-- HTTP client needed by Data Bundle -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>com.springsource.org.apache.httpcomponents.httpclient-cache</artifactId>
- <version>4.2.1</version>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>com.springsource.org.apache.httpcomponents.httpclient</artifactId>
- <version>4.2.1</version>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.2.5</version>
</dependency>
+ <!-- Jena bundle needed by jsonld-java-jena -->
+ <!-- See https://github.com/stain/jena/tree/jena-bundle/jena-bundle -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>com.springsource.org.apache.httpcomponents.httpcore</artifactId>
- <version>4.2.1</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-bundle</artifactId>
+ <version>2.11.0-SNAPSHOT</version>
</dependency>
+
<!-- Taverna Security -->
<dependency>
[06/49] incubator-taverna-workbench-product git commit: Removed
non-building dependencies.
Posted by st...@apache.org.
Removed non-building dependencies.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15217 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/43a43890
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/43a43890
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/43a43890
Branch: refs/heads/master
Commit: 43a4389089015cf506b6cf80d49654cdcb76b103
Parents: 8c0d141
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:20:19 2012 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:20:19 2012 +0000
----------------------------------------------------------------------
taverna-workbench-product/pom.xml | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/43a43890/taverna-workbench-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/pom.xml b/taverna-workbench-product/pom.xml
index 27b0920..e976ff7 100644
--- a/taverna-workbench-product/pom.xml
+++ b/taverna-workbench-product/pom.xml
@@ -95,16 +95,11 @@
<!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
<version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
- <dependency>
+ <!-- <dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>beanshell-activity</artifactId>
<version>${t2.activities.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomart-activity</artifactId>
- <version>${t2.activities.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>stringconstant-activity</artifactId>
@@ -115,16 +110,11 @@
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
<version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
- <dependency>
+ <!-- <dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>beanshell-activity-ui</artifactId>
<version>${t2.ui.activities.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>biomart-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
@@ -167,11 +157,11 @@
<artifactId>menu-impl</artifactId>
<version>${t2.ui.impl.version}</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>report-impl</artifactId>
<version>${t2.ui.impl.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
@@ -184,7 +174,7 @@
<version>${t2.ui.components.version}</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>net.sf.taverna.t2.ui-exts</groupId>
<artifactId>menu-items</artifactId>
<version>${t2.ui.exts.version}</version>
@@ -203,7 +193,7 @@
<groupId>net.sf.taverna.t2.ui-exts</groupId>
<artifactId>retry-ui</artifactId>
<version>${t2.ui.exts.version}</version>
- </dependency>
+ </dependency> -->
<!-- Taverna Platform -->
[44/49] incubator-taverna-workbench-product git commit: Bumped up the
version of xpath activity after fixing T3-883.
Posted by st...@apache.org.
Bumped up the version of xpath activity after fixing T3-883.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16459 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/64fa3952
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/64fa3952
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/64fa3952
Branch: refs/heads/master
Commit: 64fa3952395564769065aa0879c4977d99ebfc6e
Parents: 4aefcf0
Author: alex@mygrid.org.uk <al...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Dec 13 12:19:22 2013 +0000
Committer: alex@mygrid.org.uk <al...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Dec 13 12:19:22 2013 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/64fa3952/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5754e76..fccecff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -643,7 +643,7 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-t2flow</artifactId>
- <version>0.13.1</version>
+ <version>0.13.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
[19/49] incubator-taverna-workbench-product git commit: Changed
executable jar location.
Posted by st...@apache.org.
Changed executable jar location.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15764 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/697be3aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/697be3aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/697be3aa
Branch: refs/heads/master
Commit: 697be3aa48e7bf59b95f024f0bdda737a4dbd994
Parents: 5703f93
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon May 13 13:55:16 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon May 13 13:55:16 2013 +0000
----------------------------------------------------------------------
src/main/etc/taverna.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/697be3aa/src/main/etc/taverna.sh
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.sh b/src/main/etc/taverna.sh
index 36a24d3..60e54c8 100644
--- a/src/main/etc/taverna.sh
+++ b/src/main/etc/taverna.sh
@@ -21,5 +21,5 @@ exec "$javabin" -Xmx300m -XX:MaxPermSize=140m \
"-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
"-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
"-Dtaverna.app.startup=$taverna_home" \
- -jar "$taverna_home/lib/taverna-workbench-0.1.0-SNAPSHOT.jar" \
+ -jar "$taverna_home/lib/uk.org.taverna.workbench/taverna-workbench-0.1.0-SNAPSHOT.jar" \
${1+"$@"}
[21/49] incubator-taverna-workbench-product git commit: Added
svnignore.
Posted by st...@apache.org.
Added svnignore.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15766 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/f1820072
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/f1820072
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/f1820072
Branch: refs/heads/master
Commit: f18200728607c2510c7db350b0c3c70d136ea584
Parents: 568154a
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon May 13 13:56:50 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon May 13 13:56:50 2013 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[24/49] incubator-taverna-workbench-product git commit: org.osgi.*
provided
Posted by st...@apache.org.
org.osgi.* provided
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15998 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/924969f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/924969f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/924969f0
Branch: refs/heads/master
Commit: 924969f069e9c6217336ae9aa900f8b50ea49a9e
Parents: c10cf9b
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Aug 2 15:49:08 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Aug 2 15:49:08 2013 +0000
----------------------------------------------------------------------
pom.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/924969f0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cc281f..01267ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,45 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ net.sf.taverna.t2.maven.plugins
+ </groupId>
+ <artifactId>
+ taverna-maven-plugin
+ </artifactId>
+ <versionRange>
+ [0.3.1-SNAPSHOT,)
+ </versionRange>
+ <goals>
+ <goal>
+ profile-generate
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<distributionManagement>
<snapshotRepository>
@@ -126,6 +165,27 @@
<artifactId>com.springsource.net.sf.cglib</artifactId>
<version>2.1.3</version>
</dependency>
+
+ <!-- Explicit org.osgi.* with <scope>provided as these are also provided by
+ the felix osgi package.
+ Avoids:
+ Caused by: java.lang.SecurityException: class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information does not match signer information of other classes in the same package
+ -->
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- -->
+
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-annotation</artifactId>
[17/49] incubator-taverna-workbench-product git commit: Build
assemblies release/dev/nightly
Posted by st...@apache.org.
Build assemblies release/dev/nightly
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15253 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/6718c2a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/6718c2a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/6718c2a7
Branch: refs/heads/master
Commit: 6718c2a756aed9836b7000222866dc0783464c23
Parents: 181f00a
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 10 11:54:08 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 10 11:54:08 2012 +0000
----------------------------------------------------------------------
pom.xml | 246 ++++++++++++++++------
src/main/assembly/dependencies-component.xml | 41 ++++
src/main/assembly/developer-assembly.xml | 13 ++
src/main/assembly/nightly-assembly.xml | 15 ++
src/main/assembly/release-assembly.xml | 43 +---
5 files changed, 259 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index edb4857..78b6286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,171 @@
<groupId>uk.org.taverna.workbench</groupId>
<artifactId>taverna-workbench-product</artifactId>
<name>Taverna Workbench Product</name>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
+ <profiles>
+ <profile>
+ <id>developer</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,yyyyMMdd}T{0,date,HHmm}
+ </format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/developer-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ <profile>
+ <id>nightly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,yyyyMMdd}
+ </format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/nightly-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,yyyyMMdd}
+ </format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/release-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <build>
+ <finalName>taverna-workbench-${project.version}</finalName>
+ </build>
+
<dependencies>
<!-- Spring DM -->
<dependency>
@@ -35,7 +199,7 @@
</dependency>
<!-- Java Extension Implementations -->
- <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
<version>2.2.0</version> </dependency> -->
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -91,14 +255,11 @@
</dependency>
<!-- Taverna Activities -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>beanshell-activity</artifactId>
- <version>${t2.activities.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>beanshell-activity</artifactId>
+ <version>${t2.activities.version}</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>stringconstant-activity</artifactId>
@@ -106,14 +267,11 @@
</dependency>
<!-- Taverna Activities UI -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>beanshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>beanshell-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
@@ -156,11 +314,8 @@
<artifactId>menu-impl</artifactId>
<version>${t2.ui.impl.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>report-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-impl</groupId> <artifactId>report-impl</artifactId>
+ <version>${t2.ui.impl.version}</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
@@ -173,26 +328,13 @@
<version>${t2.ui.components.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>menu-items</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>loop-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>parallelize-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>retry-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>menu-items</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>loop-ui</artifactId> <version>${t2.ui.exts.version}</version>
+ </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>retry-ui</artifactId> <version>${t2.ui.exts.version}</version>
+ </dependency> -->
<!-- Taverna Platform -->
@@ -304,28 +446,6 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/release-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<repositories>
<repository>
<releases />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/dependencies-component.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/dependencies-component.xml b/src/main/assembly/dependencies-component.xml
new file mode 100644
index 0000000..539fa7b
--- /dev/null
+++ b/src/main/assembly/dependencies-component.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>/bundles</outputDirectory>
+ <excludes>
+ <!-- Exclude anything in lib/ (except configuration) -->
+ <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
+ <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
+ <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
+ <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
+ <!-- Exclude ourselves -->
+ <exclude>uk.org.taverna.workbench:taverna-workbench-product</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>uk.org.taverna.workbench:taverna-workbench</include>
+ <include>uk.org.taverna.osgi:osgi-launcher</include>
+ <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
+ <include>org.osgi:org.osgi.core</include>
+ <include>org.eclipse.osgi:org.eclipse.osgi</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/developer-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/developer-assembly.xml b/src/main/assembly/developer-assembly.xml
new file mode 100644
index 0000000..ae2a7c3
--- /dev/null
+++ b/src/main/assembly/developer-assembly.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>dev</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <componentDescriptors>
+ <componentDescriptor>dependencies-component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/nightly-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/nightly-assembly.xml b/src/main/assembly/nightly-assembly.xml
new file mode 100644
index 0000000..d5b631d
--- /dev/null
+++ b/src/main/assembly/nightly-assembly.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>nightly</id>
+ <baseDirectory>taverna-workbench-${project.version}-${buildNumber}-nightly</baseDirectory>
+ <formats>
+ <!-- <format>dir</format> -->
+ <format>zip</format>
+ </formats>
+ <componentDescriptors>
+ <componentDescriptor>dependencies-component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/6718c2a7/src/main/assembly/release-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/release-assembly.xml b/src/main/assembly/release-assembly.xml
index 5687d70..a83f9b8 100644
--- a/src/main/assembly/release-assembly.xml
+++ b/src/main/assembly/release-assembly.xml
@@ -3,42 +3,13 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
+ <id>release</id>
+ <baseDirectory>taverna-workbench-${project.version}</baseDirectory>
<formats>
- <format>dir</format>
- <!-- <format>zip</format> -->
+ <!-- <format>dir</format> -->
+ <format>zip</format>
</formats>
-
- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>/bundles</outputDirectory>
- <excludes>
- <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
- <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
- <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
- <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>uk.org.taverna.workbench:taverna-workbench</include>
- <include>uk.org.taverna.osgi:osgi-launcher</include>
- <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
- <include>org.osgi:org.osgi.core</include>
- <include>org.eclipse.osgi:org.eclipse.osgi</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>src/main/etc</directory>
- <fileMode>0755</fileMode>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
+ <componentDescriptors>
+ <componentDescriptor>dependencies-component.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
[16/49] incubator-taverna-workbench-product git commit: Bump version
to 3.0.1-SNAPSHOT
Posted by st...@apache.org.
Bump version to 3.0.1-SNAPSHOT
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15246 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/181f00a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/181f00a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/181f00a5
Branch: refs/heads/master
Commit: 181f00a5d69188680d5620fc95fd9f57d50a4337
Parents: 2fbcf4a
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Oct 9 08:47:06 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Oct 9 08:47:06 2012 +0000
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/181f00a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d33f46d..edb4857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,6 @@
</parent>
<groupId>uk.org.taverna.workbench</groupId>
<artifactId>taverna-workbench-product</artifactId>
- <version>3.0.0-SNAPSHOT</version>
<name>Taverna Workbench Product</name>
<packaging>pom</packaging>
<dependencies>
[46/49] incubator-taverna-workbench-product git commit: Some very
brief instructions on how to install the Taverna 3 libraries so that you can
run the workbench
Posted by st...@apache.org.
Some very brief instructions on how to install the Taverna 3 libraries so that you can run the
workbench
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/e5a0ad03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/e5a0ad03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/e5a0ad03
Branch: refs/heads/master
Commit: e5a0ad035520ad2a63a68a398c15f61a94a23725
Parents: c32ae13
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Fri May 2 16:37:05 2014 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Fri May 2 16:37:05 2014 +0100
----------------------------------------------------------------------
README.txt | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/e5a0ad03/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..ee8b7ca
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,8 @@
+How to install Taverna 3 Worbench and required libraries
+
+Pre-requisites: Maven 3, Java 7`
+
+git checkout devel
+mvn install
+change directory to target/taverna-workbench-3.0.1-SNAPSHOT-dev/taverna-workbench-3.0.1-SNAPSHOT
+run taverna.sh (Linux/OSX) or taverna.bat (windows)
[38/49] incubator-taverna-workbench-product git commit: Changed
databundle version to 0.2.0 and scufl2 version to 0.13.0.
Posted by st...@apache.org.
Changed databundle version to 0.2.0 and scufl2 version to 0.13.0.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16290 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/535a63c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/535a63c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/535a63c0
Branch: refs/heads/master
Commit: 535a63c003edcef8da0cadf7f9e1048ecf5fbda9
Parents: 4a92404
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Thu Nov 7 12:31:44 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Thu Nov 7 12:31:44 2013 +0000
----------------------------------------------------------------------
pom.xml | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/535a63c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 49a826b..ffa7cb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -590,30 +590,35 @@
<!-- Scufl2 -->
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-api</artifactId>
+ <version>0.13.0</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-rdfxml</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-t2flow</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-structural</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-correctness</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.13.0</version>
</dependency>
<!-- Data bundle -->
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.2.0-SNAPSHOT</version>
</dependency>
<!-- HTTP client needed by Data Bundle -->
<dependency>
[43/49] incubator-taverna-workbench-product git commit: Added
deployment repository for snapshots.
Posted by st...@apache.org.
Added deployment repository for snapshots.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16455 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/4aefcf0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/4aefcf0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/4aefcf0b
Branch: refs/heads/master
Commit: 4aefcf0bc0c77e1658e69d2554bc57e8a0407210
Parents: 7bb803c
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Dec 11 15:16:08 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Dec 11 15:16:08 2013 +0000
----------------------------------------------------------------------
pom.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4aefcf0b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5035b8..5754e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,10 @@
<id>dev</id>
<url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
</repository>
+ <snapshotRepository>
+ <id>dev</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
+ </snapshotRepository>
</distributionManagement>
</profile>
<profile>
@@ -41,6 +45,10 @@
<id>beta</id>
<url>file:///local/www/taverna/updates/3/workbench/3.0/beta</url>
</repository>
+ <snapshotRepository>
+ <id>beta</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/beta</url>
+ </snapshotRepository>
</distributionManagement>
</profile>
<profile>
@@ -55,6 +63,10 @@
<id>stable</id>
<url>file:///local/www/taverna/updates/3/workbench/3.0/stable</url>
</repository>
+ <snapshotRepository>
+ <id>stable</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/stable</url>
+ </snapshotRepository>
</distributionManagement>
</profile>
<profile>
@@ -69,6 +81,10 @@
<id>dev</id>
<url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
</repository>
+ <snapshotRepository>
+ <id>dev</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
+ </snapshotRepository>
</distributionManagement>
</profile>
</profiles>
[11/49] incubator-taverna-workbench-product git commit: tidy gitignore
Posted by st...@apache.org.
tidy gitignore
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15223 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/e5b0204e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/e5b0204e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/e5b0204e
Branch: refs/heads/master
Commit: e5b0204e94a86b196188c8d01e6bdc9a948cdd03
Parents: 76b67ac
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:23:15 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:23:15 2012 +0000
----------------------------------------------------------------------
.gitignore | Bin 110 -> 94 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/e5b0204e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7b169e0..7f653e7 100644
Binary files a/.gitignore and b/.gitignore differ
[09/49] incubator-taverna-workbench-product git commit: Moved up from
redundant subfolder
Posted by st...@apache.org.
Moved up from redundant subfolder
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15220 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/4e8c4cf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/4e8c4cf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/4e8c4cf7
Branch: refs/heads/master
Commit: 4e8c4cf76bd1271d7e79aa039f2c738f70d9a041
Parents: 9c70593
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Oct 5 14:22:23 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Oct 5 14:22:23 2012 +0000
----------------------------------------------------------------------
pom.xml | 364 +++++++++++++++++++
src/main/assembly/release-assembly.xml | 44 +++
src/main/etc/conf/log4j.properties | 14 +
src/main/etc/conf/logging.properties | 11 +
src/main/etc/conf/taverna.app.properties | 2 +
src/main/etc/taverna.bat | 17 +
src/main/etc/taverna.sh | 25 ++
taverna-workbench-product/pom.xml | 364 -------------------
.../src/main/assembly/release-assembly.xml | 44 ---
.../src/main/etc/conf/log4j.properties | 14 -
.../src/main/etc/conf/logging.properties | 11 -
.../src/main/etc/conf/taverna.app.properties | 2 -
.../src/main/etc/taverna.bat | 17 -
.../src/main/etc/taverna.sh | 25 --
14 files changed, 477 insertions(+), 477 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..e976ff7
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,364 @@
+<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>
+ <artifactId>taverna-parent</artifactId>
+ <groupId>net.sf.taverna</groupId>
+ <version>3.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>uk.org.taverna.workbench</groupId>
+ <artifactId>taverna-workbench-product</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <name>Taverna Workbench Product</name>
+ <packaging>pom</packaging>
+ <dependencies>
+ <!-- Spring DM -->
+ <dependency>
+ <groupId>net.sourceforge.cglib</groupId>
+ <artifactId>com.springsource.net.sf.cglib</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ <version>${spring.dm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.dm.version}</version>
+ </dependency>
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <!-- Java Extension Implementations -->
+ <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <version>2.2.0</version> </dependency> -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>com.springsource.javax.xml.bind</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>com.springsource.javax.activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency> <!-- required by bsh -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>com.springsource.javax.jms</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>com.springsource.javax.xml.soap</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>com.springsource.javax.xml.stream</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>com.springsource.javax.mail</artifactId>
+ <version>${mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+
+ <!-- OSGi Enterprise Services -->
+ <dependency>
+ <groupId>uk.org.taverna.osgi.services</groupId>
+ <artifactId>xml-parser-service</artifactId>
+ <version>${osgi.services.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.osgi.services</groupId>
+ <artifactId>xml-transformer-service</artifactId>
+ <version>${osgi.services.version}</version>
+ </dependency>
+
+ <!-- Taverna Activities -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>beanshell-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>stringconstant-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+
+ <!-- Taverna Activities UI -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>beanshell-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>stringconstant-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+
+ <!-- Taverna Workbench -->
+ <dependency>
+ <groupId>uk.org.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>workbench-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>activity-palette-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>configuration-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>edits-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>file-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>menu-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>report-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency> -->
+
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>perspective-design</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>contextual-views</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
+
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>menu-items</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>loop-ui</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>parallelize-ui</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>retry-ui</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency> -->
+
+
+ <!-- Taverna Platform -->
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-capability-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-data-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-run-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-execution-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-execution-local</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+
+ <!-- Taverna Configuration -->
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-configuration-impl</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-app-configuration-impl</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-database-configuration-impl</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+
+ <!-- Scufl2 -->
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-rdfxml</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-t2flow</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-validation-structural</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-validation-correctness</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Taverna Security -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.security</groupId>
+ <artifactId>credential-manager-impl</artifactId>
+ <version>${t2.security.version}</version>
+ </dependency>
+
+ <!-- Taverna Workflow Engine -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>workflowmodel-impl</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>workflowmodel-core-extensions</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>reference-impl</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>reference-core-extensions</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+
+ <!-- Taverna Provenance -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>provenance-derby</artifactId>
+ <version>${t2.core.provenance.derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>provenance-mysql</artifactId>
+ <version>${t2.core.provenance.mysql.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/release-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>mygrid-repository</id>
+ <name>myGrid Repository</name>
+ <url>http://www.mygrid.org.uk/maven/repository</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ <id>mygrid-snapshot-repository</id>
+ <name>myGrid Snapshot Repository</name>
+ <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
+ </repository>
+ <repository>
+ <id>spring-maven-milestone</id>
+ <name>Springframework Maven Repository</name>
+ <url>http://maven.springframework.org/milestone</url>
+ </repository>
+ <repository>
+ <id>com.springsource.repository.bundles.milestone</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
+ <url>http://repository.springsource.com/maven/bundles/milestone</url>
+ </repository>
+ <repository>
+ <id>OPS4J</id>
+ <url>http://repository.ops4j.org/maven2</url>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/src/main/assembly/release-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/release-assembly.xml b/src/main/assembly/release-assembly.xml
new file mode 100644
index 0000000..5687d70
--- /dev/null
+++ b/src/main/assembly/release-assembly.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ <!-- <format>zip</format> -->
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>/bundles</outputDirectory>
+ <excludes>
+ <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
+ <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
+ <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
+ <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>uk.org.taverna.workbench:taverna-workbench</include>
+ <include>uk.org.taverna.osgi:osgi-launcher</include>
+ <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
+ <include>org.osgi:org.osgi.core</include>
+ <include>org.eclipse.osgi:org.eclipse.osgi</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/src/main/etc/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/src/main/etc/conf/log4j.properties b/src/main/etc/conf/log4j.properties
new file mode 100644
index 0000000..5014f2b
--- /dev/null
+++ b/src/main/etc/conf/log4j.properties
@@ -0,0 +1,14 @@
+# By default, WARN (our external libraries)
+log4j.rootLogger=INFO, CONSOLE
+
+# Get rid of some xml sec warnings
+log4j.logger.org.apache.ws.security=ERROR
+log4j.logger.org.apache.commons.httpclient=ERROR
+
+# Default output to console is restrictive
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n
+
+# Output WARN and above to console -
+log4j.appender.CONSOLE.Threshold=ERROR
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/src/main/etc/conf/logging.properties
----------------------------------------------------------------------
diff --git a/src/main/etc/conf/logging.properties b/src/main/etc/conf/logging.properties
new file mode 100644
index 0000000..aa77e69
--- /dev/null
+++ b/src/main/etc/conf/logging.properties
@@ -0,0 +1,11 @@
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
+
+.level = ALL
+
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+java.util.logging.FileHandler.level = ALL
+java.util.logging.FileHandler.count = 5
+java.util.logging.FileHandler.limit = 1048576
+java.util.logging.FileHandler.limit = %h/.taverna-3.0.0/logs/taverna-3.0.0.log
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/src/main/etc/conf/taverna.app.properties
----------------------------------------------------------------------
diff --git a/src/main/etc/conf/taverna.app.properties b/src/main/etc/conf/taverna.app.properties
new file mode 100644
index 0000000..9634438
--- /dev/null
+++ b/src/main/etc/conf/taverna.app.properties
@@ -0,0 +1,2 @@
+taverna.app.name=taverna-workbench-3.0.0
+taverna.app.title=Taverna Workbench 3.0.0
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/src/main/etc/taverna.bat
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.bat b/src/main/etc/taverna.bat
new file mode 100644
index 0000000..7da12f3
--- /dev/null
+++ b/src/main/etc/taverna.bat
@@ -0,0 +1,17 @@
+@ECHO OFF
+
+REM Taverna startup script
+
+REM distribution directory
+set TAVERNA_HOME=%~dp0
+
+
+REM 300 MB memory, 140 MB for classes
+set ARGS=-Xmx300m -XX:MaxPermSize=140m
+
+REM Taverna system properties
+set ARGS=%ARGS% "-Dlog4j.configuration=file:///%TAVERNA_HOME%conf/log4j.properties"
+set ARGS=%ARGS% "-Djava.util.logging.config.file=%TAVERNA_HOME%conf/logging.properties"
+set ARGS=%ARGS% "-Dtaverna.app.startup=%TAVERNA_HOME%."
+
+java %ARGS% -jar "%TAVERNA_HOME%lib\taverna-workbench-0.1.0-SNAPSHOT.jar" %*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/src/main/etc/taverna.sh
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.sh b/src/main/etc/taverna.sh
new file mode 100644
index 0000000..36a24d3
--- /dev/null
+++ b/src/main/etc/taverna.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+## resolve links - $0 may be a symlink
+prog="$0"
+
+real_path() {
+ readlink -m "$1" 2>/dev/null || python -c 'import os,sys;print os.path.realpath(sys.argv[1])' "$1"
+}
+
+realprog=`real_path "$prog"`
+taverna_home=`dirname "$realprog"`
+javabin=java
+if test -x "$JAVA_HOME/bin/java"; then
+ javabin="$JAVA_HOME/bin/java"
+fi
+
+# 300 MB memory, 140 MB for classes
+exec "$javabin" -Xmx300m -XX:MaxPermSize=140m \
+ "-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
+ "-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
+ "-Dtaverna.app.startup=$taverna_home" \
+ -jar "$taverna_home/lib/taverna-workbench-0.1.0-SNAPSHOT.jar" \
+ ${1+"$@"}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/pom.xml b/taverna-workbench-product/pom.xml
deleted file mode 100644
index e976ff7..0000000
--- a/taverna-workbench-product/pom.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<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>
- <artifactId>taverna-parent</artifactId>
- <groupId>net.sf.taverna</groupId>
- <version>3.0.1-SNAPSHOT</version>
- </parent>
- <groupId>uk.org.taverna.workbench</groupId>
- <artifactId>taverna-workbench-product</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <name>Taverna Workbench Product</name>
- <packaging>pom</packaging>
- <dependencies>
- <!-- Spring DM -->
- <dependency>
- <groupId>net.sourceforge.cglib</groupId>
- <artifactId>com.springsource.net.sf.cglib</artifactId>
- <version>2.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-annotation</artifactId>
- <version>${spring.dm.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- <version>${spring.dm.version}</version>
- </dependency>
- <!-- Spring -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.context</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <!-- Java Extension Implementations -->
- <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
- <version>2.2.0</version> </dependency> -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>com.springsource.javax.xml.bind</artifactId>
- <version>2.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>com.springsource.javax.activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency> <!-- required by bsh -->
- <groupId>javax.servlet</groupId>
- <artifactId>com.springsource.javax.servlet</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>com.springsource.javax.jms</artifactId>
- <version>1.1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>com.springsource.javax.xml.soap</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>com.springsource.javax.xml.stream</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>com.springsource.javax.mail</artifactId>
- <version>${mail.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.codec</artifactId>
- <version>${commons.codec.version}</version>
- </dependency>
-
- <!-- OSGi Enterprise Services -->
- <dependency>
- <groupId>uk.org.taverna.osgi.services</groupId>
- <artifactId>xml-parser-service</artifactId>
- <version>${osgi.services.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.osgi.services</groupId>
- <artifactId>xml-transformer-service</artifactId>
- <version>${osgi.services.version}</version>
- </dependency>
-
- <!-- Taverna Activities -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>beanshell-activity</artifactId>
- <version>${t2.activities.version}</version>
- </dependency> -->
- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>stringconstant-activity</artifactId>
- <version>${t2.activities.version}</version>
- </dependency>
-
- <!-- Taverna Activities UI -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>beanshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
- </dependency> -->
- <dependency>
- <groupId>net.sf.taverna.t2.ui-activities</groupId>
- <artifactId>stringconstant-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version>
- </dependency>
-
- <!-- Taverna Workbench -->
- <dependency>
- <groupId>uk.org.taverna.workbench</groupId>
- <artifactId>taverna-workbench</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>workbench-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>activity-palette-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>configuration-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>edits-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>file-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>menu-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-impl</groupId>
- <artifactId>report-impl</artifactId>
- <version>${t2.ui.impl.version}</version>
- </dependency> -->
-
- <dependency>
- <groupId>net.sf.taverna.t2.ui-components</groupId>
- <artifactId>perspective-design</artifactId>
- <version>${t2.ui.components.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-components</groupId>
- <artifactId>contextual-views</artifactId>
- <version>${t2.ui.components.version}</version>
- </dependency>
-
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>menu-items</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>loop-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>parallelize-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>retry-ui</artifactId>
- <version>${t2.ui.exts.version}</version>
- </dependency> -->
-
-
- <!-- Taverna Platform -->
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-capability-impl</artifactId>
- <version>${platform.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-data-impl</artifactId>
- <version>${platform.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-run-impl</artifactId>
- <version>${platform.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-execution-impl</artifactId>
- <version>${platform.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-execution-local</artifactId>
- <version>${platform.version}</version>
- </dependency>
-
- <!-- Taverna Configuration -->
- <dependency>
- <groupId>uk.org.taverna.configuration</groupId>
- <artifactId>taverna-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.configuration</groupId>
- <artifactId>taverna-app-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.configuration</groupId>
- <artifactId>taverna-database-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
- </dependency>
-
- <!-- Scufl2 -->
- <dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-rdfxml</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-t2flow</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation-structural</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation-correctness</artifactId>
- <version>0.9.3-SNAPSHOT</version>
- </dependency>
-
- <!-- Taverna Security -->
- <dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager-impl</artifactId>
- <version>${t2.security.version}</version>
- </dependency>
-
- <!-- Taverna Workflow Engine -->
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-impl</artifactId>
- <version>${t2.core.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>workflowmodel-core-extensions</artifactId>
- <version>${t2.core.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-impl</artifactId>
- <version>${t2.core.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>reference-core-extensions</artifactId>
- <version>${t2.core.version}</version>
- </dependency>
-
- <!-- Taverna Provenance -->
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>provenance-derby</artifactId>
- <version>${t2.core.provenance.derby.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
- <artifactId>provenance-mysql</artifactId>
- <version>${t2.core.provenance.mysql.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/release-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- <repository>
- <id>spring-maven-milestone</id>
- <name>Springframework Maven Repository</name>
- <url>http://maven.springframework.org/milestone</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.milestone</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </repository>
- <repository>
- <id>OPS4J</id>
- <url>http://repository.ops4j.org/maven2</url>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/src/main/assembly/release-assembly.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/assembly/release-assembly.xml b/taverna-workbench-product/src/main/assembly/release-assembly.xml
deleted file mode 100644
index 5687d70..0000000
--- a/taverna-workbench-product/src/main/assembly/release-assembly.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
- <formats>
- <format>dir</format>
- <!-- <format>zip</format> -->
- </formats>
-
- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>/bundles</outputDirectory>
- <excludes>
- <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
- <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
- <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
- <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
- </excludes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>uk.org.taverna.workbench:taverna-workbench</include>
- <include>uk.org.taverna.osgi:osgi-launcher</include>
- <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
- <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
- <include>org.osgi:org.osgi.core</include>
- <include>org.eclipse.osgi:org.eclipse.osgi</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>src/main/etc</directory>
- <fileMode>0755</fileMode>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/src/main/etc/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/conf/log4j.properties b/taverna-workbench-product/src/main/etc/conf/log4j.properties
deleted file mode 100644
index 5014f2b..0000000
--- a/taverna-workbench-product/src/main/etc/conf/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# By default, WARN (our external libraries)
-log4j.rootLogger=INFO, CONSOLE
-
-# Get rid of some xml sec warnings
-log4j.logger.org.apache.ws.security=ERROR
-log4j.logger.org.apache.commons.httpclient=ERROR
-
-# Default output to console is restrictive
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n
-
-# Output WARN and above to console -
-log4j.appender.CONSOLE.Threshold=ERROR
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/src/main/etc/conf/logging.properties
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/conf/logging.properties b/taverna-workbench-product/src/main/etc/conf/logging.properties
deleted file mode 100644
index aa77e69..0000000
--- a/taverna-workbench-product/src/main/etc/conf/logging.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
-
-.level = ALL
-
-java.util.logging.ConsoleHandler.level = WARNING
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-java.util.logging.FileHandler.level = ALL
-java.util.logging.FileHandler.count = 5
-java.util.logging.FileHandler.limit = 1048576
-java.util.logging.FileHandler.limit = %h/.taverna-3.0.0/logs/taverna-3.0.0.log
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/src/main/etc/conf/taverna.app.properties
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/conf/taverna.app.properties b/taverna-workbench-product/src/main/etc/conf/taverna.app.properties
deleted file mode 100644
index 9634438..0000000
--- a/taverna-workbench-product/src/main/etc/conf/taverna.app.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-taverna.app.name=taverna-workbench-3.0.0
-taverna.app.title=Taverna Workbench 3.0.0
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/src/main/etc/taverna.bat
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/taverna.bat b/taverna-workbench-product/src/main/etc/taverna.bat
deleted file mode 100644
index 7da12f3..0000000
--- a/taverna-workbench-product/src/main/etc/taverna.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@ECHO OFF
-
-REM Taverna startup script
-
-REM distribution directory
-set TAVERNA_HOME=%~dp0
-
-
-REM 300 MB memory, 140 MB for classes
-set ARGS=-Xmx300m -XX:MaxPermSize=140m
-
-REM Taverna system properties
-set ARGS=%ARGS% "-Dlog4j.configuration=file:///%TAVERNA_HOME%conf/log4j.properties"
-set ARGS=%ARGS% "-Djava.util.logging.config.file=%TAVERNA_HOME%conf/logging.properties"
-set ARGS=%ARGS% "-Dtaverna.app.startup=%TAVERNA_HOME%."
-
-java %ARGS% -jar "%TAVERNA_HOME%lib\taverna-workbench-0.1.0-SNAPSHOT.jar" %*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/4e8c4cf7/taverna-workbench-product/src/main/etc/taverna.sh
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/taverna.sh b/taverna-workbench-product/src/main/etc/taverna.sh
deleted file mode 100644
index 36a24d3..0000000
--- a/taverna-workbench-product/src/main/etc/taverna.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-## resolve links - $0 may be a symlink
-prog="$0"
-
-real_path() {
- readlink -m "$1" 2>/dev/null || python -c 'import os,sys;print os.path.realpath(sys.argv[1])' "$1"
-}
-
-realprog=`real_path "$prog"`
-taverna_home=`dirname "$realprog"`
-javabin=java
-if test -x "$JAVA_HOME/bin/java"; then
- javabin="$JAVA_HOME/bin/java"
-fi
-
-# 300 MB memory, 140 MB for classes
-exec "$javabin" -Xmx300m -XX:MaxPermSize=140m \
- "-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
- "-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
- "-Dtaverna.app.startup=$taverna_home" \
- -jar "$taverna_home/lib/taverna-workbench-0.1.0-SNAPSHOT.jar" \
- ${1+"$@"}
[31/49] incubator-taverna-workbench-product git commit: Removed
incorrect logging setting.
Posted by st...@apache.org.
Removed incorrect logging setting.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16079 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/f7c3e5f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/f7c3e5f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/f7c3e5f6
Branch: refs/heads/master
Commit: f7c3e5f695dcb4b36094bc11817615f2a293a81c
Parents: e9730ff
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Oct 1 10:16:44 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Oct 1 10:16:44 2013 +0000
----------------------------------------------------------------------
src/main/etc/conf/logging.properties | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/f7c3e5f6/src/main/etc/conf/logging.properties
----------------------------------------------------------------------
diff --git a/src/main/etc/conf/logging.properties b/src/main/etc/conf/logging.properties
index aa77e69..b03a43f 100644
--- a/src/main/etc/conf/logging.properties
+++ b/src/main/etc/conf/logging.properties
@@ -8,4 +8,3 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
java.util.logging.FileHandler.level = ALL
java.util.logging.FileHandler.count = 5
java.util.logging.FileHandler.limit = 1048576
-java.util.logging.FileHandler.limit = %h/.taverna-3.0.0/logs/taverna-3.0.0.log
\ No newline at end of file
[45/49] incubator-taverna-workbench-product git commit: Changed the
name of the app.
Posted by st...@apache.org.
Changed the name of the app.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/c32ae132
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/c32ae132
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/c32ae132
Branch: refs/heads/master
Commit: c32ae132b5c7833597d581c957d247f1a25cc468
Parents: 64fa395
Author: Aleksandra Nenadic <an...@cs.man.ac.uk>
Authored: Tue Mar 25 10:59:20 2014 +0000
Committer: Aleksandra Nenadic <an...@cs.man.ac.uk>
Committed: Tue Mar 25 10:59:20 2014 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/c32ae132/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fccecff..accb5c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
</parent>
<groupId>uk.org.taverna.workbench</groupId>
<artifactId>taverna-workbench-product</artifactId>
- <name>Taverna Workbench</name>
+ <name>Taverna Workbench [Developer]</name>
<packaging>taverna-application</packaging>
<profiles>
<profile>
[02/49] incubator-taverna-workbench-product git commit: Initial
import.
Posted by st...@apache.org.
Initial import.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15151 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/68cacb60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/68cacb60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/68cacb60
Branch: refs/heads/master
Commit: 68cacb600802b3494d684f8b133f86c1951936ec
Parents: a11b1e1
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Sep 28 12:08:08 2012 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Sep 28 12:08:08 2012 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/49] incubator-taverna-workbench-product git commit: Removed empty
folders
Posted by st...@apache.org.
Removed empty folders
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15237 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/d4ad188c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/d4ad188c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/d4ad188c
Branch: refs/heads/master
Commit: d4ad188c71ed7ca4961590878bcf037a09518a08
Parents: b812414
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Oct 8 12:22:10 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Oct 8 12:22:10 2012 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/49] incubator-taverna-workbench-product git commit: Initial
checkin for OSGi taverna workbench product
Posted by st...@apache.org.
Initial checkin for OSGi taverna workbench product
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15152 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/5af9b53e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/5af9b53e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/5af9b53e
Branch: refs/heads/master
Commit: 5af9b53e79c7680b6c68dbaa751895de1f45aaf2
Parents: 68cacb6
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Sep 28 12:12:29 2012 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Sep 28 12:12:29 2012 +0000
----------------------------------------------------------------------
taverna-workbench-product/.project | 23 ++
taverna-workbench-product/pom.xml | 373 +++++++++++++++++++
.../src/main/assembly/release-assembly.xml | 44 +++
.../src/main/etc/conf/log4j.properties | 14 +
.../src/main/etc/conf/logging.properties | 11 +
.../src/main/etc/conf/taverna.app.properties | 2 +
.../src/main/etc/taverna.bat | 17 +
.../src/main/etc/taverna.sh | 25 ++
8 files changed, 509 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/.project
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/.project b/taverna-workbench-product/.project
new file mode 100644
index 0000000..17b3c53
--- /dev/null
+++ b/taverna-workbench-product/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>taverna-workbench-product</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/pom.xml b/taverna-workbench-product/pom.xml
new file mode 100644
index 0000000..40ce91a
--- /dev/null
+++ b/taverna-workbench-product/pom.xml
@@ -0,0 +1,373 @@
+<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>
+ <artifactId>taverna-parent</artifactId>
+ <groupId>net.sf.taverna</groupId>
+ <version>3.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>uk.org.taverna.workbench</groupId>
+ <artifactId>taverna-workbench-product</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <name>Taverna Workbench Product</name>
+ <packaging>pom</packaging>
+ <dependencies>
+ <!-- Spring DM -->
+ <dependency>
+ <groupId>net.sourceforge.cglib</groupId>
+ <artifactId>com.springsource.net.sf.cglib</artifactId>
+ <version>2.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ <version>${spring.dm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.dm.version}</version>
+ </dependency>
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <!-- Java Extension Implementations -->
+ <!-- <dependency>
+ <groupId>com.sun.xml</groupId>
+ <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <version>2.2.0</version>
+ </dependency> -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>com.springsource.javax.xml.bind</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ <dependency> <!-- required by bsh -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>com.springsource.javax.servlet</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>com.springsource.javax.jms</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>com.springsource.javax.xml.soap</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>com.springsource.javax.xml.stream</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>com.springsource.javax.mail</artifactId>
+ <version>${mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+
+ <!-- OSGi Enterprise Services -->
+ <dependency>
+ <groupId>uk.org.taverna.osgi.services</groupId>
+ <artifactId>xml-parser-service</artifactId>
+ <version>${osgi.services.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.osgi.services</groupId>
+ <artifactId>xml-transformer-service</artifactId>
+ <version>${osgi.services.version}</version>
+ </dependency>
+
+ <!-- Taverna Activities -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>all-activities</artifactId>
+ <version>${t2.activities.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomoby-activity</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Taverna Activities UI -->
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>all-activity-uis</artifactId>
+ <version>${t2.activities.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomoby-activity-ui</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>beanshell-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>biomart-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>stringconstant-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+
+ <!-- Taverna Workbench -->
+ <dependency>
+ <groupId>uk.org.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>workbench-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>activity-palette-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>configuration-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>edits-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>file-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>menu-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>report-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>perspective-design</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>contextual-views</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>menu-items</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>loop-ui</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>parallelize-ui</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>retry-ui</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+
+
+ <!-- Taverna Platform -->
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-capability-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-data-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-run-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-execution-impl</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.platform</groupId>
+ <artifactId>taverna-execution-local</artifactId>
+ <version>${platform.version}</version>
+ </dependency>
+
+ <!-- Taverna Configuration -->
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-configuration-impl</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-app-configuration-impl</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.configuration</groupId>
+ <artifactId>taverna-database-configuration-impl</artifactId>
+ <version>${taverna.configuration.version}</version>
+ </dependency>
+
+ <!-- Scufl2 -->
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-rdfxml</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-t2flow</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-validation-structural</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.scufl2</groupId>
+ <artifactId>scufl2-validation-correctness</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Taverna Security -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.security</groupId>
+ <artifactId>credential-manager-impl</artifactId>
+ <version>${t2.security.version}</version>
+ </dependency>
+
+ <!-- Taverna Workflow Engine -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>workflowmodel-impl</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>workflowmodel-core-extensions</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>reference-impl</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>reference-core-extensions</artifactId>
+ <version>${t2.core.version}</version>
+ </dependency>
+
+ <!-- Taverna Provenance -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>provenance-derby</artifactId>
+ <version>${t2.core.provenance.derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.core</groupId>
+ <artifactId>provenance-mysql</artifactId>
+ <version>${t2.core.provenance.mysql.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/release-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>mygrid-repository</id>
+ <name>myGrid Repository</name>
+ <url>http://www.mygrid.org.uk/maven/repository</url>
+ </repository>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ <id>mygrid-snapshot-repository</id>
+ <name>myGrid Snapshot Repository</name>
+ <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
+ </repository>
+ <repository>
+ <id>spring-maven-milestone</id>
+ <name>Springframework Maven Repository</name>
+ <url>http://maven.springframework.org/milestone</url>
+ </repository>
+ <repository>
+ <id>com.springsource.repository.bundles.milestone</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
+ <url>http://repository.springsource.com/maven/bundles/milestone</url>
+ </repository>
+ <repository>
+ <id>OPS4J</id>
+ <url>http://repository.ops4j.org/maven2</url>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/src/main/assembly/release-assembly.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/assembly/release-assembly.xml b/taverna-workbench-product/src/main/assembly/release-assembly.xml
new file mode 100644
index 0000000..5687d70
--- /dev/null
+++ b/taverna-workbench-product/src/main/assembly/release-assembly.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ <!-- <format>zip</format> -->
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>/bundles</outputDirectory>
+ <excludes>
+ <exclude>net.sf.taverna.t2.activities:all-activities</exclude>
+ <exclude>uk.org.taverna.workbench:taverna-workbench</exclude>
+ <exclude>uk.org.taverna.osgi:osgi-launcher</exclude>
+ <exclude>org.eclipse.osgi:org.eclipse.osgi</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>uk.org.taverna.workbench:taverna-workbench</include>
+ <include>uk.org.taverna.osgi:osgi-launcher</include>
+ <include>org.apache.log4j:com.springsource.org.apache.log4j</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-api</include>
+ <include>uk.org.taverna.configuration:taverna-app-configuration-impl</include>
+ <include>org.osgi:org.osgi.core</include>
+ <include>org.eclipse.osgi:org.eclipse.osgi</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <fileMode>0755</fileMode>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/src/main/etc/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/conf/log4j.properties b/taverna-workbench-product/src/main/etc/conf/log4j.properties
new file mode 100644
index 0000000..5014f2b
--- /dev/null
+++ b/taverna-workbench-product/src/main/etc/conf/log4j.properties
@@ -0,0 +1,14 @@
+# By default, WARN (our external libraries)
+log4j.rootLogger=INFO, CONSOLE
+
+# Get rid of some xml sec warnings
+log4j.logger.org.apache.ws.security=ERROR
+log4j.logger.org.apache.commons.httpclient=ERROR
+
+# Default output to console is restrictive
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n
+
+# Output WARN and above to console -
+log4j.appender.CONSOLE.Threshold=ERROR
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/src/main/etc/conf/logging.properties
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/conf/logging.properties b/taverna-workbench-product/src/main/etc/conf/logging.properties
new file mode 100644
index 0000000..aa77e69
--- /dev/null
+++ b/taverna-workbench-product/src/main/etc/conf/logging.properties
@@ -0,0 +1,11 @@
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
+
+.level = ALL
+
+java.util.logging.ConsoleHandler.level = WARNING
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+java.util.logging.FileHandler.level = ALL
+java.util.logging.FileHandler.count = 5
+java.util.logging.FileHandler.limit = 1048576
+java.util.logging.FileHandler.limit = %h/.taverna-3.0.0/logs/taverna-3.0.0.log
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/src/main/etc/conf/taverna.app.properties
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/conf/taverna.app.properties b/taverna-workbench-product/src/main/etc/conf/taverna.app.properties
new file mode 100644
index 0000000..9634438
--- /dev/null
+++ b/taverna-workbench-product/src/main/etc/conf/taverna.app.properties
@@ -0,0 +1,2 @@
+taverna.app.name=taverna-workbench-3.0.0
+taverna.app.title=Taverna Workbench 3.0.0
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/src/main/etc/taverna.bat
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/taverna.bat b/taverna-workbench-product/src/main/etc/taverna.bat
new file mode 100644
index 0000000..8bba381
--- /dev/null
+++ b/taverna-workbench-product/src/main/etc/taverna.bat
@@ -0,0 +1,17 @@
+@ECHO OFF
+
+REM Taverna startup script
+
+REM distribution directory
+set TAVERNA_HOME=%~dp0
+
+
+REM 300 MB memory, 140 MB for classes
+set ARGS=-Xmx300m -XX:MaxPermSize=140m
+
+REM Taverna system properties
+set ARGS=%ARGS% "-Dlog4j.configuration=file:///%TAVERNA_HOME%conf/log4j.properties"
+set ARGS=%ARGS% "-Djava.util.logging.config.file=%TAVERNA_HOME%conf/logging.properties"
+set ARGS=%ARGS% "-Dtaverna.app.startup=%TAVERNA_HOME%."
+
+java %ARGS% -jar "%TAVERNA_HOME%lib\taverna-command-line-0.1.1.jar" %*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/5af9b53e/taverna-workbench-product/src/main/etc/taverna.sh
----------------------------------------------------------------------
diff --git a/taverna-workbench-product/src/main/etc/taverna.sh b/taverna-workbench-product/src/main/etc/taverna.sh
new file mode 100644
index 0000000..36a24d3
--- /dev/null
+++ b/taverna-workbench-product/src/main/etc/taverna.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+## resolve links - $0 may be a symlink
+prog="$0"
+
+real_path() {
+ readlink -m "$1" 2>/dev/null || python -c 'import os,sys;print os.path.realpath(sys.argv[1])' "$1"
+}
+
+realprog=`real_path "$prog"`
+taverna_home=`dirname "$realprog"`
+javabin=java
+if test -x "$JAVA_HOME/bin/java"; then
+ javabin="$JAVA_HOME/bin/java"
+fi
+
+# 300 MB memory, 140 MB for classes
+exec "$javabin" -Xmx300m -XX:MaxPermSize=140m \
+ "-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
+ "-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
+ "-Dtaverna.app.startup=$taverna_home" \
+ -jar "$taverna_home/lib/taverna-workbench-0.1.0-SNAPSHOT.jar" \
+ ${1+"$@"}
[28/49] incubator-taverna-workbench-product git commit: include all
bootdelegations known in Java 7
Posted by st...@apache.org.
include all bootdelegations known in Java 7
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16062 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/ee4fefd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/ee4fefd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/ee4fefd2
Branch: refs/heads/master
Commit: ee4fefd223e221da18396032e3a4f6778b74c866
Parents: bcf9b07
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Fri Sep 20 11:39:21 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Fri Sep 20 11:39:21 2013 +0000
----------------------------------------------------------------------
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/ee4fefd2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b75fa97..d72f869 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,7 @@
<frameworkConfigurations>
<frameworkConfiguration>
<name>org.osgi.framework.bootdelegation</name>
- <value>sun.*,com.sun.*,java.*,org.xml.*,org.w3c.*,apple.*,com.apple.*</value>
- <value>sun.*,com.sun.*,java.*,org.w3c.*,apple.*,com.apple.*</value>
+ <value>sun.*,com.sun.*,java.*,javax.*,org.xml.*,org.w3c.*,apple.*,com.apple.*,org.omg.*,org.ietf.jgss.*,org.jcp.xml.dsig.internal.*</value>
</frameworkConfiguration>
<frameworkConfiguration>
<name>org.osgi.framework.system.packages.extra</name>
[26/49] incubator-taverna-workbench-product git commit: explicit
springsource http client
Posted by st...@apache.org.
explicit springsource http client
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16057 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/046e5c5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/046e5c5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/046e5c5f
Branch: refs/heads/master
Commit: 046e5c5f63debc6b189a26285415f3e75d8e5e5a
Parents: b712b2b
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Sep 18 09:23:05 2013 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Sep 18 09:23:05 2013 +0000
----------------------------------------------------------------------
pom.xml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/046e5c5f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7b7a0ac..e20789d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -605,7 +605,37 @@
<groupId>uk.org.taverna.databundle</groupId>
<artifactId>databundle</artifactId>
<version>0.1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>com.springsource.org.apache.httpcomponents.httpclient-cache</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>com.springsource.org.apache.httpcomponents.httpclient</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>com.springsource.org.apache.httpcomponents.httpcore</artifactId>
+ <version>4.2.1</version>
+ </dependency>
+
<!-- Taverna Security -->
<dependency>
[29/49] incubator-taverna-workbench-product git commit: Specified
slf4j implementation version. Removed version 1.2.17 of log4j (using 1.2.16).
Posted by st...@apache.org.
Specified slf4j implementation version. Removed version 1.2.17 of log4j (using 1.2.16).
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16064 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/361caa75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/361caa75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/361caa75
Branch: refs/heads/master
Commit: 361caa759ffb896c9668cf7edd38010fd9b19ebd
Parents: ee4fefd
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Sep 24 15:15:25 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Sep 24 15:15:25 2013 +0000
----------------------------------------------------------------------
pom.xml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/361caa75/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d72f869..85c229e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,17 +158,18 @@
</distributionManagement>
<dependencies>
- <!-- Workaround for slf4j api/impl version mismatch -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <scope>provided</scope>
</dependency>
+
+ <!-- slf4j implementation -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- <scope>runtime</scope>
+ <version>1.7.4</version>
</dependency>
<!-- Spring DM -->
@@ -623,8 +624,8 @@
<artifactId>jena-bundle</artifactId>
<version>2.11.0-SNAPSHOT</version>
</dependency>
-
-
+
+
<!-- Taverna Security -->
<dependency>
[42/49] incubator-taverna-workbench-product git commit: Changed
update and plugin site locations
Posted by st...@apache.org.
Changed update and plugin site locations
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16454 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/7bb803c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/7bb803c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/7bb803c5
Branch: refs/heads/master
Commit: 7bb803c5e89c7754ab3ca924c1f835b128706d73
Parents: a444279
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Dec 11 12:56:37 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Dec 11 12:56:37 2013 +0000
----------------------------------------------------------------------
pom.xml | 56 +++++++++++++++++------
src/main/assembly/dependencies-component.xml | 11 -----
2 files changed, 41 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/7bb803c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b9428ba..d5035b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,31 +13,63 @@
<packaging>taverna-application</packaging>
<profiles>
<profile>
- <id>developer</id>
+ <id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<assembly.descriptor>src/main/assembly/developer-assembly.xml</assembly.descriptor>
- <profile.updateSite>http://dev.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
- <profile.pluginSite>http://dev.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/dev/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/dev/plugins/</profile.pluginSite>
</properties>
+ <distributionManagement>
+ <repository>
+ <id>dev</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
+ </repository>
+ </distributionManagement>
</profile>
<profile>
- <id>nightly</id>
+ <id>beta</id>
<properties>
<assembly.descriptor>src/main/assembly/nightly-assembly.xml</assembly.descriptor>
- <profile.updateSite>http://dev.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
- <profile.pluginSite>http://dev.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/beta/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/beta/plugins/</profile.pluginSite>
</properties>
+ <distributionManagement>
+ <repository>
+ <id>beta</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/beta</url>
+ </repository>
+ </distributionManagement>
</profile>
<profile>
- <id>release</id>
+ <id>stable</id>
<properties>
<assembly.descriptor>src/main/assembly/release-assembly.xml</assembly.descriptor>
- <profile.updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</profile.updateSite>
- <profile.pluginSite>http://www.mygrid.org.uk/taverna/plugins/taverna-workbench/</profile.pluginSite>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/stable/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/stable/plugins/</profile.pluginSite>
</properties>
+ <distributionManagement>
+ <repository>
+ <id>stable</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/stable</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ <profile>
+ <id>nightly</id>
+ <properties>
+ <assembly.descriptor>src/main/assembly/nightly-assembly.xml</assembly.descriptor>
+ <profile.updateSite>http://updates.taverna.org.uk/workbench/3.0/dev/</profile.updateSite>
+ <profile.pluginSite>http://updates.taverna.org.uk/workbench/3.0/dev/plugins/</profile.pluginSite>
+ </properties>
+ <distributionManagement>
+ <repository>
+ <id>dev</id>
+ <url>file:///local/www/taverna/updates/3/workbench/3.0/dev</url>
+ </repository>
+ </distributionManagement>
</profile>
</profiles>
<build>
@@ -160,12 +192,6 @@
</plugins>
</pluginManagement>
</build>
- <distributionManagement>
- <snapshotRepository>
- <id>dev</id>
- <url>file:///Users/david/Sites/taverna/updates/taverna-workbench</url>
- </snapshotRepository>
- </distributionManagement>
<dependencies>
<!-- Explicit org.osgi.* with <scope>provided as these are also provided
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/7bb803c5/src/main/assembly/dependencies-component.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/dependencies-component.xml b/src/main/assembly/dependencies-component.xml
index 486574c..0e8640e 100644
--- a/src/main/assembly/dependencies-component.xml
+++ b/src/main/assembly/dependencies-component.xml
@@ -3,17 +3,6 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
- <!-- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <outputDirectory>/lib/${artifact.groupId}</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <excludes>
- Exclude ourselves
- <exclude>uk.org.taverna.workbench:taverna-workbench-product</exclude>
- </excludes>
- </dependencySet>
- </dependencySets> -->
<fileSets>
<fileSet>
[34/49] incubator-taverna-workbench-product git commit: Added
specific version of slf4j-api dependency.
Posted by st...@apache.org.
Added specific version of slf4j-api dependency.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16094 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/7884ee9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/7884ee9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/7884ee9d
Branch: refs/heads/master
Commit: 7884ee9da8f5a19a250e4bcff1973d602f8f81d8
Parents: 31a5615
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Oct 7 14:55:49 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Oct 7 14:55:49 2013 +0000
----------------------------------------------------------------------
pom.xml | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/7884ee9d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d53a2c8..f72e98f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,21 +168,6 @@
</distributionManagement>
<dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- slf4j implementation -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- </dependency>
-
-
<!-- Explicit org.osgi.* with <scope>provided as these are also provided
by the felix osgi package. Avoids: Caused by: java.lang.SecurityException:
class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information
@@ -201,6 +186,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Spring DM -->
<dependency>
<groupId>net.sourceforge.cglib</groupId>
@@ -625,8 +617,17 @@
<artifactId>jena-bundle</artifactId>
<version>2.11.0-SNAPSHOT</version>
</dependency>
-
-
+ <!-- slf4j implementation -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.5</version>
+ </dependency>
<!-- Taverna Security -->
<dependency>
[14/49] incubator-taverna-workbench-product git commit: Newer version
of scufl2
Posted by st...@apache.org.
Newer version of scufl2
(should this not be in taverna-parent?)
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15241 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/85ae9c2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/85ae9c2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/85ae9c2c
Branch: refs/heads/master
Commit: 85ae9c2cb5cb89c80f5702604ca36a2f48d441bb
Parents: d4ad188
Author: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Oct 9 08:29:33 2012 +0000
Committer: stian@mygrid.org.uk <st...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Oct 9 08:29:33 2012 +0000
----------------------------------------------------------------------
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/85ae9c2c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e976ff7..0e8ba65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,22 +244,22 @@
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-rdfxml</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-t2flow</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-structural</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
<artifactId>scufl2-validation-correctness</artifactId>
- <version>0.9.3-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- Taverna Security -->
@@ -361,4 +361,4 @@
<url>http://repository.ops4j.org/maven2</url>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
[20/49] incubator-taverna-workbench-product git commit: Updated build.
Posted by st...@apache.org.
Updated build.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15765 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/568154a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/568154a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/568154a7
Branch: refs/heads/master
Commit: 568154a7a7000906bf9a9562db644f62f1cf7c18
Parents: 697be3a
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon May 13 13:55:43 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon May 13 13:55:43 2013 +0000
----------------------------------------------------------------------
pom.xml | 340 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 171 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/568154a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 78b6286..da00b99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,180 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>taverna-parent</artifactId>
<groupId>net.sf.taverna</groupId>
+ <artifactId>taverna-parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
</parent>
<groupId>uk.org.taverna.workbench</groupId>
<artifactId>taverna-workbench-product</artifactId>
- <name>Taverna Workbench Product</name>
- <packaging>jar</packaging>
+ <name>Taverna Workbench</name>
+ <packaging>taverna-application</packaging>
<profiles>
<profile>
<id>developer</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
- <executions>
- <execution>
- <id>buildnumber-validate</id>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <format>{0,date,yyyyMMdd}T{0,date,HHmm}
- </format>
- <items>
- <item>timestamp</item>
- </items>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
-
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/developer-assembly.xml
- </descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <properties>
+ <assembly.descriptor>src/main/assembly/developer-assembly.xml</assembly.descriptor>
+ </properties>
</profile>
<profile>
<id>nightly</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
- <executions>
- <execution>
- <id>buildnumber-validate</id>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <format>{0,date,yyyyMMdd}
- </format>
- <items>
- <item>timestamp</item>
- </items>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
-
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/nightly-assembly.xml
- </descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <properties>
+ <assembly.descriptor>src/main/assembly/nightly-assembly.xml</assembly.descriptor>
+ </properties>
</profile>
<profile>
<id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
- <executions>
- <execution>
- <id>buildnumber-validate</id>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- <format>{0,date,yyyyMMdd}
- </format>
- <items>
- <item>timestamp</item>
- </items>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
-
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/release-assembly.xml
- </descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <assembly.descriptor>src/main/assembly/release-assembly.xml</assembly.descriptor>
+ </properties>
</profile>
</profiles>
<build>
<finalName>taverna-workbench-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>${assembly.descriptor}</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ <executions>
+ <execution>
+ <id>buildnumber-validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <format>{0,date,yyyyMMdd}T{0,date,HHmm}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.sf.taverna.t2.maven.plugins</groupId>
+ <artifactId>maven-taverna-plugin</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <buildNumber>${buildNumber}</buildNumber>
+ <!-- <updateSite>http://www.mygrid.org.uk/taverna/updates/taverna-workbench/</updateSite> -->
+ <updateSite>http://localhost/~david/taverna/updates/taverna-workbench/</updateSite>
+ <pluginSite>http://localhost/~david/taverna/plugins/taverna-workbench/</pluginSite>
+ <frameworkConfigurations>
+ <frameworkConfiguration>
+ <name>org.osgi.framework.bootdelegation</name>
+ <!-- <value>sun.*,com.sun.*,java.*,org.xml.*,org.w3c.*,apple.*,com.apple.*</value> -->
+ <value>sun.*,com.sun.*,java.*,org.w3c.*,apple.*,com.apple.*</value>
+ </frameworkConfiguration>
+ <frameworkConfiguration>
+ <name>org.osgi.framework.system.packages.extra</name>
+ <value>com.sun.org.apache.xml.internal.utils,org.apache.log4j;version=1.2.16</value>
+ </frameworkConfiguration>
+ <frameworkConfiguration>
+ <name>org.osgi.framework.storage.clean</name>
+ <value>onFirstInit</value>
+ </frameworkConfiguration>
+ </frameworkConfigurations>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <skipIfEmpty>true</skipIfEmpty>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
-
+ <distributionManagement>
+ <snapshotRepository>
+ <id>dev</id>
+ <url>file:///Users/david/Sites/taverna/updates/taverna-workbench</url>
+ </snapshotRepository>
+ </distributionManagement>
<dependencies>
+
<!-- Spring DM -->
<dependency>
<groupId>net.sourceforge.cglib</groupId>
@@ -199,7 +144,7 @@
</dependency>
<!-- Java Extension Implementations -->
- <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
+ <!-- <dependency> <groupId>com.sun.xml</groupId> <artifactId>com.springsource.com.sun.xml.bind</artifactId>
<version>2.2.0</version> </dependency> -->
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -253,13 +198,26 @@
<artifactId>xml-transformer-service</artifactId>
<version>${osgi.services.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.6.0</version>
+ </dependency>
<!-- Taverna Activities -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>beanshell-activity</artifactId>
- <version>${t2.activities.version}</version> </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>beanshell-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>stringconstant-activity</artifactId>
@@ -267,11 +225,14 @@
</dependency>
<!-- Taverna Activities UI -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
+ <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>beanshell-activity-ui</artifactId>
- <version>${t2.ui.activities.version}</version> </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>beanshell-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
@@ -314,7 +275,22 @@
<artifactId>menu-impl</artifactId>
<version>${t2.ui.impl.version}</version>
</dependency>
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-impl</groupId> <artifactId>report-impl</artifactId>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>selection-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>plugin-manager</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>update-manager</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ </dependency>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-impl</groupId> <artifactId>report-impl</artifactId>
<version>${t2.ui.impl.version}</version> </dependency> -->
<dependency>
@@ -324,17 +300,26 @@
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>perspective-results</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
<artifactId>contextual-views</artifactId>
<version>${t2.ui.components.version}</version>
</dependency>
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>menu-items</artifactId>
- <version>${t2.ui.exts.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>loop-ui</artifactId> <version>${t2.ui.exts.version}</version>
- </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
- <version>${t2.ui.exts.version}</version> </dependency> <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>retry-ui</artifactId> <version>${t2.ui.exts.version}</version>
- </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>menu-items</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>loop-ui</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>retry-ui</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> -->
<!-- Taverna Platform -->
@@ -345,7 +330,7 @@
</dependency>
<dependency>
<groupId>uk.org.taverna.platform</groupId>
- <artifactId>taverna-data-impl</artifactId>
+ <artifactId>taverna-data-inmemory-impl</artifactId>
<version>${platform.version}</version>
</dependency>
<dependency>
@@ -381,6 +366,23 @@
<version>${taverna.configuration.version}</version>
</dependency>
+ <!-- Taverna Commons -->
+ <dependency>
+ <groupId>uk.org.taverna.commons</groupId>
+ <artifactId>taverna-download-impl</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.commons</groupId>
+ <artifactId>taverna-plugin-impl</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.commons</groupId>
+ <artifactId>taverna-update-impl</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+
<!-- Scufl2 -->
<dependency>
<groupId>uk.org.taverna.scufl2</groupId>
[48/49] incubator-taverna-workbench-product git commit: CITATION and
LICENSE file
Posted by st...@apache.org.
CITATION and LICENSE file
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/32d96136
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/32d96136
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/32d96136
Branch: refs/heads/master
Commit: 32d96136316348e723d8274b851e10ae237d8787
Parents: eae51ab
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Fri May 2 16:47:33 2014 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Fri May 2 16:47:57 2014 +0100
----------------------------------------------------------------------
CITATION.txt | 18 ++
LICENCE.txt | 504 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 522 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/32d96136/CITATION.txt
----------------------------------------------------------------------
diff --git a/CITATION.txt b/CITATION.txt
new file mode 100644
index 0000000..ee89568
--- /dev/null
+++ b/CITATION.txt
@@ -0,0 +1,18 @@
+Wolstencroft, K., Haines, R., Fellows, D., Williams, A., Withers, D.,
+ Owen, S., Soiland-Reyes, S., Dunlop, I., Nenadic, A., Fisher, P., Bhagat, J.,
+ Belhajjame, K., Bacall, F., Hardisty, A., Nieva de la Hidalga, A.,
+ Balcazar Vargas, M.P., Sufi, S., and Goble, C. 2013.
+The Taverna workflow suite: designing and executing workflows of Web Services
+on the desktop, web or in the cloud. Nucl. Acids Res. gkt328v1
+http://doi.org/doi:10.1093/nar/gkt328
+
+@article{Wolstencroft02052013,
+ author = {Wolstencroft, Katherine and Haines, Robert and Fellows, Donal and Williams, Alan and Withers, David and Owen, Stuart and Soiland-Reyes, Stian and Dunlop, Ian and Nenadic, Aleksandra and Fisher, Paul and Bhagat, Jiten and Belhajjame, Khalid and Bacall, Finn and Hardisty, Alex and Nieva de la Hidalga, Abraham and Balcazar Vargas, Maria P. and Sufi, Shoaib and Goble, Carole},
+ title = {The {Taverna} workflow suite: designing and executing workflows of {Web Services} on the desktop, web or in the cloud},
+ year = {2013},
+ doi = {10.1093/nar/gkt328},
+ abstract ={The Taverna workflow tool suite (http://www.taverna.org.uk) is designed to combine distributed Web Services and/or local tools into complex analysis pipelines. These pipelines can be executed on local desktop machines or through larger infrastructure (such as supercomputers, Grids or cloud environments), using the Taverna Server. In bioinformatics, Taverna workflows are typically used in the areas of high-throughput omics analyses (for example, proteomics or transcriptomics), or for evidence gathering methods involving text mining or data mining. Through Taverna, scientists have access to several thousand different tools and resources that are freely available from a large range of life science institutions. Once constructed, the workflows are reusable, executable bioinformatics protocols that can be shared, reused and repurposed. A repository of public workflows is available at http://www.myexperiment.org. This article provides an update to the Taverna tool suite, high
lighting new features and developments in the workbench and the Taverna Server.},
+ URL = {http://nar.oxfordjournals.org/content/early/2013/05/02/nar.gkt328.abstract},
+ eprint = {http://nar.oxfordjournals.org/content/early/2013/05/02/nar.gkt328.full.pdf+html},
+ journal = {Nucleic Acids Research}
+}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/32d96136/LICENCE.txt
----------------------------------------------------------------------
diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000..53afb04
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
[22/49] incubator-taverna-workbench-product git commit: Updated
plugin dependency version.
Posted by st...@apache.org.
Updated plugin dependency version.
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@15977 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/552fb281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/552fb281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/552fb281
Branch: refs/heads/master
Commit: 552fb28153204bd6fc34110a2b2d0f603cc18c43
Parents: f182007
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Mon Jul 29 12:31:28 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Mon Jul 29 12:31:28 2013 +0000
----------------------------------------------------------------------
pom.xml | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 141 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/552fb281/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da00b99..129f456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,8 +77,8 @@
</plugin>
<plugin>
<groupId>net.sf.taverna.t2.maven.plugins</groupId>
- <artifactId>maven-taverna-plugin</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <artifactId>taverna-maven-plugin</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<buildNumber>${buildNumber}</buildNumber>
@@ -210,9 +210,11 @@
</dependency>
<!-- Taverna Activities -->
- <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>all-activities</artifactId>
- <version>${t2.activities.version}</version> <exclusions> <exclusion> <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>biomoby-activity</artifactId> </exclusion> </exclusions> </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>apiconsumer-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>beanshell-activity</artifactId>
@@ -220,9 +222,59 @@
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>biomart-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>dataflow-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>external-tool-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>localworker-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>rest-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency> -->
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>rshell-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>soaplab-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>spreadsheet-import-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>stringconstant-activity</artifactId>
<version>${t2.activities.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>wsdl-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.activities</groupId>
+ <artifactId>xpath-activity</artifactId>
+ <version>${t2.activities.version}</version>
+ </dependency>
<!-- Taverna Activities UI -->
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-activities</groupId> <artifactId>all-activity-uis</artifactId>
@@ -230,14 +282,59 @@
<artifactId>biomoby-activity-ui</artifactId> </exclusion> </exclusions> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>apiconsumer-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>beanshell-activity-ui</artifactId>
<version>${t2.ui.activities.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>biomart-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>dataflow-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>localworker-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>rshell-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>spreadsheet-import-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>soaplab-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>stringconstant-activity-ui</artifactId>
<version>${t2.ui.activities.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>wsdl-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-activities</groupId>
+ <artifactId>unrecognized-activity-ui</artifactId>
+ <version>${t2.ui.activities.version}</version>
+ </dependency>
<!-- Taverna Workbench -->
<dependency>
@@ -277,11 +374,21 @@
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>renderers-impl</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>selection-impl</artifactId>
<version>${t2.ui.impl.version}</version>
</dependency>
<dependency>
<groupId>net.sf.taverna.t2.ui-impl</groupId>
+ <artifactId>httpproxy-config</artifactId>
+ <version>${t2.ui.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-impl</groupId>
<artifactId>plugin-manager</artifactId>
<version>${t2.ui.impl.version}</version>
</dependency>
@@ -308,16 +415,31 @@
<artifactId>contextual-views</artifactId>
<version>${t2.ui.components.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>credential-manager-ui</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.taverna.t2.ui-components</groupId>
+ <artifactId>run-ui</artifactId>
+ <version>${t2.ui.components.version}</version>
+ </dependency>
<dependency>
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>loop-ui</artifactId>
+ <version>${t2.ui.exts.version}</version> </dependency> -->
<groupId>net.sf.taverna.t2.ui-exts</groupId>
<artifactId>menu-items</artifactId>
<version>${t2.ui.exts.version}</version>
</dependency>
- <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>loop-ui</artifactId>
- <version>${t2.ui.exts.version}</version> </dependency> -->
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
<version>${t2.ui.exts.version}</version> </dependency> -->
+ <!-- <dependency>
+ <groupId>net.sf.taverna.t2.ui-exts</groupId>
+ <artifactId>renderers-exts</artifactId>
+ <version>${t2.ui.exts.version}</version>
+ </dependency> -->
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>retry-ui</artifactId>
<version>${t2.ui.exts.version}</version> </dependency> -->
@@ -379,6 +501,11 @@
</dependency>
<dependency>
<groupId>uk.org.taverna.commons</groupId>
+ <artifactId>taverna-services-impl</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>uk.org.taverna.commons</groupId>
<artifactId>taverna-update-impl</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
@@ -405,6 +532,13 @@
<version>${scufl2.version}</version>
</dependency>
+ <!-- Data bundle -->
+ <dependency>
+ <groupId>uk.org.taverna.databundle</groupId>
+ <artifactId>databundle</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+
<!-- Taverna Security -->
<dependency>
<groupId>net.sf.taverna.t2.security</groupId>
[47/49] incubator-taverna-workbench-product git commit: Update and
rename README.txt to README.md
Posted by st...@apache.org.
Update and rename README.txt to README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/eae51abe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/eae51abe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/eae51abe
Branch: refs/heads/master
Commit: eae51abead51cdaf4c2511473f0bfd59f346bbc8
Parents: e5a0ad0
Author: Stian Soiland-Reyes <st...@soiland-reyes.com>
Authored: Fri May 2 16:46:16 2014 +0100
Committer: Stian Soiland-Reyes <st...@soiland-reyes.com>
Committed: Fri May 2 16:46:16 2014 +0100
----------------------------------------------------------------------
README.md | 26 ++++++++++++++++++++++++++
README.txt | 8 --------
2 files changed, 26 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/eae51abe/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c754b25
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+# Taverna Workbench 3.x
+
+## Installing
+
+Pre-requisites:
+* [Maven 3](http://maven.apache.org/download.cgi)
+* [Java JDK 7](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
+
+Installing:
+
+ git checkout devel
+ mvn install
+ cd target/taverna-workbench-3.0.1-SNAPSHOT-dev/taverna-workbench-3.0.1-SNAPSHOT
+ ./taverna.sh # or taverna.bat
+
+# License
+
+(c) 2005-2014 University of Manchester
+
+Licensed under [Lesser GPL 2.1](https://www.gnu.org/licenses/lgpl-2.1.html).
+
+
+# Contact
+
+Post to the [https://lists.sourceforge.net/lists/listinfo/taverna-hackers](taverna-hackers) list
+for any questions, or contact the [http://www.taverna.org.uk/about/contact-us/](myGrid support).
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/eae51abe/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index ee8b7ca..0000000
--- a/README.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-How to install Taverna 3 Worbench and required libraries
-
-Pre-requisites: Maven 3, Java 7`
-
-git checkout devel
-mvn install
-change directory to target/taverna-workbench-3.0.1-SNAPSHOT-dev/taverna-workbench-3.0.1-SNAPSHOT
-run taverna.sh (Linux/OSX) or taverna.bat (windows)
[35/49] incubator-taverna-workbench-product git commit: T3-842
Changed maximum java heap size to 1 gigabyte
Posted by st...@apache.org.
T3-842 Changed maximum java heap size to 1 gigabyte
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16101 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/ab0e7460
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/ab0e7460
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/ab0e7460
Branch: refs/heads/master
Commit: ab0e7460ee9726ddef4f1238a32d3480bd0f4891
Parents: 7884ee9
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Tue Oct 8 16:44:47 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Tue Oct 8 16:44:47 2013 +0000
----------------------------------------------------------------------
src/main/etc/taverna.bat | 4 ++--
src/main/etc/taverna.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/ab0e7460/src/main/etc/taverna.bat
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.bat b/src/main/etc/taverna.bat
index bc38e57..ebc9580 100644
--- a/src/main/etc/taverna.bat
+++ b/src/main/etc/taverna.bat
@@ -6,8 +6,8 @@ REM distribution directory
set TAVERNA_HOME=%~dp0
-REM 300 MB memory, 140 MB for classes
-set ARGS=-Xmx300m -XX:MaxPermSize=140m
+REM 1 GB memory, 400 MB for classes
+set ARGS=-Xmx1g -XX:MaxPermSize=400m
REM Taverna system properties
set ARGS=%ARGS% "-Dlog4j.configuration=file:///%TAVERNA_HOME%conf/log4j.properties"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/ab0e7460/src/main/etc/taverna.sh
----------------------------------------------------------------------
diff --git a/src/main/etc/taverna.sh b/src/main/etc/taverna.sh
index d3ef159..aedd87b 100644
--- a/src/main/etc/taverna.sh
+++ b/src/main/etc/taverna.sh
@@ -16,8 +16,8 @@ if test -x "$JAVA_HOME/bin/java"; then
javabin="$JAVA_HOME/bin/java"
fi
-# 300 MB memory, 140 MB for classes
-exec "$javabin" -Xmx300m -XX:MaxPermSize=400m \
+# 1 GB memory, 400 MB for classes
+exec "$javabin" -Xmx1g -XX:MaxPermSize=400m \
"-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
"-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
"-Dtaverna.app.startup=$taverna_home" \
[33/49] incubator-taverna-workbench-product git commit: T3-821 Added
workaround for http://jira.codehaus.org/browse/MASSEMBLY-449
Posted by st...@apache.org.
T3-821 Added workaround for http://jira.codehaus.org/browse/MASSEMBLY-449
git-svn-id: https://taverna.googlecode.com/svn/taverna/products/taverna-workbench-product/trunk@16085 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/31a56151
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/31a56151
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/31a56151
Branch: refs/heads/master
Commit: 31a56151edb1a23cdbc7bee1129744cee286cd40
Parents: 8dd432c
Author: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Authored: Wed Oct 2 13:32:32 2013 +0000
Committer: david@mygrid.org.uk <da...@bf327186-88b3-11dd-a302-d386e5130c1c>
Committed: Wed Oct 2 13:32:32 2013 +0000
----------------------------------------------------------------------
pom.xml | 168 +++++++++++++++++++++++++++++------------------------------
1 file changed, 83 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/31a56151/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c57b3e0..d53a2c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,10 @@
<descriptors>
<descriptor>${assembly.descriptor}</descriptor>
</descriptors>
+ <archiverConfig>
+ <directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
+ <defaultDirectoryMode>493</defaultDirectoryMode>
+ </archiverConfig>
</configuration>
</plugin>
<plugin>
@@ -116,43 +120,44 @@
</plugin>
</plugins>
<pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- net.sf.taverna.t2.maven.plugins
- </groupId>
- <artifactId>
- taverna-maven-plugin
- </artifactId>
- <versionRange>
- [0.3.1-SNAPSHOT,)
- </versionRange>
- <goals>
- <goal>
- profile-generate
- </goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ net.sf.taverna.t2.maven.plugins
+ </groupId>
+ <artifactId>
+ taverna-maven-plugin
+ </artifactId>
+ <versionRange>
+ [0.3.1-SNAPSHOT,)
+ </versionRange>
+ <goals>
+ <goal>
+ profile-generate
+ </goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>false</runOnIncremental>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
<distributionManagement>
@@ -178,24 +183,23 @@
</dependency>
- <!-- Explicit org.osgi.* with <scope>provided as these are also provided by
- the felix osgi package.
- Avoids:
- Caused by: java.lang.SecurityException: class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information does not match signer information of other classes in the same package
- -->
+ <!-- Explicit org.osgi.* with <scope>provided as these are also provided
+ by the felix osgi package. Avoids: Caused by: java.lang.SecurityException:
+ class "org.osgi.framework.hooks.bundle.CollisionHook"'s signer information
+ does not match signer information of other classes in the same package -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.3.1</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.3.1</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Spring DM -->
<dependency>
@@ -306,11 +310,8 @@
<artifactId>dataflow-activity</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.activities</groupId>
- <artifactId>external-tool-activity</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>external-tool-activity</artifactId>
+ <version>2.0.1-SNAPSHOT</version> </dependency> -->
<dependency>
<groupId>net.sf.taverna.t2.activities</groupId>
<artifactId>localworker-activity</artifactId>
@@ -513,11 +514,8 @@
</dependency>
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>parallelize-ui</artifactId>
<version>2.0-SNAPSHOT</version> </dependency> -->
- <!-- <dependency>
- <groupId>net.sf.taverna.t2.ui-exts</groupId>
- <artifactId>renderers-exts</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency> -->
+ <!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>renderers-exts</artifactId>
+ <version>2.0-SNAPSHOT</version> </dependency> -->
<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>retry-ui</artifactId>
<version>2.0-SNAPSHOT</version> </dependency> -->
@@ -606,27 +604,27 @@
<!-- Data bundle -->
<dependency>
<groupId>uk.org.taverna.databundle</groupId>
- <artifactId>databundle</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- </dependency>
- <!-- HTTP client needed by Data Bundle -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.2.5</version>
- </dependency>
- <!-- Jena bundle needed by jsonld-java-jena -->
- <!-- See https://github.com/stain/jena/tree/jena-bundle/jena-bundle -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-bundle</artifactId>
- <version>2.11.0-SNAPSHOT</version>
- </dependency>
+ <artifactId>databundle</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <!-- HTTP client needed by Data Bundle -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+ <!-- Jena bundle needed by jsonld-java-jena -->
+ <!-- See https://github.com/stain/jena/tree/jena-bundle/jena-bundle -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-bundle</artifactId>
+ <version>2.11.0-SNAPSHOT</version>
+ </dependency>