You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/06/30 12:22:12 UTC
[1/6] incubator-taverna-workbench git commit: TAVERNA-991
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 214de29c2 -> 5b45869ea
TAVERNA-991
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/6d7fc79f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/6d7fc79f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/6d7fc79f
Branch: refs/heads/master
Commit: 6d7fc79f56b268dcb4204d760a165af8e8e4ab0b
Parents: 0e86f72
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Thu Jun 30 17:27:29 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Thu Jun 30 17:27:29 2016 +0530
----------------------------------------------------------------------
.../taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/6d7fc79f/taverna-menu-impl/src/main/java/org/apache/taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-menu-impl/src/main/java/org/apache/taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java b/taverna-menu-impl/src/main/java/org/apache/taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java
index ab3e3cc..38e50f8 100644
--- a/taverna-menu-impl/src/main/java/org/apache/taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java
+++ b/taverna-menu-impl/src/main/java/org/apache/taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java
@@ -60,7 +60,7 @@ public class ShowLogsAndDataMenuAction extends AbstractMenuAction {
@Override
public void actionPerformed(ActionEvent e) {
- File logsAndDataDir = applicationConfiguration.getApplicationHomeDir();
+ File logsAndDataDir = applicationConfiguration.getApplicationHomeDir().toFile();
showDirectory(logsAndDataDir, "Taverna logs and data folder");
}
};
[2/6] incubator-taverna-workbench git commit: TAVERNA-990
Posted by st...@apache.org.
TAVERNA-990
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/056816eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/056816eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/056816eb
Branch: refs/heads/master
Commit: 056816eb62d6fbb4d4e836e86b8673850586062c
Parents: 0e86f72
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Thu Jun 30 17:40:02 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Thu Jun 30 17:40:02 2016 +0530
----------------------------------------------------------------------
.../ui/impl/configuration/WorkbenchConfigurationImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/056816eb/taverna-configuration-impl/src/main/java/org/apache/taverna/workbench/ui/impl/configuration/WorkbenchConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/taverna-configuration-impl/src/main/java/org/apache/taverna/workbench/ui/impl/configuration/WorkbenchConfigurationImpl.java b/taverna-configuration-impl/src/main/java/org/apache/taverna/workbench/ui/impl/configuration/WorkbenchConfigurationImpl.java
index f31e1e6..4202dd7 100644
--- a/taverna-configuration-impl/src/main/java/org/apache/taverna/workbench/ui/impl/configuration/WorkbenchConfigurationImpl.java
+++ b/taverna-configuration-impl/src/main/java/org/apache/taverna/workbench/ui/impl/configuration/WorkbenchConfigurationImpl.java
@@ -168,7 +168,7 @@ public class WorkbenchConfigurationImpl extends AbstractConfigurable implements
private String getDefaultDotLocation() {
if (applicationConfiguration == null)
return null;
- File startupDir = applicationConfiguration.getStartupDir();
+ File startupDir = applicationConfiguration.getStartupDir().toFile();
if (startupDir == null)
return DOT_FALLBACK;
[4/6] incubator-taverna-workbench git commit: Merge remote-tracking
branch 'ThilinaManamgoda/TAVERNA-991'
Posted by st...@apache.org.
Merge remote-tracking branch 'ThilinaManamgoda/TAVERNA-991'
TAVERNA-991 fix
Contributed by ThilinaManamgoda.
This closes #3.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/62f4b3db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/62f4b3db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/62f4b3db
Branch: refs/heads/master
Commit: 62f4b3db5df61f55e6f1ceb85b5c19af5abe8185
Parents: b62f81d 6d7fc79
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 30 13:19:52 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 30 13:19:52 2016 +0100
----------------------------------------------------------------------
.../taverna/workbench/ui/impl/menu/ShowLogsAndDataMenuAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/6] incubator-taverna-workbench git commit: Disable missing
dependencies
Posted by st...@apache.org.
Disable missing dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/5b45869e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/5b45869e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/5b45869e
Branch: refs/heads/master
Commit: 5b45869ea2d5f094bf0a21669632e3ce3ae0c34f
Parents: 34b01ef
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 30 13:22:05 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 30 13:22:05 2016 +0100
----------------------------------------------------------------------
taverna-renderers-impl/pom.xml | 2 ++
taverna-results-view/pom.xml | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/5b45869e/taverna-renderers-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-renderers-impl/pom.xml b/taverna-renderers-impl/pom.xml
index 7ab1cc0..8d2e5be 100644
--- a/taverna-renderers-impl/pom.xml
+++ b/taverna-renderers-impl/pom.xml
@@ -72,11 +72,13 @@
<artifactId>com.springsource.org.jdom</artifactId>
<version>${jdom.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.fife.ui.hex</groupId>
<artifactId>hexeditor</artifactId>
<version>${org.fife.ui.hexeditor.version}</version>
</dependency>
+-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/5b45869e/taverna-results-view/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-results-view/pom.xml b/taverna-results-view/pom.xml
index cd501d3..75b7d81 100644
--- a/taverna-results-view/pom.xml
+++ b/taverna-results-view/pom.xml
@@ -46,11 +46,13 @@
<artifactId>taverna-run-api</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-provenanceconnector</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.apache.taverna.language</groupId>
[5/6] incubator-taverna-workbench git commit: Squashed commit of the
following:
Posted by st...@apache.org.
Squashed commit of the following:
commit be502953eaad33fbb27bc26100f451a02829f7d2
Author: ThilinaManamgoda <ma...@gmail.com>
Date: Thu Jun 30 17:12:56 2016 +0530
TAVERNA-989
commit ed2ab6f13b428414ac7905a62fce14b4b7416b4a
Author: ThilinaManamgoda <ma...@gmail.com>
Date: Thu Jun 30 04:03:29 2016 +0530
rollback
commit 4c548c8fceebba32532f0e3e068e8ea8d8136dec
Author: ThilinaManamgoda <ma...@gmail.com>
Date: Thu Jun 30 03:55:48 2016 +0530
testing
TAVERNA-989 Fix
Contributed by ThilinaManamgoda
This closes #1
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/34b01efe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/34b01efe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/34b01efe
Branch: refs/heads/master
Commit: 34b01efeb17c2b4029788d3ee5679bcdbca815a1
Parents: 62f4b3d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 30 13:21:12 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 30 13:21:12 2016 +0100
----------------------------------------------------------------------
.../servicedescriptions/impl/ServiceDescriptionRegistryImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/34b01efe/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
----------------------------------------------------------------------
diff --git a/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java b/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
index 96e7cf3..efe046d 100644
--- a/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
+++ b/taverna-activity-palette-impl/src/main/java/org/apache/taverna/servicedescriptions/impl/ServiceDescriptionRegistryImpl.java
@@ -129,7 +129,7 @@ public class ServiceDescriptionRegistryImpl implements ServiceDescriptionRegistr
private File getTavernaStartupConfigurationDirectory() {
File distroHome = null;
File configDirectory = null;
- distroHome = applicationConfiguration.getStartupDir();
+ distroHome = applicationConfiguration.getStartupDir().toFile();
configDirectory = new File(distroHome, "conf");
if (!configDirectory.exists())
configDirectory.mkdir();
@@ -185,7 +185,7 @@ public class ServiceDescriptionRegistryImpl implements ServiceDescriptionRegistr
private File findServiceDescriptionsFile() {
File confDir = new File(
- applicationConfiguration.getApplicationHomeDir(), CONF_DIR);
+ applicationConfiguration.getApplicationHomeDir().toFile() , CONF_DIR);
confDir.mkdirs();
if (!confDir.isDirectory())
throw new RuntimeException("Invalid directory: " + confDir);
[3/6] incubator-taverna-workbench git commit: Merge remote-tracking
branch 'ThilinaManamgoda/TAVERNA-990'
Posted by st...@apache.org.
Merge remote-tracking branch 'ThilinaManamgoda/TAVERNA-990'
TAVERNA-990 fix
Contributed by ThilinaManamgoda.
This closes #4
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/b62f81db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/b62f81db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/b62f81db
Branch: refs/heads/master
Commit: b62f81db49154ee1b3438816cc5dd7ce9a5373ef
Parents: 214de29 056816e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 30 13:19:22 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 30 13:19:22 2016 +0100
----------------------------------------------------------------------
.../ui/impl/configuration/WorkbenchConfigurationImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------