class loader sharing workflow by default Removed strange self-checks of classLoaderSharing == classLoaderSharing..
git-svn-id: http://taverna.googlecode.com/svn/taverna/engine/net.sf.taverna.t2.activities/trunk/dependency-activity@15912 bf327186-88b3-11dd-a302-d386e5130c1c Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/76aebac4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/76aebac4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/76aebac4 Branch: refs/heads/master Commit: 76aebac486a0c1b80485b345c0f66d438cd037ef Parents: 4b383f5 Author: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Authored: Tue Jul 23 12:24:16 2013 +0000 Committer: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Committed: Tue Jul 23 12:24:16 2013 +0000 ---------------------------------------------------------------------- .../AbstractAsynchronousDependencyActivity.java | 9 ++------- .../DependencyActivityConfigurationBean.java | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/76aebac4/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java index 4eb4799..09b6e98 100644 --- a/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java +++ b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/AbstractAsynchronousDependencyActivity.java @@ -236,7 +236,7 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy * retrieve the workflow) that will be added to this activity classloader's list of URLs. */ private HashSet<URL> findDependencies(String dependencyType, JsonNode json, String workflowRunID) { - ClassLoaderSharing classLoaderSharing = ClassLoaderSharing.valueOf(json.get("classLoaderSharing").textValue()); + ClassLoaderSharing classLoaderSharing = ClassLoaderSharing.fromString(json.get("classLoaderSharing").textValue()); // Get the WorkflowInstanceFacade which contains the current workflow WeakReference<WorkflowInstanceFacade> wfFacadeRef = WorkflowInstanceFacade.workflowRunFacades.get(workflowRunID); WorkflowInstanceFacade wfFacade = null; @@ -267,7 +267,6 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy Activity<?> activity = proc.getActivityList().get(0); if (activity instanceof AbstractAsynchronousDependencyActivity){ AbstractAsynchronousDependencyActivity dependencyActivity = (AbstractAsynchronousDependencyActivity) activity; - if (ClassLoaderSharing.valueOf(dependencyActivity.getConfiguration().get("classLoaderSharing").textValue()) == classLoaderSharing) { // if (dependencyType.equals(LOCAL_JARS)){ // Collect the files of all found local dependencies if (dependencyActivity.getConfiguration().has("localDependency")) { @@ -290,7 +289,6 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy // dependencies.add(rep.jarFile(art)); // } // } - } } } } @@ -342,7 +340,7 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy * Finds dependencies for a nested workflow. */ private HashSet<URL> findNestedDependencies(String dependencyType, JsonNode json, Dataflow nestedWorkflow) { - ClassLoaderSharing classLoaderSharing = ClassLoaderSharing.valueOf(json.get("classLoaderSharing").textValue()); + ClassLoaderSharing classLoaderSharing = ClassLoaderSharing.fromString(json.get("classLoaderSharing").textValue()); // Files of dependencies for all activities in the nested workflow that share the classloading policy HashSet<File> dependencies = new HashSet<File>(); @@ -360,8 +358,6 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy Activity<?> activity = proc.getActivityList().get(0); if (activity instanceof AbstractAsynchronousDependencyActivity){ AbstractAsynchronousDependencyActivity dependencyActivity = (AbstractAsynchronousDependencyActivity) activity; - if (ClassLoaderSharing.valueOf(dependencyActivity.getConfiguration().get("classLoaderSharing").textValue()) == classLoaderSharing) { - // if (dependencyType.equals(LOCAL_JARS)){ // Collect the files of all found local dependencies for (JsonNode jar : dependencyActivity.getConfiguration().get("localDependency")) { @@ -381,7 +377,6 @@ public abstract class AbstractAsynchronousDependencyActivity extends AbstractAsy // dependencies.add(rep.jarFile(art)); // } // } - } } } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/76aebac4/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/DependencyActivityConfigurationBean.java ---------------------------------------------------------------------- diff --git a/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/DependencyActivityConfigurationBean.java b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/DependencyActivityConfigurationBean.java index 4e3bc22..afe75e2 100644 --- a/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/DependencyActivityConfigurationBean.java +++ b/src/main/java/net/sf/taverna/t2/activities/dependencyactivity/DependencyActivityConfigurationBean.java @@ -54,7 +54,7 @@ public class DependencyActivityConfigurationBean extends * Constructor. */ public DependencyActivityConfigurationBean(){ - classLoaderSharing = ClassLoaderSharing.workflow; + classLoaderSharing = ClassLoaderSharing.DEFAULT; localDependencies = new LinkedHashSet<String>(); } @@ -65,7 +65,7 @@ public class DependencyActivityConfigurationBean extends */ private Object readResolve(){ if (classLoaderSharing == null) - classLoaderSharing = ClassLoaderSharing.workflow; + classLoaderSharing = ClassLoaderSharing.DEFAULT; if (localDependencies == null) localDependencies = new LinkedHashSet<String>();
