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 2017/11/30 13:43:52 UTC
[04/11] incubator-taverna-server git commit: Support Taverna 3.0
command line
Support Taverna 3.0 command line
..which directory name starts with "taverna-command-line"
rather than 2.5 style "taverna-commandline"
Also if distro is missing,
throw exceptions rather than cause IndexOutOfBounds
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/a2765f52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/a2765f52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/a2765f52
Branch: refs/heads/master
Commit: a2765f5282dbbde29d54e7bc01f36b58285beb50
Parents: b68f7b1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 10 16:01:23 2017 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 10 16:01:23 2017 +0000
----------------------------------------------------------------------
.../server/master/localworker/LocalWorkerState.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/a2765f52/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
index 8ca05cc..e32dcca 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java
@@ -58,7 +58,7 @@ import org.taverna.server.master.worker.WorkerModel;
*/
@PersistenceAware
public class LocalWorkerState extends JDOSupport<PersistedState> implements
- WorkerModel {
+ WorkerModel {
public LocalWorkerState() {
super(PersistedState.class);
}
@@ -212,11 +212,17 @@ public class LocalWorkerState extends JDOSupport<PersistedState> implements
public boolean accept(File dir, String name) {
// Support both taverna-commandline* (2.5) and
// taverna-command-line* (3.1)
- return name.startsWith("taverna-command");
+ return name.toLowerCase().startsWith("taverna-command");
}
});
- assert dirs.length > 0;
- return new File(dirs[0], "executeworkflow.sh").toString();
+ if (dirs.length == 0) {
+ throw new IllegalStateException("Can't find taverna-command* distro in " + utilDir);
+ }
+ File script = new File(dirs[0], "executeworkflow.sh");
+ if (! script.isFile()) {
+ throw new IllegalStateException("Can't find launcher script " + script);
+ }
+ return script.toString();
}
/**