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:17:57 UTC

[41/52] [abbrv] incubator-taverna-language git commit: Delete a bunch of unused files.

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7e05272d/taverna-scufl2-wfdesc/src/test/resources/3582.wfdesc.ttl
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/resources/3582.wfdesc.ttl b/taverna-scufl2-wfdesc/src/test/resources/3582.wfdesc.ttl
deleted file mode 100644
index 8773605..0000000
--- a/taverna-scufl2-wfdesc/src/test/resources/3582.wfdesc.ttl
+++ /dev/null
@@ -1,659 +0,0 @@
-@base <http://ns.taverna.org.uk/2010/workflowBundle/3e3db071-bf6f-42aa-9e33-db67beec6a4d/workflow/Select_algorithm_and/> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix prov: <http://www.w3.org/ns/prov#> .
-@prefix wfdesc: <http://purl.org/wf4ever/wfdesc#> .
-@prefix wf4ever: <http://purl.org/wf4ever/wf4ever#> .
-@prefix roterms: <http://purl.org/wf4ever/roterms#> .
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix comp: <http://purl.org/DP/components#> .
-@prefix dep: <http://scape.keep.pt/vocab/dependencies#> .
-@prefix biocat: <http://biocatalogue.org/attribute/> .
-@prefix : <#> .
-
-<processor/Flatten_List_2/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Flatten_List_2" ;
-	wfdesc:hasInput <processor/Flatten_List_2/in/inputlist> ;
-	wfdesc:hasOutput <processor/Flatten_List_2/out/outputlist> ;
-	wf4ever:script """flatten(inputs, outputs, depth) {
-	for (i = inputs.iterator(); i.hasNext();) {
-	    element = i.next();
-		if (element instanceof Collection && depth > 0) {
-			flatten(element, outputs, depth - 1);
-		} else {
-			outputs.add(element);
-		}
-	}
-}
-
-outputlist = new ArrayList();
-
-flatten(inputlist, outputlist, 1);""" .
-
-<processor/Flatten_List_3/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Flatten_List_3" ;
-	wfdesc:hasInput <processor/Flatten_List_3/in/inputlist> ;
-	wfdesc:hasOutput <processor/Flatten_List_3/out/outputlist> ;
-	wf4ever:script """flatten(inputs, outputs, depth) {
-	for (i = inputs.iterator(); i.hasNext();) {
-	    element = i.next();
-		if (element instanceof Collection && depth > 0) {
-			flatten(element, outputs, depth - 1);
-		} else {
-			outputs.add(element);
-		}
-	}
-}
-
-outputlist = new ArrayList();
-
-flatten(inputlist, outputlist, 1);""" .
-
-<processor/Flatten_List_4/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Flatten_List_4" ;
-	wfdesc:hasInput <processor/Flatten_List_4/in/inputlist> ;
-	wfdesc:hasOutput <processor/Flatten_List_4/out/outputlist> ;
-	wf4ever:script """flatten(inputs, outputs, depth) {
-	for (i = inputs.iterator(); i.hasNext();) {
-	    element = i.next();
-		if (element instanceof Collection && depth > 0) {
-			flatten(element, outputs, depth - 1);
-		} else {
-			outputs.add(element);
-		}
-	}
-}
-
-outputlist = new ArrayList();
-
-flatten(inputlist, outputlist, 1);""" .
-
-<processor/Flatten_List_5/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Flatten_List_5" ;
-	wfdesc:hasInput <processor/Flatten_List_5/in/inputlist> ;
-	wfdesc:hasOutput <processor/Flatten_List_5/out/outputlist> ;
-	wf4ever:script """flatten(inputs, outputs, depth) {
-	for (i = inputs.iterator(); i.hasNext();) {
-	    element = i.next();
-		if (element instanceof Collection && depth > 0) {
-			flatten(element, outputs, depth - 1);
-		} else {
-			outputs.add(element);
-		}
-	}
-}
-
-outputlist = new ArrayList();
-
-flatten(inputlist, outputlist, 1);""" .
-
-<processor/Flatten_List_6/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Flatten_List_6" ;
-	wfdesc:hasInput <processor/Flatten_List_6/in/inputlist> ;
-	wfdesc:hasOutput <processor/Flatten_List_6/out/outputlist> ;
-	wf4ever:script """flatten(inputs, outputs, depth) {
-	for (i = inputs.iterator(); i.hasNext();) {
-	    element = i.next();
-		if (element instanceof Collection && depth > 0) {
-			flatten(element, outputs, depth - 1);
-		} else {
-			outputs.add(element);
-		}
-	}
-}
-
-outputlist = new ArrayList();
-
-flatten(inputlist, outputlist, 1);""" .
-
-<processor/Merge_String_List_to_a_String/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Merge_String_List_to_a_String" ;
-	wfdesc:hasInput <processor/Merge_String_List_to_a_String/in/stringlist> ;
-	wfdesc:hasOutput <processor/Merge_String_List_to_a_String/out/concatenated> ;
-	wf4ever:script """String seperatorString = \"\\n\";
-if (seperator != void) {
-	seperatorString = seperator;
-}
-StringBuffer sb = new StringBuffer();
-for (Iterator i = stringlist.iterator(); i.hasNext();) {
-	String item = (String) i.next();
-	sb.append(item);
-	if (i.hasNext()) {
-		sb.append(seperatorString);
-	}
-}
-concatenated = sb.toString();
-""" .
-
-<processor/Merge_String_List_to_a_String_2/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Merge_String_List_to_a_String_2" ;
-	wfdesc:hasInput <processor/Merge_String_List_to_a_String_2/in/stringlist> ;
-	wfdesc:hasOutput <processor/Merge_String_List_to_a_String_2/out/concatenated> ;
-	wf4ever:script """String seperatorString = \"\\n\";
-if (seperator != void) {
-	seperatorString = seperator;
-}
-StringBuffer sb = new StringBuffer();
-for (Iterator i = stringlist.iterator(); i.hasNext();) {
-	String item = (String) i.next();
-	sb.append(item);
-	if (i.hasNext()) {
-		sb.append(seperatorString);
-	}
-}
-concatenated = sb.toString();
-""" .
-
-<processor/XPath_From_Text/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "XPath_From_Text" ;
-	wfdesc:hasInput <processor/XPath_From_Text/in/xml-text> , <processor/XPath_From_Text/in/xpath> ;
-	wfdesc:hasOutput <processor/XPath_From_Text/out/nodelistAsXML> ;
-	wf4ever:script """import org.dom4j.Document;
-import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-
-SAXReader reader = new SAXReader(false);
-reader.setIncludeInternalDTDDeclarations(false);
-reader.setIncludeExternalDTDDeclarations(false);
-
-Document document = reader.read(new StringReader(xmltext));
-List nodelist = document.selectNodes(xpath);
-
-// Process the elements in the nodelist
-ArrayList outputList = new ArrayList();
-ArrayList outputXmlList = new ArrayList();
-
-String val = null;
-String xmlVal = null;
-for (Iterator iter = nodelist.iterator(); iter.hasNext();) {
-	Node element = (Node) iter.next();
-	xmlVal = element.asXML();
-	val = element.getStringValue();
-	if (val != null && !val.equals(\"\")) {
-		outputList.add(val);
-		outputXmlList.add(xmlVal);
-	}
-
-}
-
-List nodelist=outputList;
-List nodelistAsXML=outputXmlList;""" .
-
-<processor/XPath_From_Text_2/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "XPath_From_Text_2" ;
-	wfdesc:hasInput <processor/XPath_From_Text_2/in/xml-text> , <processor/XPath_From_Text_2/in/xpath> ;
-	wfdesc:hasOutput <processor/XPath_From_Text_2/out/nodelistAsXML> ;
-	wf4ever:script """import org.dom4j.Document;
-import org.dom4j.Node;
-import org.dom4j.io.SAXReader;
-
-SAXReader reader = new SAXReader(false);
-reader.setIncludeInternalDTDDeclarations(false);
-reader.setIncludeExternalDTDDeclarations(false);
-
-Document document = reader.read(new StringReader(xmltext));
-List nodelist = document.selectNodes(xpath);
-
-// Process the elements in the nodelist
-ArrayList outputList = new ArrayList();
-ArrayList outputXmlList = new ArrayList();
-
-String val = null;
-String xmlVal = null;
-for (Iterator iter = nodelist.iterator(); iter.hasNext();) {
-	Node element = (Node) iter.next();
-	xmlVal = element.asXML();
-	val = element.getStringValue();
-	if (val != null && !val.equals(\"\")) {
-		outputList.add(val);
-		outputXmlList.add(xmlVal);
-	}
-
-}
-
-List nodelist=outputList;
-List nodelistAsXML=outputXmlList;""" .
-
-<processor/check_parameters/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "check_parameters" ;
-	wfdesc:hasInput <processor/check_parameters/in/xml_parameter_list> ;
-	wfdesc:hasOutput <processor/check_parameters/out/has_parameters> , <processor/check_parameters/out/no_parameters> ;
-	wf4ever:script """import java.util.ArrayList;
-
-ArrayList has_parameters = new ArrayList();
-ArrayList no_parameters = new ArrayList();
-
-if (xml_parameter_list.size() == 0) {
-
-	no_parameters.add(1);
-}
-else {
-
-	has_parameters.add(1);
-}
-
-""" .
-
-<processor/create_algorithm_xml/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "create_algorithm_xml" ;
-	wfdesc:hasInput <processor/create_algorithm_xml/in/algorithm_id> , <processor/create_algorithm_xml/in/algorithm_version> , <processor/create_algorithm_xml/in/parameter_names> , <processor/create_algorithm_xml/in/parameter_values> ;
-	wfdesc:hasOutput <processor/create_algorithm_xml/out/createmodel_algorithm> ;
-	wf4ever:script """createmodel_algorithm=\"\";
-
-createmodel_algorithm+=
-	\"<Algorithm Version=\\\"\" + algorithm_version + \"\\\" \" +
-	\"Id=\\\"\" + algorithm_id + \"\\\">\";
-createmodel_algorithm += \"\\n\";
-createmodel_algorithm += \"<Parameters>\\n\";
-for (int i = 0; i < parameter_names.size(); i++) {
-	createmodel_algorithm += \"<Parameter \";
-	createmodel_algorithm += \"Value=\\\"\" + parameter_values.get(i);
-	createmodel_algorithm += \"\\\" Id=\\\"\" + parameter_names.get(i);
-	createmodel_algorithm += \"\\\"/>\\n\";
-}
-createmodel_algorithm += \"</Parameters>\";
-createmodel_algorithm += \"</Algorithm>\";
-createmodel_algorithm += \"\\n\";
-
-
-""" .
-
-<processor/create_xpath_to_get_algorithm/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "create_xpath_to_get_algorithm" ;
-	wfdesc:hasInput <processor/create_xpath_to_get_algorithm/in/in1> ;
-	wfdesc:hasOutput <processor/create_xpath_to_get_algorithm/out/out1> ;
-	wf4ever:script "out1 = \"//*[local-name()=\\\"Algorithm\\\" and @Id=\\\"\" + in1 + \"\\\"]\";" .
-
-<../Workflow74/processor/clear_list/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "clear_list" ;
-	wfdesc:hasInput <../Workflow74/processor/clear_list/in/input_list> ;
-	wfdesc:hasOutput <../Workflow74/processor/clear_list/out/empty_list> ;
-	wf4ever:script """empty_list = input_list;
-empty_list.clear();""" .
-
-<../Workflow78/processor/Flatten_List/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "Flatten_List" ;
-	wfdesc:hasInput <../Workflow78/processor/Flatten_List/in/inputlist> ;
-	wfdesc:hasOutput <../Workflow78/processor/Flatten_List/out/outputlist> ;
-	wf4ever:script """flatten(inputs, outputs, depth) {
-	for (i = inputs.iterator(); i.hasNext();) {
-	    element = i.next();
-		if (element instanceof Collection && depth > 0) {
-			flatten(element, outputs, depth - 1);
-		} else {
-			outputs.add(element);
-		}
-	}
-}
-
-outputlist = new ArrayList();
-
-flatten(inputlist, outputlist, 1);""" .
-
-<datalink?from=in/algorithms_xml&to=processor/XPath_From_Text/in/xml-text> a wfdesc:DataLink ;
-	wfdesc:hasSource <in/algorithms_xml> ;
-	wfdesc:hasSink <processor/XPath_From_Text/in/xml-text> .
-
-<datalink?from=in/algorithms_xml&to=processor/select_algorithm/in/xmltext> a wfdesc:DataLink ;
-	wfdesc:hasSource <in/algorithms_xml> ;
-	wfdesc:hasSink <processor/select_algorithm/in/xmltext> .
-
-<datalink?from=processor/Flatten_List_2/out/outputlist&to=processor/Flatten_List_5/in/inputlist&mergePosition=1> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Flatten_List_2/out/outputlist> ;
-	wfdesc:hasSink <processor/Flatten_List_5/in/inputlist> .
-
-<datalink?from=processor/Flatten_List_2/out/outputlist&to=processor/Flatten_List_6/in/inputlist&mergePosition=1> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Flatten_List_2/out/outputlist> ;
-	wfdesc:hasSink <processor/Flatten_List_6/in/inputlist> .
-
-<datalink?from=processor/Flatten_List_3/out/outputlist&to=processor/Flatten_List_6/in/inputlist&mergePosition=0> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Flatten_List_3/out/outputlist> ;
-	wfdesc:hasSink <processor/Flatten_List_6/in/inputlist> .
-
-<datalink?from=processor/Flatten_List_4/out/outputlist&to=processor/Flatten_List_5/in/inputlist&mergePosition=0> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Flatten_List_4/out/outputlist> ;
-	wfdesc:hasSink <processor/Flatten_List_5/in/inputlist> .
-
-<datalink?from=processor/Flatten_List_5/out/outputlist&to=processor/create_algorithm_xml/in/parameter_values> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Flatten_List_5/out/outputlist> ;
-	wfdesc:hasSink <processor/create_algorithm_xml/in/parameter_values> .
-
-<datalink?from=processor/Flatten_List_6/out/outputlist&to=processor/create_algorithm_xml/in/parameter_names> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Flatten_List_6/out/outputlist> ;
-	wfdesc:hasSink <processor/create_algorithm_xml/in/parameter_names> .
-
-<datalink?from=processor/Merge_String_List_to_a_String/out/concatenated&to=processor/XPath_From_Text_2/in/xml-text> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Merge_String_List_to_a_String/out/concatenated> ;
-	wfdesc:hasSink <processor/XPath_From_Text_2/in/xml-text> .
-
-<datalink?from=processor/Merge_String_List_to_a_String/out/concatenated&to=processor/extract_algorithm_version/in/xml_text> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Merge_String_List_to_a_String/out/concatenated> ;
-	wfdesc:hasSink <processor/extract_algorithm_version/in/xml_text> .
-
-<datalink?from=processor/Merge_String_List_to_a_String_2/out/concatenated&to=processor/create_algorithm_xml/in/algorithm_version> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/Merge_String_List_to_a_String_2/out/concatenated> ;
-	wfdesc:hasSink <processor/create_algorithm_xml/in/algorithm_version> .
-
-<datalink?from=processor/XPath_From_Text/out/nodelistAsXML&to=processor/Merge_String_List_to_a_String/in/stringlist> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/XPath_From_Text/out/nodelistAsXML> ;
-	wfdesc:hasSink <processor/Merge_String_List_to_a_String/in/stringlist> .
-
-<datalink?from=processor/XPath_From_Text_2/out/nodelistAsXML&to=processor/check_parameters/in/xml_parameter_list> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/XPath_From_Text_2/out/nodelistAsXML> ;
-	wfdesc:hasSink <processor/check_parameters/in/xml_parameter_list> .
-
-<datalink?from=processor/XPath_From_Text_2/out/nodelistAsXML&to=processor/parameters_interaction/in/xml_list> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/XPath_From_Text_2/out/nodelistAsXML> ;
-	wfdesc:hasSink <processor/parameters_interaction/in/xml_list> .
-
-<datalink?from=processor/check_parameters/out/has_parameters&to=processor/parameters_interaction/in/flag> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/check_parameters/out/has_parameters> ;
-	wfdesc:hasSink <processor/parameters_interaction/in/flag> .
-
-<datalink?from=processor/check_parameters/out/no_parameters&to=processor/skip_parameters_interaction/in/flag> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/check_parameters/out/no_parameters> ;
-	wfdesc:hasSink <processor/skip_parameters_interaction/in/flag> .
-
-<datalink?from=processor/create_algorithm_xml/out/createmodel_algorithm&to=out/algorithm> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/create_algorithm_xml/out/createmodel_algorithm> ;
-	wfdesc:hasSink <out/algorithm> .
-
-<datalink?from=processor/create_xpath_to_get_algorithm/out/out1&to=processor/XPath_From_Text/in/xpath> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/create_xpath_to_get_algorithm/out/out1> ;
-	wfdesc:hasSink <processor/XPath_From_Text/in/xpath> .
-
-<datalink?from=processor/extract_algorithm_version/out/nodelist&to=processor/Merge_String_List_to_a_String_2/in/stringlist> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/extract_algorithm_version/out/nodelist> ;
-	wfdesc:hasSink <processor/Merge_String_List_to_a_String_2/in/stringlist> .
-
-<datalink?from=processor/extract_parameter_xpath/out/value&to=processor/XPath_From_Text_2/in/xpath> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/extract_parameter_xpath/out/value> ;
-	wfdesc:hasSink <processor/XPath_From_Text_2/in/xpath> .
-
-<datalink?from=processor/parameters_interaction/out/names&to=processor/Flatten_List_3/in/inputlist> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/parameters_interaction/out/names> ;
-	wfdesc:hasSink <processor/Flatten_List_3/in/inputlist> .
-
-<datalink?from=processor/parameters_interaction/out/values&to=processor/Flatten_List_4/in/inputlist> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/parameters_interaction/out/values> ;
-	wfdesc:hasSink <processor/Flatten_List_4/in/inputlist> .
-
-<datalink?from=processor/select_algorithm/out/algorithm_id&to=processor/create_algorithm_xml/in/algorithm_id> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/select_algorithm/out/algorithm_id> ;
-	wfdesc:hasSink <processor/create_algorithm_xml/in/algorithm_id> .
-
-<datalink?from=processor/select_algorithm/out/algorithm_id&to=processor/create_xpath_to_get_algorithm/in/in1> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/select_algorithm/out/algorithm_id> ;
-	wfdesc:hasSink <processor/create_xpath_to_get_algorithm/in/in1> .
-
-<datalink?from=processor/skip_parameters_interaction/out/empty_list&to=processor/Flatten_List_2/in/inputlist> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/skip_parameters_interaction/out/empty_list> ;
-	wfdesc:hasSink <processor/Flatten_List_2/in/inputlist> .
-
-<../Workflow74/datalink?from=in/flag&to=processor/clear_list/in/input_list> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow74/in/flag> ;
-	wfdesc:hasSink <../Workflow74/processor/clear_list/in/input_list> .
-
-<../Workflow74/datalink?from=processor/clear_list/out/empty_list&to=out/empty_list> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow74/processor/clear_list/out/empty_list> ;
-	wfdesc:hasSink <../Workflow74/out/empty_list> .
-
-<../Workflow78/datalink?from=in/xml_list&to=processor/extract_parameter_id/in/xml_text> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow78/in/xml_list> ;
-	wfdesc:hasSink <../Workflow78/processor/extract_parameter_id/in/xml_text> .
-
-<../Workflow78/datalink?from=in/xml_list&to=processor/set_algorithm_parameters/in/xml_list> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow78/in/xml_list> ;
-	wfdesc:hasSink <../Workflow78/processor/set_algorithm_parameters/in/xml_list> .
-
-<../Workflow78/datalink?from=processor/Flatten_List/out/outputlist&to=out/names> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow78/processor/Flatten_List/out/outputlist> ;
-	wfdesc:hasSink <../Workflow78/out/names> .
-
-<../Workflow78/datalink?from=processor/extract_parameter_id/out/nodelist&to=processor/Flatten_List/in/inputlist> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow78/processor/extract_parameter_id/out/nodelist> ;
-	wfdesc:hasSink <../Workflow78/processor/Flatten_List/in/inputlist> .
-
-<../Workflow78/datalink?from=processor/set_algorithm_parameters/out/values&to=out/values> a wfdesc:DataLink ;
-	wfdesc:hasSource <../Workflow78/processor/set_algorithm_parameters/out/values> ;
-	wfdesc:hasSink <../Workflow78/out/values> .
-
-<> a wfdesc:Workflow , wfdesc:Description , wfdesc:Process ;
-	dcterms:title "Select algorithm and set parameter values" ;
-	dc:creator "Alan R Williams & Renato De Giovanni" ;
-	dcterms:description "Select the algorithm to be used and specify its parameter values." ;
-	rdfs:label "Select_algorithm_and" ;
-	wfdesc:hasInput <in/algorithms_xml> ;
-	wfdesc:hasOutput <out/algorithm> ;
-	wfdesc:hasSubProcess <processor/Flatten_List_2/> , <processor/Flatten_List_3/> , <processor/Flatten_List_4/> , <processor/Flatten_List_5/> , <processor/Flatten_List_6/> , <processor/Merge_String_List_to_a_String/> , <processor/Merge_String_List_to_a_String_2/> , <processor/XPath_From_Text/> , <processor/XPath_From_Text_2/> , <processor/check_parameters/> , <processor/create_algorithm_xml/> , <processor/create_xpath_to_get_algorithm/> , <processor/extract_algorithm_version/> , <processor/extract_parameter_xpath/> , <processor/parameters_interaction/> , <processor/select_algorithm/> , <processor/skip_parameters_interaction/> ;
-	wfdesc:hasDataLink <datalink?from=processor/Flatten_List_2/out/outputlist&to=processor/Flatten_List_5/in/inputlist&mergePosition=1> , <datalink?from=processor/Flatten_List_2/out/outputlist&to=processor/Flatten_List_6/in/inputlist&mergePosition=1> , <datalink?from=processor/Flatten_List_3/out/outputlist&to=processor/Flatten_List_6/in/inputlist&mergePosition=0> , <datalink?from=processor/Flatten_List_4/out/outputlist&to=processor/Flatten_List_5/in/inputlist&mergePosition=0> , <datalink?from=processor/Flatten_List_5/out/outputlist&to=processor/create_algorithm_xml/in/parameter_values> , <datalink?from=processor/Flatten_List_6/out/outputlist&to=processor/create_algorithm_xml/in/parameter_names> , <datalink?from=processor/Merge_String_List_to_a_String/out/concatenated&to=processor/XPath_From_Text_2/in/xml-text> , <datalink?from=processor/Merge_String_List_to_a_String/out/concatenated&to=processor/extract_algorithm_version/in/xml_text> , <datalink?from=processor/Merge_String_List_to_a_St
 ring_2/out/concatenated&to=processor/create_algorithm_xml/in/algorithm_version> , <datalink?from=processor/XPath_From_Text/out/nodelistAsXML&to=processor/Merge_String_List_to_a_String/in/stringlist> , <datalink?from=processor/XPath_From_Text_2/out/nodelistAsXML&to=processor/check_parameters/in/xml_parameter_list> , <datalink?from=processor/XPath_From_Text_2/out/nodelistAsXML&to=processor/parameters_interaction/in/xml_list> , <datalink?from=processor/check_parameters/out/has_parameters&to=processor/parameters_interaction/in/flag> , <datalink?from=processor/check_parameters/out/no_parameters&to=processor/skip_parameters_interaction/in/flag> , <datalink?from=processor/create_algorithm_xml/out/createmodel_algorithm&to=out/algorithm> , <datalink?from=processor/create_xpath_to_get_algorithm/out/out1&to=processor/XPath_From_Text/in/xpath> , <datalink?from=processor/extract_algorithm_version/out/nodelist&to=processor/Merge_String_List_to_a_String_2/in/stringlist> , <datalink?from=processor/
 extract_parameter_xpath/out/value&to=processor/XPath_From_Text_2/in/xpath> , <datalink?from=processor/parameters_interaction/out/names&to=processor/Flatten_List_3/in/inputlist> , <datalink?from=processor/parameters_interaction/out/values&to=processor/Flatten_List_4/in/inputlist> , <datalink?from=processor/select_algorithm/out/algorithm_id&to=processor/create_algorithm_xml/in/algorithm_id> , <datalink?from=processor/select_algorithm/out/algorithm_id&to=processor/create_xpath_to_get_algorithm/in/in1> , <datalink?from=processor/skip_parameters_interaction/out/empty_list&to=processor/Flatten_List_2/in/inputlist> , <datalink?from=in/algorithms_xml&to=processor/XPath_From_Text/in/xml-text> , <datalink?from=in/algorithms_xml&to=processor/select_algorithm/in/xmltext> .
