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:51 UTC
[03/11] incubator-taverna-server git commit: Support both Taverna 2.5
and 3.1 command line folder
Support both Taverna 2.5 and 3.1 command line folder
as Taverna 3 uses "taverna-command-line" folder name
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/b68f7b1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/b68f7b1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/b68f7b1f
Branch: refs/heads/master
Commit: b68f7b1f846773d09bde9a718c22f20aeb9786ae
Parents: 20916dd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 10 14:55:23 2017 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 10 14:55:23 2017 +0000
----------------------------------------------------------------------
.../taverna/server/master/localworker/LocalWorkerState.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b68f7b1f/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 e5bb938..8ca05cc 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
@@ -210,7 +210,9 @@ public class LocalWorkerState extends JDOSupport<PersistedState> implements
File[] dirs = utilDir.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
- return name.startsWith("taverna-commandline-");
+ // Support both taverna-commandline* (2.5) and
+ // taverna-command-line* (3.1)
+ return name.startsWith("taverna-command");
}
});
assert dirs.length > 0;
@@ -464,4 +466,4 @@ public class LocalWorkerState extends JDOSupport<PersistedState> implements
loadedState = true;
}
-}
\ No newline at end of file
+}