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/23 11:05:52 UTC

[67/79] incubator-taverna-language git commit: taverna-scufl2-rdfxml -> taverna-scufl2-wfbundle

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/java/org/apache/taverna/scufl2/rdfxml/TestRevisionParsing.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/java/org/apache/taverna/scufl2/rdfxml/TestRevisionParsing.java b/taverna-scufl2-rdfxml/src/test/java/org/apache/taverna/scufl2/rdfxml/TestRevisionParsing.java
deleted file mode 100644
index 79cceb8..0000000
--- a/taverna-scufl2-rdfxml/src/test/java/org/apache/taverna/scufl2/rdfxml/TestRevisionParsing.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.apache.taverna.scufl2.rdfxml;
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.apache.taverna.scufl2.api.annotation.Revision;
-import org.apache.taverna.scufl2.rdfxml.RevisionParser;
-import org.junit.Test;
-
-
-public class TestRevisionParsing {
-	
-	private static final String ROEVO_TEST_XML = "roevo-test.xml";
-	RevisionParser parser = new RevisionParser();
-	
-	@Test
-	public void parseTestXML() throws Exception {
-		URL base = getClass().getResource(ROEVO_TEST_XML);
-		assertNotNull("Could not find " + ROEVO_TEST_XML, base);
-		InputStream inStream = base.openStream();
-		Map<URI, Revision> revisions = parser.readRevisionChain(inStream, base.toURI());
-		assertTrue(revisions.size() > 3);
-		
-		Revision r3 = revisions.get(URI.create("http://example.com/test/v3"));
-		assertNotNull("Did not return a Revision", r3);
-		assertEquals("http://example.com/test/v3", r3.getIdentifier().toASCIIString());	
-		
-		GregorianCalendar expectedTime = createTime(2012, 12, 24, 18, 0, 0);
-		assertEquals(expectedTime.getTimeInMillis(), r3.getGeneratedAtTime().getTimeInMillis());
-		
-		
-		
-		assertEquals("http://example.com/InsertNestedWorkflow", 
-				r3.getChangeSpecificationType().toASCIIString());
-		
-		
-		assertEquals(2, r3.getWasAttributedTo().size());
-		assertTrue(r3.getWasAttributedTo().contains(URI.create("http://example.com/Fred")));
-		assertTrue(r3.getWasAttributedTo().contains(URI.create("http://example.net/SomeoneElse#me")));
-		
-		assertEquals(2, r3.getHadOriginalSources().size());
-		List<Revision> originals = new ArrayList<Revision>(r3.getHadOriginalSources());
-		assertEquals("http://example.org/originalSource1", originals.get(0).getIdentifier().toASCIIString());
-		assertEquals("http://example.com/test/originalSource2", originals.get(1).getIdentifier().toASCIIString());
-
-		
-		assertEquals(2, r3.getAdditionOf().size());
-		assertTrue(r3.getAdditionOf().contains(URI.create("http://example.com/test/nested-workflow1")));
-		assertTrue(r3.getAdditionOf().contains(URI.create("http://example.net/nested-workflow2")));
-
-		assertEquals(2, r3.getRemovalOf().size());
-		assertTrue(r3.getRemovalOf().contains(URI.create("http://example.net/removed-item")));
-		assertTrue(r3.getRemovalOf().contains(URI.create("http://example.com/test/removed-item2")));
-
-		assertEquals(2, r3.getModificationsOf().size());
-		assertTrue(r3.getModificationsOf().contains(URI.create("http://example.com/test/modified")));
-		assertTrue(r3.getModificationsOf().contains(URI.create("http://example.net/modified2")));
-
-		Revision r2 = r3.getPreviousRevision();
-		assertEquals("http://example.com/test/v2", r2.getIdentifier().toASCIIString());	
-		
-		GregorianCalendar r2Time = createTime(2010, 1, 15, 11, 0, 0);
-		assertEquals(r2Time.getTimeInMillis(), r2.getGeneratedAtTime().getTimeInMillis());
-
-		Revision r1 = r2.getPreviousRevision();
-		assertEquals("http://example.net/v1", r1.getIdentifier().toASCIIString());
-		Revision r0 = r1.getPreviousRevision();
-		assertEquals("http://example.net/v0", r0.getIdentifier().toASCIIString());
-		assertEquals(null, r0.getPreviousRevision());
-		
-	}
-
-	private GregorianCalendar createTime(int year, int month, int date, int hourOfDay, int minute,
-            int second) {		
-		// WARNING: java.util.GregorianCalendar is the most broken Calendar API I've ever come across.		
-		GregorianCalendar expectedTime = new GregorianCalendar(TimeZone.getTimeZone("GMT+01:00"));
-		// 1) Months (but only months) start at 0, not 1!
-		expectedTime.set(year, month-1, date, hourOfDay, minute, second);
-		// 2) Even if you set the time explicitly, we have to set the millis as well
-		// otherwise it would use the millisecond value at the point of construction (!!)
-		expectedTime.set(Calendar.MILLISECOND, 0);
-		// 3) Still they don't actually compare equal, even if they are at the point in time in
-		// milliseconds since epochs
-		return expectedTime;
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example.wfbundle
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example.wfbundle b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example.wfbundle
deleted file mode 100644
index 5e01a49..0000000
Binary files a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example.wfbundle and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/container.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/container.xml b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/container.xml
deleted file mode 100644
index 8d064af..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/container.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<container version="1.0"
-    xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-    <rootfiles>
-        <rootfile full-path="workflowBundle.ttl"
-         media-type="text/turtle" />  
-        <rootfile full-path="workflowBundle.rdf"
-         media-type="application/rdf+xml" />  
-    </rootfiles>
-    <relationships>
-        <relationship type="metadata" target="/annotation/$dir/$filename.$ext" />
-    </relationships>
-</container>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/manifest.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/manifest.xml b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/manifest.xml
deleted file mode 100644
index f30dd2b..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/META-INF/manifest.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
- <manifest:file-entry manifest:media-type="application/vnd.taverna.scufl2.workflowBundle" manifest:full-path="/"/>
-
- <manifest:file-entry manifest:media-type="text/turtle" manifest:full-path="workflowBundle.ttl"/>
- <manifest:file-entry manifest:media-type="text/turtle" manifest:full-path="workflow/HelloWorld.ttl"/>
- <manifest:file-entry manifest:media-type="text/turtle" manifest:full-path="annotation/workflow/HelloWorld.ttl"/>
- <manifest:file-entry manifest:media-type="text/turtle" manifest:full-path="annotation/workflowBundle.ttl"/>
- <manifest:file-entry manifest:media-type="text/turtle" manifest:full-path="profile/tavernaWorkbench.ttl"/>
- <manifest:file-entry manifest:media-type="text/turtle" manifest:full-path="profile/tavernaServer.ttl"/>
-
- <manifest:file-entry manifest:media-type="application/rdf+xml" manifest:full-path="workflowBundle.rdf"/>
- <manifest:file-entry manifest:media-type="application/rdf+xml" manifest:full-path="workflow/HelloWorld.rdf"/>
- <manifest:file-entry manifest:media-type="application/rdf+xml" manifest:full-path="annotation/workflow/HelloWorld.rdf"/>
- <manifest:file-entry manifest:media-type="application/rdf+xml" manifest:full-path="annotation/workflowBundle.rdf"/>
- <manifest:file-entry manifest:media-type="application/rdf+xml" manifest:full-path="profile/tavernaWorkbench.rdf"/>
- <manifest:file-entry manifest:media-type="application/rdf+xml" manifest:full-path="profile/tavernaServer.rdf"/>
-
- <manifest:file-entry manifest:media-type="image/svg+xml" manifest:full-path="Thumbnails/thumbnail.svg"/>
- <manifest:file-entry manifest:media-type="image/png" manifest:full-path="Thumbnails/thumbnail.png"/>
-
- <manifest:file-entry manifest:media-type="image/svg+xml" manifest:full-path="diagram/workflow/HelloWorld.svg"/>
- <manifest:file-entry manifest:media-type="image/png" manifest:full-path="diagram/workflow/HelloWorld.png"/>
-</manifest:manifest>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.png
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.png b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.png
deleted file mode 100644
index 8b69f43..0000000
Binary files a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.svg
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.svg b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.svg
deleted file mode 100644
index 0c14a45..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/Thumbnails/thumbnail.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
- <!ATTLIST svg xmlns:xlink CDATA #FIXED "http://www.w3.org/1999/xlink">
-]>
-<!-- Generated by Graphviz version 2.20.2 (Tue Mar &#160;2 19:03:41 UTC 2010)
-     For user: (stain) Stian Soiland&#45;Reyes,,,, -->
-<!-- Title: A_simple_hello_world_workflow Pages: 1 -->
-<svg width="146pt" height="210pt"
- viewBox="0.00 0.00 146.00 210.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 206)">
-<title>A_simple_hello_world_workflow</title>
-<polygon style="fill:#ffffff;stroke:#ffffff;" points="-4,4 -4,-206 142,-206 142,4 -4,4"/>
-<g id="cluster2" class="cluster"><title>cluster_A_simple_hello_world_workflowsinks</title>
-<polygon style="fill:none;stroke:black;stroke-dasharray:1,5;" points="11,-16 11,-73 130,-73 130,-16 11,-16"/>
-<text text-anchor="middle" x="70" y="-60.5" style="font-family:Times New Roman;font-size:10.00;">Workflow output ports</text>
-</g>
-<g id="cluster3" class="cluster"><title>cluster_A_simple_hello_world_workflowsources</title>
-<polygon style="fill:none;stroke:black;stroke-dasharray:1,5;" points="10,-137 10,-194 121,-194 121,-137 10,-137"/>
-<text text-anchor="middle" x="65" y="-181.5" style="font-family:Times New Roman;font-size:10.00;">Workflow input ports</text>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSINKCONTROL -->
-<g id="node2" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSINKCONTROL</title>
-<polygon style="fill:#66cd00;stroke:black;" points="96,-28 102,-37 90,-37 96,-28"/>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results -->
-<g id="node3" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results</title>
-<polygon style="fill:#8ed6f0;stroke:black;" points="67,-44 23,-44 23,-24 67,-24 67,-44"/>
-<text text-anchor="middle" x="45" y="-31" style="font-family:Arial;font-size:10.00;">results</text>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCECONTROL -->
-<g id="node5" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCECONTROL</title>
-<polygon style="fill:#ff4040;stroke:black;" points="101,-161 95,-152 107,-152 101,-161"/>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName -->
-<g id="node6" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName</title>
-<polygon style="fill:#8ed6f0;stroke:black;" points="86,-165 26,-165 26,-145 86,-145 86,-165"/>
-<text text-anchor="middle" x="56" y="-152" style="font-family:Arial;font-size:10.00;">yourName</text>
-</g>
-<!-- A_simple_hello_world_workflowBeanshell -->
-<g id="node7" class="node"><title>A_simple_hello_world_workflowBeanshell</title>
-<polygon style="fill:#deb887;stroke:black;" points="58,-129 2.13163e-14,-129 0,-109 58,-109 58,-129"/>
-<text text-anchor="middle" x="29" y="-116" style="font-family:Arial;font-size:10.00;">Beanshell</text>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowBeanshell -->
-<g id="edge4" class="edge"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowBeanshell</title>
-<path style="fill:none;stroke:#000000;" d="M48,-145C46,-143 44,-140 42,-138"/>
-<polygon style="fill:#000000;stroke:#000000;" points="44.916,-136.042 37,-129 38.7969,-139.441 44.916,-136.042"/>
-</g>
-<!-- A_simple_hello_world_workflowMerge0 -->
-<g id="node8" class="node"><title>A_simple_hello_world_workflowMerge0</title>
-<ellipse style="fill:#4f94cd;stroke:black;" cx="45" cy="-87" rx="6" ry="6"/>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowMerge0 -->
-<g id="edge6" class="edge"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowMerge0</title>
-<path style="fill:none;stroke:#000000;" d="M58,-145C60,-135 61,-121 58,-109 57,-106 56,-103 54,-100"/>
-<polygon style="fill:#000000;stroke:#000000;" points="57.268,-98.625 49,-92 51.332,-102.335 57.268,-98.625"/>
-</g>
-<!-- A_simple_hello_world_workflowBeanshell&#45;&gt;A_simple_hello_world_workflowMerge0 -->
-<g id="edge8" class="edge"><title>A_simple_hello_world_workflowBeanshell&#45;&gt;A_simple_hello_world_workflowMerge0</title>
-<path style="fill:none;stroke:#000000;" d="M34,-109C35,-107 36,-105 38,-102"/>
-<polygon style="fill:#000000;stroke:#000000;" points="41.1369,-103.56 42,-93 34.7402,-100.717 41.1369,-103.56"/>
-</g>
-<!-- A_simple_hello_world_workflowMerge0&#45;&gt;A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results -->
-<g id="edge10" class="edge"><title>A_simple_hello_world_workflowMerge0&#45;&gt;A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results</title>
-<path style="fill:none;stroke:#000000;" d="M45,-81C45,-74 45,-64 45,-54"/>
-<polygon style="fill:#000000;stroke:#000000;" points="48.5001,-54 45,-44 41.5001,-54 48.5001,-54"/>
-</g>
-</g>
-</svg>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflow/HelloWorld.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflow/HelloWorld.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflow/HelloWorld.rdf
deleted file mode 100644
index 46152dc..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflow/HelloWorld.rdf
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<rdf:RDF xmlns="http://purl.org/dc/elements/1.1/"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:scufl2="http://ns.taverna.org.uk/2010/scufl2#"
-    xml:base="../../workflow/HelloWorld/">
-
-    <rdf:Description rdf:about="">
-        <date>2010-07-28</date>
-        <description>A simple hello world workflow</description>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="datalink/5">
-        <description>Connects workflow input port "yourName"
-    directly to be merged on workflow output port "result". Merged in
-    position 1, meaning that the data from "Hello" will come first. </description>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="in/yourName">
-        <scufl2:exampleValue>John Doe</scufl2:exampleValue>
-        <description>Your name</description>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="out/results">
-        <scufl2:exampleList rdf:parseType="Resource">
-            <rdf:first>Hello, John Doe!</rdf:first>
-            <rdf:rest rdf:parseType="Resource">
-                <rdf:first>John Doe</rdf:first>
-                <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
-            </rdf:rest>
-        </scufl2:exampleList>
-        <description>Personalised greeting, followed by name</description>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="processor/Hello">
-        <description>A service that says greets the given name</description>
-        <title>Hello world</title>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="processor/Hello/in/name">
-        <scufl2:exampleValue>Stian</scufl2:exampleValue>
-        <description>Name of person to greet</description>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="processor/Hello/out/greeting">
-        <scufl2:exampleValue>Hello, Stian!</scufl2:exampleValue>
-        <description>Personalised greeting</description>
-    </rdf:Description>
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflowBundle.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflowBundle.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflowBundle.rdf
deleted file mode 100644
index e4317f1..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/annotation/workflowBundle.rdf
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-
-<!-- Processed by Id: cwm.py,v 1.197 2007/12/13 15:38:39 syosi Exp -->
-<!--     using base file:///home/stain/stuff/src/workspace/scufl2/scufl2-rdf/src/main/resources/example/annotation/workflowBundle.ttl-->
-
-
-<rdf:RDF xmlns="http://purl.org/dc/elements/1.1/"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:dcterms="http://purl.org/dc/terms/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-
-    <rdf:Description rdf:about="../">
-		<dcterms:created>2010-07-29T14:12:14+01:00</dcterms:created>
-		<dcterms:modified>2010-07-29T14:12:14+01:00</dcterms:modified>
-        <dc:creator>Stian Soiland-Reyes</dc:creator>
-        <dc:description>An example workflow to illustrate SCUFL2</dc:description>
-    </rdf:Description>
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.png
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.png b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.png
deleted file mode 100644
index 74bc4e1..0000000
Binary files a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.svg
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.svg b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.svg
deleted file mode 100644
index 0c14a45..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/diagram/workflow/HelloWorld.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
- <!ATTLIST svg xmlns:xlink CDATA #FIXED "http://www.w3.org/1999/xlink">
-]>
-<!-- Generated by Graphviz version 2.20.2 (Tue Mar &#160;2 19:03:41 UTC 2010)
-     For user: (stain) Stian Soiland&#45;Reyes,,,, -->
-<!-- Title: A_simple_hello_world_workflow Pages: 1 -->
-<svg width="146pt" height="210pt"
- viewBox="0.00 0.00 146.00 210.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 206)">
-<title>A_simple_hello_world_workflow</title>
-<polygon style="fill:#ffffff;stroke:#ffffff;" points="-4,4 -4,-206 142,-206 142,4 -4,4"/>
-<g id="cluster2" class="cluster"><title>cluster_A_simple_hello_world_workflowsinks</title>
-<polygon style="fill:none;stroke:black;stroke-dasharray:1,5;" points="11,-16 11,-73 130,-73 130,-16 11,-16"/>
-<text text-anchor="middle" x="70" y="-60.5" style="font-family:Times New Roman;font-size:10.00;">Workflow output ports</text>
-</g>
-<g id="cluster3" class="cluster"><title>cluster_A_simple_hello_world_workflowsources</title>
-<polygon style="fill:none;stroke:black;stroke-dasharray:1,5;" points="10,-137 10,-194 121,-194 121,-137 10,-137"/>
-<text text-anchor="middle" x="65" y="-181.5" style="font-family:Times New Roman;font-size:10.00;">Workflow input ports</text>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSINKCONTROL -->
-<g id="node2" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSINKCONTROL</title>
-<polygon style="fill:#66cd00;stroke:black;" points="96,-28 102,-37 90,-37 96,-28"/>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results -->
-<g id="node3" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results</title>
-<polygon style="fill:#8ed6f0;stroke:black;" points="67,-44 23,-44 23,-24 67,-24 67,-44"/>
-<text text-anchor="middle" x="45" y="-31" style="font-family:Arial;font-size:10.00;">results</text>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCECONTROL -->
-<g id="node5" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCECONTROL</title>
-<polygon style="fill:#ff4040;stroke:black;" points="101,-161 95,-152 107,-152 101,-161"/>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName -->
-<g id="node6" class="node"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName</title>
-<polygon style="fill:#8ed6f0;stroke:black;" points="86,-165 26,-165 26,-145 86,-145 86,-165"/>
-<text text-anchor="middle" x="56" y="-152" style="font-family:Arial;font-size:10.00;">yourName</text>
-</g>
-<!-- A_simple_hello_world_workflowBeanshell -->
-<g id="node7" class="node"><title>A_simple_hello_world_workflowBeanshell</title>
-<polygon style="fill:#deb887;stroke:black;" points="58,-129 2.13163e-14,-129 0,-109 58,-109 58,-129"/>
-<text text-anchor="middle" x="29" y="-116" style="font-family:Arial;font-size:10.00;">Beanshell</text>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowBeanshell -->
-<g id="edge4" class="edge"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowBeanshell</title>
-<path style="fill:none;stroke:#000000;" d="M48,-145C46,-143 44,-140 42,-138"/>
-<polygon style="fill:#000000;stroke:#000000;" points="44.916,-136.042 37,-129 38.7969,-139.441 44.916,-136.042"/>
-</g>
-<!-- A_simple_hello_world_workflowMerge0 -->
-<g id="node8" class="node"><title>A_simple_hello_world_workflowMerge0</title>
-<ellipse style="fill:#4f94cd;stroke:black;" cx="45" cy="-87" rx="6" ry="6"/>
-</g>
-<!-- A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowMerge0 -->
-<g id="edge6" class="edge"><title>A_simple_hello_world_workflowWORKFLOWINTERNALSOURCE_yourName&#45;&gt;A_simple_hello_world_workflowMerge0</title>
-<path style="fill:none;stroke:#000000;" d="M58,-145C60,-135 61,-121 58,-109 57,-106 56,-103 54,-100"/>
-<polygon style="fill:#000000;stroke:#000000;" points="57.268,-98.625 49,-92 51.332,-102.335 57.268,-98.625"/>
-</g>
-<!-- A_simple_hello_world_workflowBeanshell&#45;&gt;A_simple_hello_world_workflowMerge0 -->
-<g id="edge8" class="edge"><title>A_simple_hello_world_workflowBeanshell&#45;&gt;A_simple_hello_world_workflowMerge0</title>
-<path style="fill:none;stroke:#000000;" d="M34,-109C35,-107 36,-105 38,-102"/>
-<polygon style="fill:#000000;stroke:#000000;" points="41.1369,-103.56 42,-93 34.7402,-100.717 41.1369,-103.56"/>
-</g>
-<!-- A_simple_hello_world_workflowMerge0&#45;&gt;A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results -->
-<g id="edge10" class="edge"><title>A_simple_hello_world_workflowMerge0&#45;&gt;A_simple_hello_world_workflowWORKFLOWINTERNALSINK_results</title>
-<path style="fill:none;stroke:#000000;" d="M45,-81C45,-74 45,-64 45,-54"/>
-<polygon style="fill:#000000;stroke:#000000;" points="48.5001,-54 45,-44 41.5001,-54 48.5001,-54"/>
-</g>
-</g>
-</svg>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/mimetype
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/mimetype b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/mimetype
deleted file mode 100644
index 2d61400..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/mimetype
+++ /dev/null
@@ -1 +0,0 @@
-application/vnd.taverna.scufl2.workflow-bundle
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/ontologies/taverna2.2.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/ontologies/taverna2.2.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/ontologies/taverna2.2.rdf
deleted file mode 100644
index fdd234c..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/ontologies/taverna2.2.rdf
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<rdf:RDF xmlns="http://ns.taverna.org.uk/2010/scufl2#" 
-	xmlns:beanshell="beanshell#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:owl="http://www.w3.org/2002/07/owl#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://ns.taverna.org.uk/2010/scufl2# http://ns.taverna.org.uk/2010/scufl2/scufl2.xsd 
-						http://www.w3.org/1999/02/22-rdf-syntax-ns# http://ns.taverna.org.uk/2010/scufl2/rdf.xsd"
-	xsi:type="OntologyDocument" xml:base="http://ns.taverna.org.uk/2010/activity/" >
-
-	<owl:Class
-		rdf:about="beanshell">
-		<configurationType
-			rdf:resource="beanshell#Configuration" />
-		<rdfs:subClassOf rdf:resource="http://ns.taverna.org.uk/2010/scufl2#Activity" />
-	</owl:Class>
-
-	<owl:Class
-		rdf:about="beanshell#Config">
-		<rdfs:subClassOf rdf:resource="http://ns.taverna.org.uk/2010/scufl2#Configuration" />
-	</owl:Class>
-
-	<owl:DatatypeProperty
-		rdf:about="beanshell#script">
-		<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#FunctionalProperty" />
-		<required rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</required>
-		<rdfs:domain
-			rdf:resource="beanshell#Configuration" />
-		<rdfs:label>script</rdfs:label>
-		<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string" />
-		<rdfs:subPropertyOf rdf:resource="http://ns.taverna.org.uk/2010/scufl2#script" />
-	</owl:DatatypeProperty>
-</rdf:RDF>
-	

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaServer.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaServer.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaServer.rdf
deleted file mode 100644
index a156847..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaServer.rdf
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<rdf:RDF xmlns="http://ns.taverna.org.uk/2010/scufl2#"
-	xmlns:beanshell="http://ns.taverna.org.uk/2010/activity/beanshell#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:owl="http://www.w3.org/2002/07/owl#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://ns.taverna.org.uk/2010/scufl2# http://ns.taverna.org.uk/2010/scufl2/scufl2.xsd 
-						http://www.w3.org/1999/02/22-rdf-syntax-ns# http://ns.taverna.org.uk/2010/scufl2/rdf.xsd"
-	xsi:type="ProfileDocument" xml:base="tavernaServer/">
-
-	<Profile rdf:about="">
-		<name>tavernaServer</name>
-		<processorBinding rdf:resource="processorbinding/Hello/" />
-		<activateConfiguration rdf:resource="configuration/Hello/" />
-	</Profile>
-
-	<Activity rdf:about="activity/HelloScript/">
-		<rdf:type
-			rdf:resource="http://ns.taverna.org.uk/2010/activity/beanshell" />
-		<name>HelloScript</name>
-		<inputActivityPort>
-			<InputActivityPort rdf:about="activity/HelloScript/in/personName">
-				<name>personName</name>
-				<portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-			</InputActivityPort>
-		</inputActivityPort>
-
-		<outputActivityPort>
-			<OutputActivityPort rdf:about="activity/HelloScript/out/hello">
-				<name>hello</name>
-				<portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-				<granularPortDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</granularPortDepth>
-			</OutputActivityPort>
-		</outputActivityPort>
-	</Activity>
-
-	<ProcessorBinding rdf:about="processorbinding/Hello/">
-		<name>Hello</name>
-		<bindActivity rdf:resource="activity/HelloScript/" />
-		<bindProcessor rdf:resource="../../workflow/HelloWorld/processor/Hello/" />
-		<inputPortBinding>
-			<InputPortBinding rdf:about="processorbinding/Hello/in/name">
-				<bindInputActivityPort rdf:resource="activity/HelloScript/in/personName" />
-				<bindInputProcessorPort
-					rdf:resource="../../workflow/HelloWorld/processor/Hello/in/name" />
-			</InputPortBinding>
-		</inputPortBinding>
-		<outputPortBinding>
-			<OutputPortBinding rdf:about="processorbinding/Hello/out/greeting">
-				<bindOutputActivityPort rdf:resource="activity/HelloScript/out/hello" />
-				<bindOutputProcessorPort
-					rdf:resource="../../workflow/HelloWorld/processor/Hello/out/greeting" />
-			</OutputPortBinding>
-		</outputPortBinding>
-	</ProcessorBinding>
-
-	<Configuration rdf:about="configuration/Hello/">
-		<rdf:type
-			rdf:resource="http://ns.taverna.org.uk/2010/activity/beanshell#Config" />
-		<name>Hello</name>
-		<configure rdf:resource="activity/HelloScript/" />
-		<beanshell:script>hello = "Hello, " + personName;
-System.out.println("Server says: " + hello);</beanshell:script>
-	</Configuration>
-
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaWorkbench.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaWorkbench.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaWorkbench.rdf
deleted file mode 100644
index 3f2b98b..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/profile/tavernaWorkbench.rdf
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<rdf:RDF xmlns="http://ns.taverna.org.uk/2010/scufl2#"
-	xmlns:beanshell="http://ns.taverna.org.uk/2010/activity/beanshell#"
-	xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:owl="http://www.w3.org/2002/07/owl#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://ns.taverna.org.uk/2010/scufl2# http://ns.taverna.org.uk/2010/scufl2/scufl2.xsd 
-						http://www.w3.org/1999/02/22-rdf-syntax-ns# http://ns.taverna.org.uk/2010/scufl2/rdf.xsd"
-	xsi:type="ProfileDocument" xml:base="tavernaWorkbench/">
-	<Profile rdf:about="">
-		<name>tavernaWorkbench</name>
-		<processorBinding rdf:resource="processorbinding/Hello/" />
-		<activateConfiguration rdf:resource="configuration/Hello/" />
-	</Profile>
-
-	<Activity rdf:about="activity/HelloScript/">
-		<rdf:type
-			rdf:resource="http://ns.taverna.org.uk/2010/activity/beanshell" />
-		<name>HelloScript</name>
-		<inputActivityPort>
-			<InputActivityPort rdf:about="activity/HelloScript/in/personName">
-				<name>personName</name>
-				<portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-			</InputActivityPort>
-		</inputActivityPort>
-		<outputActivityPort>
-			<OutputActivityPort rdf:about="activity/HelloScript/out/hello">
-				<name>hello</name>
-				<portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-				<granularPortDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</granularPortDepth>
-			</OutputActivityPort>
-		</outputActivityPort>
-	</Activity>
-
-	<ProcessorBinding rdf:about="processorbinding/Hello/">
-		<name>Hello</name>		
-		<bindActivity rdf:resource="activity/HelloScript/" />		
-		<bindProcessor rdf:resource="../../workflow/HelloWorld/processor/Hello/" />
-		<activityPosition rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">10</activityPosition>
-		<inputPortBinding>
-			<InputPortBinding rdf:about="processorbinding/Hello/in/name">
-				<bindInputActivityPort rdf:resource="activity/HelloScript/in/personName" />
-				<bindInputProcessorPort
-					rdf:resource="../../workflow/HelloWorld/processor/Hello/in/name" />
-			</InputPortBinding>
-		</inputPortBinding> 
-		<outputPortBinding>
-			<OutputPortBinding rdf:about="processorbinding/Hello/out/greeting">
-				<bindOutputActivityPort rdf:resource="activity/HelloScript/out/hello" />
-				<bindOutputProcessorPort
-					rdf:resource="../../workflow/HelloWorld/processor/Hello/out/greeting" />
-			</OutputPortBinding>
-		</outputPortBinding>		
-	</ProcessorBinding>
-
-	<Configuration rdf:about="configuration/Hello/">
-		<rdf:type
-			rdf:resource="http://ns.taverna.org.uk/2010/activity/beanshell#Config" />
-		<name>Hello</name>
-		<configure rdf:resource="activity/HelloScript/" />
-		<beanshell:script>hello = "Hello, " + personName;
-JOptionPane.showMessageDialog(null, hello);</beanshell:script>
-	</Configuration>
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflow/HelloWorld.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflow/HelloWorld.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflow/HelloWorld.rdf
deleted file mode 100644
index 7c58856..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflow/HelloWorld.rdf
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://ns.taverna.org.uk/2010/scufl2#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="WorkflowDocument" xml:base="HelloWorld/" xsi:schemaLocation="http://ns.taverna.org.uk/2010/scufl2# http://ns.taverna.org.uk/2010/scufl2/scufl2.xsd http://www.w3.org/1999/02/22-rdf-syntax-ns# http://ns.taverna.org.uk/2010/scufl2/rdf.xsd">
-    <Workflow rdf:about="">
-        <name>HelloWorld</name>
-        <workflowIdentifier rdf:resource="http://ns.taverna.org.uk/2010/workflow/00626652-55ae-4a9e-80d4-c8e9ac84e2ca/"/>
-        <inputWorkflowPort>
-            <InputWorkflowPort rdf:about="in/yourName">
-                <name>yourName</name>
-                <portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-            </InputWorkflowPort>
-        </inputWorkflowPort>
-        <outputWorkflowPort>
-            <OutputWorkflowPort rdf:about="out/results">
-                <name>results</name>
-            </OutputWorkflowPort>
-        </outputWorkflowPort>
-        <processor>
-            <Processor rdf:about="processor/Hello/">
-                <name>Hello</name>
-                <inputProcessorPort>
-                    <InputProcessorPort rdf:about="processor/Hello/in/name">
-                        <name>name</name>
-                        <portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-                    </InputProcessorPort>
-                </inputProcessorPort>
-                <outputProcessorPort>
-                    <OutputProcessorPort rdf:about="processor/Hello/out/greeting">
-                        <name>greeting</name>
-                        <portDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</portDepth>
-                        <granularPortDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</granularPortDepth>
-                    </OutputProcessorPort>
-                </outputProcessorPort>
-                <dispatchStack>
-                    <DispatchStack rdf:about="processor/Hello/dispatchstack/">
-                        <rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/DefaultDispatchStack"/>
-                        <dispatchStackLayers rdf:parseType="Collection">
-                            <DispatchStackLayer rdf:about="processor/Hello/dispatchstack/0/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Parallelise"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/Hello/dispatchstack/1/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/ErrorBounce"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/Hello/dispatchstack/2/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Failover"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/Hello/dispatchstack/3/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Retry"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/Hello/dispatchstack/4/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Stop"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/Hello/dispatchstack/5/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Invoke"/>
-                            </DispatchStackLayer>
-                        </dispatchStackLayers>
-                    </DispatchStack>
-                </dispatchStack>
-                <iterationStrategyStack>
-                    <IterationStrategyStack rdf:about="processor/Hello/iterationstrategy/">
-                        <iterationStrategies rdf:parseType="Collection">
-                            <CrossProduct rdf:about="processor/Hello/iterationstrategy/0/">
-<productOf rdf:parseType="Collection">
-    <PortNode rdf:about="processor/Hello/iterationstrategy/0/0/">
-        <iterateOverInputPort rdf:resource="processor/Hello/in/name"/>
-        <desiredDepth rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</desiredDepth>
-    </PortNode>
-</productOf>
-                            </CrossProduct>
-                        </iterationStrategies>
-                    </IterationStrategyStack>
-                </iterationStrategyStack>
-            </Processor>
-        </processor>
-        <processor>
-            <Processor rdf:about="processor/wait4me/">
-                <name>wait4me</name>
-                <dispatchStack>
-                    <DispatchStack rdf:about="processor/wait4me/dispatchstack/">
-                        <rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/DefaultDispatchStack"/>
-                        <dispatchStackLayers rdf:parseType="Collection">
-                            <DispatchStackLayer rdf:about="processor/wait4me/dispatchstack/0/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Parallelise"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/wait4me/dispatchstack/1/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/ErrorBounce"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/wait4me/dispatchstack/2/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Failover"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/wait4me/dispatchstack/3/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Retry"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/wait4me/dispatchstack/4/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Stop"/>
-                            </DispatchStackLayer>
-                            <DispatchStackLayer rdf:about="processor/wait4me/dispatchstack/5/">
-<rdf:type rdf:resource="http://ns.taverna.org.uk/2010/taverna/2.2/Invoke"/>
-                            </DispatchStackLayer>
-                        </dispatchStackLayers>
-                    </DispatchStack>
-                </dispatchStack>
-                <iterationStrategyStack>
-                    <IterationStrategyStack rdf:about="processor/wait4me/iterationstrategy/">
-                        <iterationStrategies rdf:parseType="Collection">
-                            <CrossProduct rdf:about="processor/wait4me/iterationstrategy/0/">
-<productOf rdf:parseType="Collection"/>
-                            </CrossProduct>
-                        </iterationStrategies>
-                    </IterationStrategyStack>
-                </iterationStrategyStack>
-            </Processor>
-        </processor>
-        <datalink>
-            <DataLink rdf:about="datalink?from=processor/Hello/out/greeting&amp;to=out/results&amp;mergePosition=0">
-                <receiveFrom rdf:resource="processor/Hello/out/greeting"/>
-                <sendTo rdf:resource="out/results"/>
-                <mergePosition rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">0</mergePosition>
-            </DataLink>
-        </datalink>
-        <datalink>
-            <DataLink rdf:about="datalink?from=in/yourName&amp;to=processor/Hello/in/name">
-                <receiveFrom rdf:resource="in/yourName"/>
-                <sendTo rdf:resource="processor/Hello/in/name"/>
-            </DataLink>
-        </datalink>
-        <datalink>
-            <DataLink rdf:about="datalink?from=in/yourName&amp;to=out/results&amp;mergePosition=1">
-                <receiveFrom rdf:resource="in/yourName"/>
-                <sendTo rdf:resource="out/results"/>
-                <mergePosition rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</mergePosition>
-            </DataLink>
-        </datalink>
-        <control>
-            <Blocking rdf:about="control?block=processor/Hello/&amp;untilFinished=processor/wait4me/">
-                <block rdf:resource="processor/Hello/"/>
-                <untilFinished rdf:resource="processor/wait4me/"/>
-            </Blocking>
-        </control>
-    </Workflow>
-</rdf:RDF>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/e27d1dbe/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflowBundle.rdf
----------------------------------------------------------------------
diff --git a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflowBundle.rdf b/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflowBundle.rdf
deleted file mode 100644
index e39204f..0000000
--- a/taverna-scufl2-rdfxml/src/test/resources/org/apache/taverna/scufl2/rdfxml/example/workflowBundle.rdf
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<rdf:RDF xmlns="http://ns.taverna.org.uk/2010/scufl2#"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://ns.taverna.org.uk/2010/scufl2# http://ns.taverna.org.uk/2010/scufl2/scufl2.xsd http://www.w3.org/1999/02/22-rdf-syntax-ns# http://ns.taverna.org.uk/2010/scufl2/rdf.xsd"
-	xsi:type="WorkflowBundleDocument" xml:base="./">
-	<WorkflowBundle rdf:about="">
-		<name>HelloWorld</name>
-		<globalBaseURI
-			rdf:resource="http://ns.taverna.org.uk/2010/workflowBundle/28f7c554-4f35-401f-b34b-516e9a0ef731/" />		
-		<mainWorkflow rdf:resource="workflow/HelloWorld/" />
-		<workflow>
-			<Workflow rdf:about="workflow/HelloWorld/">
-				<rdfs:seeAlso rdf:resource="workflow/HelloWorld.rdf" />
-			</Workflow>
-		</workflow>
-		<!--
-		<workflow>
-			<Workflow rdf:about="workflow/SomeNestedWorkflow/">
-				<rdfs:seeAlso rdf:resource="workflow/SomeNestedWorkflow.rdf" />
-			</Workflow>
-		</workflow>
-		-->
-		<mainProfile rdf:resource="profile/tavernaWorkbench/" />
-		<profile>
-			<Profile rdf:about="profile/tavernaServer/">
-				<rdfs:seeAlso rdf:resource="profile/tavernaServer.rdf" />
-			</Profile>
-		</profile>
-		<profile>
-			<Profile rdf:about="profile/tavernaWorkbench/">
-				<rdfs:seeAlso rdf:resource="profile/tavernaWorkbench.rdf" />
-			</Profile>
-		</profile>
-		<rdfs:seeAlso rdf:resource="annotation/workflowBundle.rdf" />
-	</WorkflowBundle>
-
-</rdf:RDF>