-
-<in/algorithms_xml> a wfdesc:Input , wfdesc:Description , wfdesc:Output ;
-	rdfs:label "algorithms_xml" .
-
-<out/algorithm> a wfdesc:Output , wfdesc:Description , wfdesc:Input ;
-	dcterms:description "The algorithm and the parameter settings specified by the user" ;
-	rdfs:label "algorithm" .
-
-<processor/Flatten_List_2/in/inputlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "inputlist" .
-
-<processor/Flatten_List_2/out/outputlist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "outputlist" .
-
-<processor/Flatten_List_3/in/inputlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "inputlist" .
-
-<processor/Flatten_List_3/out/outputlist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "outputlist" .
-
-<processor/Flatten_List_4/in/inputlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "inputlist" .
-
-<processor/Flatten_List_4/out/outputlist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "outputlist" .
-
-<processor/Flatten_List_5/in/inputlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "inputlist" .
-
-<processor/Flatten_List_5/out/outputlist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "outputlist" .
-
-<processor/Flatten_List_6/in/inputlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "inputlist" .
-
-<processor/Flatten_List_6/out/outputlist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "outputlist" .
-
-<processor/Merge_String_List_to_a_String/in/stringlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "stringlist" .
-
-<processor/Merge_String_List_to_a_String/out/concatenated> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "concatenated" .
-
-<processor/Merge_String_List_to_a_String_2/in/stringlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "stringlist" .
-
-<processor/Merge_String_List_to_a_String_2/out/concatenated> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "concatenated" .
-
-<processor/XPath_From_Text/in/xml-text> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml-text" .
-
-<processor/XPath_From_Text/in/xpath> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xpath" .
-
-<processor/XPath_From_Text/out/nodelistAsXML> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "nodelistAsXML" .
-
-<processor/XPath_From_Text_2/in/xml-text> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml-text" .
-
-<processor/XPath_From_Text_2/in/xpath> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xpath" .
-
-<processor/XPath_From_Text_2/out/nodelistAsXML> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "nodelistAsXML" .
-
-<processor/check_parameters/in/xml_parameter_list> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml_parameter_list" .
-
-<processor/check_parameters/out/has_parameters> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "has_parameters" .
-
-<processor/check_parameters/out/no_parameters> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "no_parameters" .
-
-<processor/create_algorithm_xml/in/algorithm_id> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "algorithm_id" .
-
-<processor/create_algorithm_xml/in/algorithm_version> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "algorithm_version" .
-
-<processor/create_algorithm_xml/in/parameter_names> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "parameter_names" .
-
-<processor/create_algorithm_xml/in/parameter_values> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "parameter_values" .
-
-<processor/create_algorithm_xml/out/createmodel_algorithm> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "createmodel_algorithm" .
-
-<processor/create_xpath_to_get_algorithm/in/in1> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "in1" .
-
-<processor/create_xpath_to_get_algorithm/out/out1> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "out1" .
-
-<processor/extract_algorithm_version/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "extract_algorithm_version" ;
-	wfdesc:hasInput <processor/extract_algorithm_version/in/xml_text> ;
-	wfdesc:hasOutput <processor/extract_algorithm_version/out/nodelist> .
-
-<processor/extract_algorithm_version/in/xml_text> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml_text" .
-
-<processor/extract_algorithm_version/out/nodelist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "nodelist" .
-
-<processor/extract_parameter_xpath/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "extract_parameter_xpath" ;
-	wfdesc:hasOutput <processor/extract_parameter_xpath/out/value> .
-
-<processor/extract_parameter_xpath/out/value> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "value" .
-
-<processor/parameters_interaction/> a wfdesc:Process , wfdesc:Description , prov:Entity , wfdesc:Workflow ;
-	rdfs:label "parameters_interaction" ;
-	wfdesc:hasInput <processor/parameters_interaction/in/flag> , <processor/parameters_interaction/in/xml_list> ;
-	wfdesc:hasOutput <processor/parameters_interaction/out/names> , <processor/parameters_interaction/out/values> ;
-	prov:specializationOf <../Workflow78/> .
-
-<processor/parameters_interaction/in/flag> a wfdesc:Input , wfdesc:Description , prov:Entity ;
-	rdfs:label "flag" ;
-	prov:specializationOf <../Workflow78/in/flag> .
-
-<processor/parameters_interaction/in/xml_list> a wfdesc:Input , wfdesc:Description , prov:Entity ;
-	rdfs:label "xml_list" ;
-	prov:specializationOf <../Workflow78/in/xml_list> .
-
-<processor/parameters_interaction/out/names> a wfdesc:Output , wfdesc:Description , prov:Entity ;
-	rdfs:label "names" ;
-	prov:specializationOf <../Workflow78/out/names> .
-
-<processor/parameters_interaction/out/values> a wfdesc:Output , wfdesc:Description , prov:Entity ;
-	rdfs:label "values" ;
-	prov:specializationOf <../Workflow78/out/values> .
-
-<processor/select_algorithm/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "select_algorithm" ;
-	wfdesc:hasInput <processor/select_algorithm/in/xmltext> ;
-	wfdesc:hasOutput <processor/select_algorithm/out/algorithm_id> .
-
-<processor/select_algorithm/in/xmltext> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xmltext" .
-
-<processor/select_algorithm/out/algorithm_id> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "algorithm_id" .
-
-<processor/skip_parameters_interaction/> a wfdesc:Process , wfdesc:Description , prov:Entity , wfdesc:Workflow ;
-	rdfs:label "skip_parameters_interaction" ;
-	wfdesc:hasInput <processor/skip_parameters_interaction/in/flag> ;
-	wfdesc:hasOutput <processor/skip_parameters_interaction/out/empty_list> ;
-	prov:specializationOf <../Workflow74/> .
-
-<processor/skip_parameters_interaction/in/flag> a wfdesc:Input , wfdesc:Description , prov:Entity ;
-	rdfs:label "flag" ;
-	prov:specializationOf <../Workflow74/in/flag> .
-
-<processor/skip_parameters_interaction/out/empty_list> a wfdesc:Output , wfdesc:Description , prov:Entity ;
-	rdfs:label "empty_list" ;
-	prov:specializationOf <../Workflow74/out/empty_list> .
-
-<../Workflow74/> a wfdesc:Workflow , wfdesc:Description , wfdesc:Process , prov:Entity ;
-	rdfs:label "Workflow74" ;
-	wfdesc:hasInput <../Workflow74/in/flag> ;
-	wfdesc:hasOutput <../Workflow74/out/empty_list> ;
-	wfdesc:hasSubProcess <../Workflow74/processor/clear_list/> ;
-	wfdesc:hasDataLink <../Workflow74/datalink?from=processor/clear_list/out/empty_list&to=out/empty_list> , <../Workflow74/datalink?from=in/flag&to=processor/clear_list/in/input_list> .
-
-<../Workflow74/in/flag> a wfdesc:Input , wfdesc:Description , wfdesc:Output , prov:Entity ;
-	rdfs:label "flag" .
-
-<../Workflow74/out/empty_list> a wfdesc:Output , wfdesc:Description , wfdesc:Input , prov:Entity ;
-	rdfs:label "empty_list" .
-
-<../Workflow74/processor/clear_list/in/input_list> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "input_list" .
-
-<../Workflow74/processor/clear_list/out/empty_list> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "empty_list" .
-
-<../Workflow78/> a wfdesc:Workflow , wfdesc:Description , wfdesc:Process , prov:Entity ;
-	rdfs:label "Workflow78" ;
-	wfdesc:hasInput <../Workflow78/in/flag> , <../Workflow78/in/xml_list> ;
-	wfdesc:hasOutput <../Workflow78/out/names> , <../Workflow78/out/values> ;
-	wfdesc:hasSubProcess <../Workflow78/processor/Flatten_List/> , <../Workflow78/processor/extract_parameter_id/> , <../Workflow78/processor/set_algorithm_parameters/> ;
-	wfdesc:hasDataLink <../Workflow78/datalink?from=processor/Flatten_List/out/outputlist&to=out/names> , <../Workflow78/datalink?from=processor/extract_parameter_id/out/nodelist&to=processor/Flatten_List/in/inputlist> , <../Workflow78/datalink?from=processor/set_algorithm_parameters/out/values&to=out/values> , <../Workflow78/datalink?from=in/xml_list&to=processor/extract_parameter_id/in/xml_text> , <../Workflow78/datalink?from=in/xml_list&to=processor/set_algorithm_parameters/in/xml_list> .
-
-<../Workflow78/in/flag> a wfdesc:Input , wfdesc:Description , prov:Entity ;
-	rdfs:label "flag" .
-
-<../Workflow78/in/xml_list> a wfdesc:Input , wfdesc:Description , wfdesc:Output , prov:Entity ;
-	rdfs:label "xml_list" .
-
-<../Workflow78/out/names> a wfdesc:Output , wfdesc:Description , wfdesc:Input , prov:Entity ;
-	rdfs:label "names" .
-
-<../Workflow78/out/values> a wfdesc:Output , wfdesc:Description , wfdesc:Input , prov:Entity ;
-	rdfs:label "values" .
-
-<../Workflow78/processor/Flatten_List/in/inputlist> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "inputlist" .
-
-<../Workflow78/processor/Flatten_List/out/outputlist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "outputlist" .
-
-<../Workflow78/processor/extract_parameter_id/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "extract_parameter_id" ;
-	wfdesc:hasInput <../Workflow78/processor/extract_parameter_id/in/xml_text> ;
-	wfdesc:hasOutput <../Workflow78/processor/extract_parameter_id/out/nodelist> .
-
-<../Workflow78/processor/extract_parameter_id/in/xml_text> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml_text" .
-
-<../Workflow78/processor/extract_parameter_id/out/nodelist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "nodelist" .
-
-<../Workflow78/processor/set_algorithm_parameters/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "set_algorithm_parameters" ;
-	wfdesc:hasInput <../Workflow78/processor/set_algorithm_parameters/in/xml_list> ;
-	wfdesc:hasOutput <../Workflow78/processor/set_algorithm_parameters/out/values> .
-
-<../Workflow78/processor/set_algorithm_parameters/in/xml_list> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml_list" .
-
-<../Workflow78/processor/set_algorithm_parameters/out/values> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "values" .

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7e05272d/taverna-scufl2-wfdesc/src/test/resources/allTypes.types.sparql.json
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/resources/allTypes.types.sparql.json b/taverna-scufl2-wfdesc/src/test/resources/allTypes.types.sparql.json
deleted file mode 100644
index eb18772..0000000
--- a/taverna-scufl2-wfdesc/src/test/resources/allTypes.types.sparql.json
+++ /dev/null
@@ -1,77 +0,0 @@
-    "head": {
-        "vars": [ "wf", "proc", "procType", "procLabel" ]
-    }, 
-    "results": {
-        "bindings": [
-            {
-                "procLabel": { "type": "literal", "value": "theBeanshell" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#BeanshellScript" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theBeanshell\/" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theNested" }, 
-                "procType": { "type": "uri", "value": "http:\/\/www.w3.org\/ns\/prov#Entity" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theNested\/" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theNested" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wfdesc#Workflow" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theNested\/" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theREST" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#RESTService" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theREST\/" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theRscript" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#RScript" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theRscript\/" }
-            }, 
-            {
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theSpreadsheet\/" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "procLabel": { "type": "literal", "value": "theSpreadsheet" }
-            }, 
-            {
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theText\/" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "procLabel": { "type": "literal", "value": "theText" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theTool" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#CommandLineTool" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theTool\/" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theToolRepository" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#CommandLineTool" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theToolRepository\/" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theWsdl" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#SOAPService" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theWsdl\/" }
-            }, 
-            {
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/processor\/theXPath\/" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/All_types\/" }, 
-                "procLabel": { "type": "literal", "value": "theXPath" }
-            }, 
-            {
-                "procLabel": { "type": "literal", "value": "theLocal" }, 
-                "procType": { "type": "uri", "value": "http:\/\/purl.org\/wf4ever\/wf4ever#BeanshellScript" }, 
-                "wf": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/theWorkflow\/" }, 
-                "proc": { "type": "uri", "value": "http:\/\/ns.taverna.org.uk\/2010\/workflowBundle\/708f0c31-61b0-4528-a096-9a747e6cdf52\/workflow\/theWorkflow\/processor\/theLocal\/" }
-            }
-        ]
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7e05272d/taverna-scufl2-wfdesc/src/test/resources/allTypes.wfdesc.ttl
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/test/resources/allTypes.wfdesc.ttl b/taverna-scufl2-wfdesc/src/test/resources/allTypes.wfdesc.ttl
deleted file mode 100644
index 902a467..0000000
--- a/taverna-scufl2-wfdesc/src/test/resources/allTypes.wfdesc.ttl
+++ /dev/null
@@ -1,212 +0,0 @@
-@base <http://ns.taverna.org.uk/2010/workflowBundle/708f0c31-61b0-4528-a096-9a747e6cdf52/workflow/All_types/> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix prov: <http://www.w3.org/ns/prov#> .
-@prefix wfdesc: <http://purl.org/wf4ever/wfdesc#> .
-@prefix wf4ever: <http://purl.org/wf4ever/wf4ever#> .
-@prefix roterms: <http://purl.org/wf4ever/roterms#> .
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix comp: <http://purl.org/DP/components#> .
-@prefix dep: <http://scape.keep.pt/vocab/dependencies#> .
-@prefix biocat: <http://biocatalogue.org/attribute/> .
-@prefix : <#> .
-
-<processor/theBeanshell/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "theBeanshell" ;
-	wfdesc:hasOutput <processor/theBeanshell/out/s> ;
-	wf4ever:script "s = \"a beanshell script\";" .
-
-<../theWorkflow/processor/theLocal/> a wfdesc:Process , wfdesc:Description , wf4ever:BeanshellScript ;
-	rdfs:label "theLocal" ;
-	wfdesc:hasInput <../theWorkflow/processor/theLocal/in/string1> ;
-	wfdesc:hasOutput <../theWorkflow/processor/theLocal/out/output> ;
-	wf4ever:script "output = string1 + string2;" .
-
-<processor/theTool/> a wfdesc:Process , wfdesc:Description , wf4ever:CommandLineTool ;
-	rdfs:label "theTool" ;
-	wfdesc:hasOutput <processor/theTool/out/STDERR> , <processor/theTool/out/STDOUT> .
-
-<processor/theToolRepository/> a wfdesc:Process , wfdesc:Description , wf4ever:CommandLineTool ;
-	rdfs:label "theToolRepository" ;
-	wfdesc:hasInput <processor/theToolRepository/in/First_file> , <processor/theToolRepository/in/Second_file> .
-
-<processor/theREST/> a wfdesc:Process , wfdesc:Description , wf4ever:RESTService ;
-	rdfs:label "theREST" ;
-	wfdesc:hasInput <processor/theREST/in/id> ;
-	wfdesc:hasOutput <processor/theREST/out/status> ;
-	wf4ever:rootURI "http://www.uniprot.org/"^^xsd:anyURI .
-
-<processor/theRscript/> a wfdesc:Process , wfdesc:Description , wf4ever:RScript ;
-	rdfs:label "theRscript" ;
-	wfdesc:hasInput <processor/theRscript/in/in1> ;
-	wfdesc:hasOutput <processor/theRscript/out/out1> ;
-	wf4ever:script "\"some r-script\"" .
-
-<processor/theWsdl/> a wfdesc:Process , wfdesc:Description , wf4ever:SOAPService ;
-	rdfs:label "theWsdl" ;
-	wfdesc:hasInput <processor/theWsdl/in/format> , <processor/theWsdl/in/ids> ;
-	wfdesc:hasOutput <processor/theWsdl/out/attachmentList> ;
-	wf4ever:wsdlURI "http://www.ebi.ac.uk/ws/services/urn:Dbfetch?wsdl"^^xsd:anyURI ;
-	wf4ever:wsdlOperationName "fetchBatch" ;
-	wf4ever:rootURI "http://www.ebi.ac.uk/"^^xsd:anyURI .
-
-<datalink?from=processor/theBeanshell/out/s&to=processor/theWsdl/in/format> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theBeanshell/out/s> ;
-	wfdesc:hasSink <processor/theWsdl/in/format> .
-
-<datalink?from=processor/theNested/out/b&to=processor/theXPath/in/xml_text> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theNested/out/b> ;
-	wfdesc:hasSink <processor/theXPath/in/xml_text> .
-
-<datalink?from=processor/theREST/out/status&to=processor/theSpreadsheet/in/fileurl> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theREST/out/status> ;
-	wfdesc:hasSink <processor/theSpreadsheet/in/fileurl> .
-
-<datalink?from=processor/theRscript/out/out1&to=out/out> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theRscript/out/out1> ;
-	wfdesc:hasSink <out/out> .
-
-<datalink?from=processor/theSpreadsheet/out/a1&to=processor/theNested/in/a> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theSpreadsheet/out/a1> ;
-	wfdesc:hasSink <processor/theNested/in/a> .
-
-<datalink?from=processor/theText/out/value&to=processor/theREST/in/id> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theText/out/value> ;
-	wfdesc:hasSink <processor/theREST/in/id> .
-
-<datalink?from=processor/theTool/out/STDERR&to=processor/theToolRepository/in/Second_file> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theTool/out/STDERR> ;
-	wfdesc:hasSink <processor/theToolRepository/in/Second_file> .
-
-<datalink?from=processor/theTool/out/STDOUT&to=processor/theRscript/in/in1> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theTool/out/STDOUT> ;
-	wfdesc:hasSink <processor/theRscript/in/in1> .
-
-<datalink?from=processor/theWsdl/out/attachmentList&to=processor/theToolRepository/in/First_file> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theWsdl/out/attachmentList> ;
-	wfdesc:hasSink <processor/theToolRepository/in/First_file> .
-
-<datalink?from=processor/theXPath/out/nodelist&to=processor/theWsdl/in/ids> a wfdesc:DataLink ;
-	wfdesc:hasSource <processor/theXPath/out/nodelist> ;
-	wfdesc:hasSink <processor/theWsdl/in/ids> .
-
-<../theWorkflow/datalink?from=in/a&to=processor/theLocal/in/string1> a wfdesc:DataLink ;
-	wfdesc:hasSource <../theWorkflow/in/a> ;
-	wfdesc:hasSink <../theWorkflow/processor/theLocal/in/string1> .
-
-<../theWorkflow/datalink?from=processor/theLocal/out/output&to=out/b> a wfdesc:DataLink ;
-	wfdesc:hasSource <../theWorkflow/processor/theLocal/out/output> ;
-	wfdesc:hasSink <../theWorkflow/out/b> .
-
-<> a wfdesc:Workflow , wfdesc:Description , wfdesc:Process ;
-	dcterms:description "All types currently supported by scul2-wfdesc. Other service types are also translated, but only as processors." ;
-	dc:creator "Stian Soiland-Reyes" ;
-	dcterms:title "All types" ;
-	rdfs:label "All_types" ;
-	wfdesc:hasOutput <out/out> ;
-	wfdesc:hasSubProcess <processor/theBeanshell/> , <processor/theNested/> , <processor/theREST/> , <processor/theRscript/> , <processor/theSpreadsheet/> , <processor/theText/> , <processor/theTool/> , <processor/theToolRepository/> , <processor/theWsdl/> , <processor/theXPath/> ;
-	wfdesc:hasDataLink <datalink?from=processor/theBeanshell/out/s&to=processor/theWsdl/in/format> , <datalink?from=processor/theNested/out/b&to=processor/theXPath/in/xml_text> , <datalink?from=processor/theREST/out/status&to=processor/theSpreadsheet/in/fileurl> , <datalink?from=processor/theRscript/out/out1&to=out/out> , <datalink?from=processor/theSpreadsheet/out/a1&to=processor/theNested/in/a> , <datalink?from=processor/theText/out/value&to=processor/theREST/in/id> , <datalink?from=processor/theTool/out/STDERR&to=processor/theToolRepository/in/Second_file> , <datalink?from=processor/theTool/out/STDOUT&to=processor/theRscript/in/in1> , <datalink?from=processor/theWsdl/out/attachmentList&to=processor/theToolRepository/in/First_file> , <datalink?from=processor/theXPath/out/nodelist&to=processor/theWsdl/in/ids> .
-
-<out/out> a wfdesc:Output , wfdesc:Description , wfdesc:Input ;
-	rdfs:label "out" .
-
-<processor/theBeanshell/out/s> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "s" .
-
-<processor/theNested/> a wfdesc:Process , wfdesc:Description , prov:Entity , wfdesc:Workflow ;
-	rdfs:label "theNested" ;
-	wfdesc:hasInput <processor/theNested/in/a> ;
-	wfdesc:hasOutput <processor/theNested/out/b> ;
-	prov:specializationOf <../theWorkflow/> .
-
-<processor/theNested/in/a> a wfdesc:Input , wfdesc:Description , prov:Entity ;
-	rdfs:label "a" ;
-	prov:specializationOf <../theWorkflow/in/a> .
-
-<processor/theNested/out/b> a wfdesc:Output , wfdesc:Description , prov:Entity ;
-	rdfs:label "b" ;
-	prov:specializationOf <../theWorkflow/out/b> .
-
-<processor/theREST/in/id> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "id" .
-
-<processor/theREST/out/status> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "status" .
-
-<processor/theRscript/in/in1> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "in1" .
-
-<processor/theRscript/out/out1> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "out1" .
-
-<processor/theSpreadsheet/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "theSpreadsheet" ;
-	wfdesc:hasInput <processor/theSpreadsheet/in/fileurl> ;
-	wfdesc:hasOutput <processor/theSpreadsheet/out/a1> .
-
-<processor/theSpreadsheet/in/fileurl> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "fileurl" .
-
-<processor/theSpreadsheet/out/a1> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "a1" .
-
-<processor/theText/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "theText" ;
-	wfdesc:hasOutput <processor/theText/out/value> .
-
-<processor/theText/out/value> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "value" .
-
-<processor/theTool/out/STDERR> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "STDERR" .
-
-<processor/theTool/out/STDOUT> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "STDOUT" .
-
-<processor/theToolRepository/in/First_file> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "First_file" .
-
-<processor/theToolRepository/in/Second_file> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "Second_file" .
-
-<processor/theWsdl/in/format> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "format" .
-
-<processor/theWsdl/in/ids> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "ids" .
-
-<processor/theWsdl/out/attachmentList> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "attachmentList" .
-
-<processor/theXPath/> a wfdesc:Process , wfdesc:Description ;
-	rdfs:label "theXPath" ;
-	wfdesc:hasInput <processor/theXPath/in/xml_text> ;
-	wfdesc:hasOutput <processor/theXPath/out/nodelist> .
-
-<processor/theXPath/in/xml_text> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "xml_text" .
-
-<processor/theXPath/out/nodelist> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "nodelist" .
-
-<../theWorkflow/> a wfdesc:Workflow , wfdesc:Description , wfdesc:Process , prov:Entity ;
-	dcterms:title "theWorkflow" ;
-	rdfs:label "theWorkflow" ;
-	wfdesc:hasInput <../theWorkflow/in/a> ;
-	wfdesc:hasOutput <../theWorkflow/out/b> ;
-	wfdesc:hasSubProcess <../theWorkflow/processor/theLocal/> ;
-	wfdesc:hasDataLink <../theWorkflow/datalink?from=processor/theLocal/out/output&to=out/b> , <../theWorkflow/datalink?from=in/a&to=processor/theLocal/in/string1> .
-
-<../theWorkflow/in/a> a wfdesc:Input , wfdesc:Description , wfdesc:Output , prov:Entity ;
-	rdfs:label "a" .
-
-<../theWorkflow/out/b> a wfdesc:Output , wfdesc:Description , wfdesc:Input , prov:Entity ;
-	rdfs:label "b" .
-
-<../theWorkflow/processor/theLocal/in/string1> a wfdesc:Input , wfdesc:Description ;
-	rdfs:label "string1" .
-
-<../theWorkflow/processor/theLocal/out/output> a wfdesc:Output , wfdesc:Description ;
-	rdfs:label "output" .