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:36 UTC

[51/79] [partial] incubator-taverna-language git commit: Revert "temporarily empty repository"

Revert "temporarily empty repository"

This reverts commit 316e4a8a8871a09cb9e7986ed2ef99570a16cfd6.


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/c08405cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/c08405cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/c08405cb

Branch: refs/heads/master
Commit: c08405cb90018170a8c214702523b142ebfa10cb
Parents: 316e4a8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sat Feb 21 19:26:44 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sat Feb 21 19:26:44 2015 +0000

----------------------------------------------------------------------
 .gitignore                                      |     5 +
 .travis.yml                                     |    15 +
 LICENSE                                         |   176 +
 README.md                                       |   230 +
 pom.xml                                         |   350 +
 taverna-baclava-language/pom.xml                |    66 +
 .../apache/taverna/baclava/BaclavaReader.java   |    42 +
 .../apache/taverna/baclava/BaclavaWriter.java   |    47 +
 .../src/main/resources/xsd/baclava.xsd          |   183 +
 .../src/main/resources/xsd/xscufl.xsd           |    41 +
 .../apache/taverna/baclava/TestExample1.java    |    96 +
 .../apache/taverna/baclava/TestRoundTrip.java   |    59 +
 .../src/test/resources/example1.xml             |    74 +
 .../src/test/resources/example2.xml             |   370 +
 taverna-databundle/README.md                    |   172 +
 taverna-databundle/pom.xml                      |   109 +
 .../apache/taverna/databundle/DataBundles.java  |   454 +
 .../taverna/databundle/ErrorDocument.java       |    62 +
 .../taverna/databundle/TestDataBundles.java     |   815 +
 .../apache/taverna/databundle/TestExample.java  |   174 +
 .../taverna/databundle/TestFullExample.java     |   163 +
 .../ebi-wfrun-2013-05-31/Graphical_output.png   |   Bin 0 -> 31733 bytes
 .../Workflow16_getStatus_output_status.txt      |     1 +
 .../full-example/ebi-wfrun-2013-05-31/email.txt |     1 +
 .../getResult_3_output_output.xml               |    52 +
 .../getResult_output_output.octet-stream        |    12 +
 .../00/00548907-43e1-4484-9582-bfa8727d44ca.txt |     1 +
 .../07/079d289b-796e-45cf-a759-82f91a0aa3d5.txt |     1 +
 .../0a/0a2b3aa2-5b11-433d-b48f-1009424bb486.txt |     1 +
 .../0b/0bd05e27-46d6-4de5-b76b-0988638f9231.txt |     8 +
 .../0c/0c29c209-b442-49c5-bee2-5b5efdacad0e.txt |     1 +
 .../0f/0f93d00f-131b-42ec-bbba-22b50582903e.txt |     1 +
 .../11/111e5771-37b7-4ef8-9888-e50eadbc2a5c.txt |     1 +
 .../13/132a7e6c-1857-4ad6-8252-5f747f6f0feb.txt |     1 +
 .../14/147eda4d-f40f-418b-bca2-dc12e19122de.txt |     1 +
 .../14/14b9027d-11bb-4586-bff7-89130856409b.txt |     1 +
 .../18/18d41521-e314-4122-a4ff-cb7718982935.txt |     1 +
 .../1f/1f536bcf-ba43-44ec-a983-b30a45f2b739.txt |     1 +
 .../21/219626eb-a4fc-4c83-9132-67b2b40d5a68.txt |     1 +
 .../26/268a47b4-34aa-42d0-96ad-98b99601a4e5.txt |     1 +
 .../28/28ccca88-6e06-4d5a-a43e-93ad263c6abd.txt |     8 +
 .../2a/2a8831af-c11f-4d0e-be9d-d90c170c1002.txt |     1 +
 .../2a/2a91a135-c649-4735-a02f-6db45b9c847e.txt |     1 +
 .../32/321106aa-13f1-49e5-a10b-bf08693f7df6.txt |     1 +
 .../37/3792ebd6-6210-4af9-bc3f-74e3934a52ef.txt |     1 +
 .../3d/3df7b202-58f3-4425-b063-4f4f7ab4cd5a.txt |     1 +
 .../4a/4acb798d-0fd2-4b9c-91e5-587e5aa8366a.txt |     1 +
 .../51/51845ad9-e0a3-4094-8ce8-f2f5bd06e61e.txt |     1 +
 .../5a/5aec892f-fad5-4f90-b1c1-8241b8917f8b.txt |     1 +
 .../5b/5b5357f1-3062-43ab-adab-e0f3e3721dcc.txt |     1 +
 .../5b/5b8444ec-0592-4154-8f02-638c79f4171a.txt |     1 +
 .../5b/5bb72df1-fc1d-43d8-9206-dcab6ced0437.txt |     1 +
 .../5d/5d572af1-f6fb-48a4-b338-a7ce140932ec.txt |     1 +
 .../67/67958fa2-98dd-4f82-b9f6-96537cea9528.txt |     1 +
 .../71/71540c58-5ff6-4dee-a26e-f1360b135e54.txt |     1 +
 .../73/731b11bb-a3be-4054-b1e4-3331a8f3c0c0.txt |     1 +
 .../77/77ede682-e556-4d89-b429-219adfbe48be.txt |     1 +
 .../7c/7ceba67b-46e2-4c4b-9cec-e5f0e11c43e9.txt |     1 +
 .../7e/7e7ee056-5a86-45a3-b4e6-e8de44679922.txt |     1 +
 .../86/8618bc0b-9852-457d-b0b7-16af5526faaf.txt |     1 +
 .../86/864a72a6-34b8-4d74-86f7-4b6ccfe91a1f.txt |     1 +
 .../8c/8c50b1fe-e91e-4840-86af-ec99c2b04a67.txt |     1 +
 .../8e/8ed106dd-7ada-4d61-a3f6-01740454cd76.txt |     1 +
 .../91/91fdc8e6-159e-495e-842a-ef51fe3ec534.txt |     1 +
 .../94/94a5377e-5752-433c-aa8b-c39bb461505f.txt |     1 +
 .../94/94d65aea-ed02-488c-aa38-d3b9840e4b65.txt |     1 +
 .../a2/a217d73f-1843-4162-9bae-a5b05541b538.txt |     1 +
 .../a5/a58b2fcd-fb4c-4445-be36-b5c00b96a813.txt |     1 +
 .../a7/a746bcfc-5d24-48ae-a12f-e3d285ed3b4d.txt |     1 +
 .../a7/a7c9ef28-f3de-4566-aac6-90d5fa20318a.txt |     1 +
 .../a8/a8fba0e7-10a6-4fed-afd9-3a15fd24ba8e.txt |     1 +
 .../ad/add43936-5cc3-4635-bc4e-dc64a6664dd8.txt |     1 +
 .../b0/b07b9f2f-e0c1-4ec0-ba83-102d18e3cf11.txt |     1 +
 .../b3/b3dd41e8-e94b-4e14-9080-1e44efa8ab66.txt |     1 +
 .../b5/b5a4997d-d390-4d62-820c-85018453186f.txt |     1 +
 .../b8/b8685135-065a-409c-9c11-1fedbd61bb90.txt |     1 +
 .../c4/c4776372-5fa1-4b05-92bc-585ccb4344af.txt |     1 +
 .../cc/cc26451d-53c7-490d-8d9f-ac7a1f45e30e.txt |     1 +
 .../d3/d34be34f-e857-46ee-8ee2-5c3384e05655.txt |     1 +
 .../d6/d69fe838-97dd-43cc-9a08-567cfb842f1a.txt |     1 +
 .../da/dac12490-1cbc-4607-a825-40f121f69fc4.txt |     1 +
 .../f2/f273b491-edd2-4e18-aba5-106279f491d8.txt |     1 +
 .../f7/f7e2a950-6426-4e3f-b9f0-844bfae9ed96.txt |     1 +
 .../ebi-wfrun-2013-05-31/sequence.txt           |     8 +
 .../ebi-wfrun-2013-05-31/workflowrun.prov.ttl   |  2296 ++
 .../ebi_interproscan_newservices_900329.t2flow  |   742 +
 taverna-robundle/README.md                      |   180 +
 taverna-robundle/pom.xml                        |   132 +
 .../org/apache/taverna/robundle/Bundle.java     |   133 +
 .../org/apache/taverna/robundle/Bundles.java    |   401 +
 .../taverna/robundle/fs/BundleFileStore.java    |    98 +
 .../taverna/robundle/fs/BundleFileSystem.java   |   223 +
 .../robundle/fs/BundleFileSystemProvider.java   |   695 +
 .../robundle/fs/BundleFileTypeDetector.java     |    90 +
 .../apache/taverna/robundle/fs/BundlePath.java  |   221 +
 .../apache/taverna/robundle/manifest/Agent.java |    63 +
 .../taverna/robundle/manifest/Manifest.java     |   450 +
 .../robundle/manifest/PathAnnotation.java       |   126 +
 .../taverna/robundle/manifest/PathMetadata.java |   207 +
 .../apache/taverna/robundle/manifest/Proxy.java |    83 +
 .../robundle/manifest/RDFToManifest.java        |   514 +
 .../manifest/combine/CombineManifest.java       |   511 +
 .../robundle/manifest/odf/ODFManifest.java      |   321 +
 .../taverna/robundle/utils/PathHelper.java      |    35 +
 .../apache/taverna/robundle/utils/RDFUtils.java |    65 +
 .../utils/RecursiveCopyFileVisitor.java         |   235 +
 .../robundle/utils/RecursiveDeleteVisitor.java  |    56 +
 .../taverna/robundle/utils/TemporaryFiles.java  |    42 +
 .../java.nio.file.spi.FileSystemProvider        |     1 +
 .../services/java.nio.file.spi.FileTypeDetector |     1 +
 .../src/main/resources/contexts/bundle.jsonld   |   141 +
 .../src/main/resources/jarcache.json            |     8 +
 .../src/main/resources/ontologies/bundle.owl    |   123 +
 .../src/main/resources/ontologies/dcam.owl      |    28 +
 .../main/resources/ontologies/dcterms_od.owl    |   587 +
 .../src/main/resources/ontologies/foaf.rdf      |   640 +
 .../src/main/resources/ontologies/oa.rdf        |   889 +
 .../src/main/resources/ontologies/ore-owl.owl   |   258 +
 .../src/main/resources/ontologies/pav.rdf       |   552 +
 .../src/main/resources/ontologies/prov-aq.rdf   |   341 +
 .../src/main/resources/ontologies/prov-o.rdf    |  1787 +
 .../src/main/resources/ontologies/ro.owl        |   218 +
 .../OpenDocument-v1.2-os-manifest-schema.rng    |   224 +
 .../OpenDocument-v1.2-os-manifest-schema.xsd    |   201 +
 taverna-robundle/src/main/xsd/combine.xsd       |   102 +
 taverna-robundle/src/main/xsd/container.xsd     |   192 +
 taverna-robundle/src/main/xsd/xenc-schema.xsd   |   146 +
 .../src/main/xsd/xmldsig-core-schema.xsd        |   308 +
 .../taverna/robundle/MotifAnalysisIT.java       |   126 +
 .../apache/taverna/robundle/TestBundles.java    |   643 +
 .../apache/taverna/robundle/TestExample.java    |   107 +
 .../org/apache/taverna/robundle/fs/Helper.java  |    50 +
 .../taverna/robundle/fs/MemoryEfficiencyIT.java |   255 +
 .../robundle/fs/TestBundleFileSystem.java       |   236 +
 .../robundle/fs/TestBundleFileTypeDetector.java |    97 +
 .../taverna/robundle/fs/TestBundlePaths.java    |    58 +
 .../robundle/fs/TestFileSystemProvider.java     |   278 +
 .../apache/taverna/robundle/fs/TestZipFS.java   |   213 +
 .../taverna/robundle/manifest/TestManifest.java |   280 +
 .../robundle/manifest/TestManifestJSON.java     |   275 +
 .../robundle/manifest/TestRDFToManifest.java    |    52 +
 .../manifest/combine/TestCombineManifest.java   |   155 +
 .../robundle/manifest/odf/TestODFManifest.java  |    74 +
 .../utils/TestRecursiveCopyFileVisitor.java     |   114 +
 .../TestRecursiveCopyFileVisitorInBundle.java   |    54 +
 ...RecursiveCopyFileVisitorMultipleBundles.java |    51 +
 .../src/test/resources/combine/Boris.omex       |   Bin 0 -> 355256 bytes
 .../resources/combine/DirectoryMadness.omex     |   Bin 0 -> 355078 bytes
 .../combine/DirectoryMadnessZipped.omex         |   Bin 0 -> 353871 bytes
 .../combine/aslanidi_purkinje_model_2009.zip    |   Bin 0 -> 896049 bytes
 .../src/test/resources/document.odt             |   Bin 0 -> 10372 bytes
 .../src/test/resources/helloworld.wfbundle      |   Bin 0 -> 6637 bytes
 .../src/test/resources/manifest.json            |    40 +
 .../src/test/resources/motifAnalysis.zip        |   Bin 0 -> 6936503 bytes
 taverna-robundle/src/test/resources/win8.url    |     5 +
 .../src/test/resources/workflowrun.bundle.zip   |   Bin 0 -> 4126 bytes
 taverna-scufl2-annotation/pom.xml               |    69 +
 .../scufl2/annotation/AnnotationTools.java      |   208 +
 .../scufl2/annotation/TestAnnotationTools.java  |   111 +
 .../src/test/resources/helloanyone.t2flow       |   195 +
 .../valid_component_imagemagickconvert.t2flow   |   394 +
 taverna-scufl2-api/.gitignore                   |     3 +
 taverna-scufl2-api/pom.xml                      |    85 +
 .../taverna/scufl2/api/activity/Activity.java   |   270 +
 .../scufl2/api/activity/package-info.java       |    24 +
 .../scufl2/api/annotation/Annotation.java       |   169 +
 .../taverna/scufl2/api/annotation/Revision.java |   259 +
 .../scufl2/api/annotation/Revisioned.java       |   120 +
 .../scufl2/api/annotation/package-info.java     |    27 +
 .../scufl2/api/common/AbstractCloneable.java    |   173 +
 .../scufl2/api/common/AbstractNamed.java        |   223 +
 .../scufl2/api/common/AbstractRevisioned.java   |   114 +
 .../apache/taverna/scufl2/api/common/Child.java |    58 +
 .../taverna/scufl2/api/common/Configurable.java |    36 +
 .../apache/taverna/scufl2/api/common/Named.java |    55 +
 .../taverna/scufl2/api/common/NamedSet.java     |   290 +
 .../taverna/scufl2/api/common/Ported.java       |    46 +
 .../apache/taverna/scufl2/api/common/Root.java  |    29 +
 .../taverna/scufl2/api/common/Scufl2Tools.java  |   866 +
 .../apache/taverna/scufl2/api/common/Typed.java |    45 +
 .../taverna/scufl2/api/common/URITools.java     |   268 +
 .../taverna/scufl2/api/common/Visitor.java      |   248 +
 .../taverna/scufl2/api/common/WorkflowBean.java |    57 +
 .../taverna/scufl2/api/common/package-info.java |    23 +
 .../api/configurations/Configuration.java       |   269 +
 .../scufl2/api/container/WorkflowBundle.java    |   277 +
 .../scufl2/api/container/package-info.java      |    22 +
 .../scufl2/api/core/BlockingControlLink.java    |   242 +
 .../taverna/scufl2/api/core/ControlLink.java    |    34 +
 .../taverna/scufl2/api/core/DataLink.java       |   332 +
 .../taverna/scufl2/api/core/Processor.java      |   459 +
 .../taverna/scufl2/api/core/Workflow.java       |   283 +
 .../taverna/scufl2/api/core/package-info.java   |    22 +
 .../scufl2/api/impl/IterableComparator.java     |   116 +
 .../apache/taverna/scufl2/api/impl/LazyMap.java |    79 +
 .../scufl2/api/impl/NullSafeComparator.java     |   105 +
 .../taverna/scufl2/api/io/ReaderException.java  |    74 +
 .../taverna/scufl2/api/io/WorkflowBundleIO.java |   538 +
 .../scufl2/api/io/WorkflowBundleReader.java     |   110 +
 .../scufl2/api/io/WorkflowBundleWriter.java     |    79 +
 .../taverna/scufl2/api/io/WriterException.java  |    76 +
 .../api/io/structure/StructureReader.java       |   452 +
 .../api/io/structure/StructureWriter.java       |   314 +
 .../api/iterationstrategy/CrossProduct.java     |   106 +
 .../api/iterationstrategy/DotProduct.java       |   105 +
 .../IterationStrategyNode.java                  |    30 +
 .../IterationStrategyParent.java                |    26 +
 .../IterationStrategyStack.java                 |    86 +
 .../IterationStrategyTopNode.java               |    30 +
 .../scufl2/api/iterationstrategy/PortNode.java  |   188 +
 .../api/iterationstrategy/package-info.java     |    22 +
 .../apache/taverna/scufl2/api/package-info.java |    49 +
 .../scufl2/api/port/AbstractDepthPort.java      |    91 +
 .../api/port/AbstractGranularDepthPort.java     |    90 +
 .../taverna/scufl2/api/port/ActivityPort.java   |    32 +
 .../taverna/scufl2/api/port/DepthPort.java      |    38 +
 .../scufl2/api/port/GranularDepthPort.java      |    38 +
 .../scufl2/api/port/InputActivityPort.java      |    77 +
 .../taverna/scufl2/api/port/InputPort.java      |    29 +
 .../scufl2/api/port/InputProcessorPort.java     |    92 +
 .../scufl2/api/port/InputWorkflowPort.java      |    92 +
 .../scufl2/api/port/OutputActivityPort.java     |    77 +
 .../taverna/scufl2/api/port/OutputPort.java     |    29 +
 .../scufl2/api/port/OutputProcessorPort.java    |    90 +
 .../scufl2/api/port/OutputWorkflowPort.java     |    99 +
 .../apache/taverna/scufl2/api/port/Port.java    |    32 +
 .../taverna/scufl2/api/port/ProcessorPort.java  |    33 +
 .../taverna/scufl2/api/port/ReceiverPort.java   |    36 +
 .../taverna/scufl2/api/port/SenderPort.java     |    36 +
 .../taverna/scufl2/api/port/WorkflowPort.java   |    34 +
 .../taverna/scufl2/api/port/package-info.java   |    23 +
 .../scufl2/api/profiles/ProcessorBinding.java   |   235 +
 .../api/profiles/ProcessorInputPortBinding.java |   140 +
 .../profiles/ProcessorOutputPortBinding.java    |   146 +
 .../api/profiles/ProcessorPortBinding.java      |   156 +
 .../taverna/scufl2/api/profiles/Profile.java    |   220 +
 .../scufl2/api/profiles/package-info.java       |    22 +
 .../scufl2/api/reference/package-info.java      |    23 +
 ...e.taverna.scufl2.api.io.WorkflowBundleReader |     1 +
 ...e.taverna.scufl2.api.io.WorkflowBundleWriter |     1 +
 .../META-INF/spring/scufl2-api-context-osgi.xml |    41 +
 .../META-INF/spring/scufl2-api-context.xml      |    35 +
 .../scufl2/api/EqualsOnArrayListsTest.java      |    95 +
 .../taverna/scufl2/api/ExampleWorkflow.java     |   238 +
 .../taverna/scufl2/api/TestAPICreation.java     |   122 +
 .../scufl2/api/TestAbstractRevisioned.java      |    55 +
 .../taverna/scufl2/api/TestExampleWorkflow.java |    33 +
 .../apache/taverna/scufl2/api/VisitorTest.java  |   100 +
 .../scufl2/api/annotation/TestAnnotations.java  |    36 +
 .../scufl2/api/common/AllBeansVisitor.java      |    53 +
 .../api/common/TestAbstractCloneable.java       |   183 +
 .../scufl2/api/common/TestAbstractNamed.java    |   127 +
 .../scufl2/api/common/TestScufl2Tools.java      |   481 +
 .../scufl2/api/common/TestSetParent.java        |    60 +
 .../taverna/scufl2/api/common/TestURITools.java |   196 +
 .../scufl2/api/common/TestURIToolsBeans.java    |   328 +
 .../scufl2/api/common/TestURIToolsResolve.java  |   321 +
 .../api/configurations/ConfigurationTest.java   |    78 +
 .../api/container/TestWorkflowBundleEquals.java |    82 +
 .../scufl2/api/core/ControlLinkCompareTest.java |   104 +
 .../scufl2/api/core/DataLinkCompareTest.java    |   128 +
 .../taverna/scufl2/api/core/PortOrderTest.java  |    84 +
 .../scufl2/api/impl/TestIterableComparator.java |    95 +
 .../scufl2/api/impl/TestNullCompare.java        |    39 +
 .../taverna/scufl2/api/io/TestResources.java    |    54 +
 .../scufl2/api/io/TestStructureReader.java      |    99 +
 .../scufl2/api/io/TestWorkflowBundleIO.java     |   383 +
 .../apache/taverna/scufl2/api/io/HelloWorld.txt |    48 +
 .../src/test/resources/roevo-test.ttl           |    96 +
 taverna-scufl2-examples/README.md               |   251 +
 .../examples/helloanyone.json                   |    72 +
 .../examples/helloanyone.t2flow                 |   196 +
 .../examples/helloanyone.wfbundle               |   Bin 0 -> 9295 bytes
 .../examples/helloworld.json                    |    37 +
 .../examples/helloworld.t2flow                  |    84 +
 .../examples/helloworld.wfbundle                |   Bin 0 -> 6637 bytes
 taverna-scufl2-examples/pom.xml                 |   154 +
 .../examples/ConvertT2flowToWorkflowBundle.java |    57 +
 .../org/apache/taverna/examples/JsonExport.java |   319 +
 .../apache/taverna/examples/ProcessorNames.java |   132 +
 .../org/apache/taverna/examples/Scufl2Tool.java |   101 +
 .../apache/taverna/examples/ServiceTypes.java   |    62 +
 .../apache/taverna/examples/WorkflowMaker.java  |   412 +
 .../src/main/python/processorNames.py           |   135 +
 .../src/main/resources/context.json             |    20 +
 .../src/main/ruby/processors.rb                 |    93 +
 .../examples/TestConvertT2flowScufl2.java       |    55 +
 .../apache/taverna/examples/TestJsonExport.java |    75 +
 .../taverna/examples/TestProcessorNames.java    |    88 +
 .../taverna/examples/TestServiceTypes.java      |   105 +
 .../test/resources/workflows/t2flow/as.t2flow   |  1674 +
 .../t2flow/defaultActivitiesTaverna2.2.t2flow   |   888 +
 .../workflows/t2flow/helloanyone.t2flow         |   194 +
 .../workflows/t2flow/helloworld.t2flow          |    82 +
 .../resources/workflows/wfbundle/as.wfbundle    |   Bin 0 -> 13797 bytes
 .../wfbundle/defaultActivitiesTaverna2.wfbundle |   Bin 0 -> 18782 bytes
 taverna-scufl2-integration-tests/pom.xml        |    77 +
 .../taverna/scufl2/integration/CloningIT.java   |    54 +
 .../scufl2/integration/TestSimpleWf.java        |    98 +
 .../scufl2/translator/t2flow/EmptyStackIT.java  |    55 +
 .../translator/t2flow/LiteralNamespacesIT.java  |    57 +
 .../t2flow/PropertyListRoundtripIT.java         |    55 +
 .../src/test/resources/apiconsumer.t2flow       |   178 +
 .../src/test/resources/clone-error.wfbundle     |   Bin 0 -> 6011 bytes
 .../src/test/resources/rest.t2flow              |   154 +
 taverna-scufl2-rdfxml/.gitignore                |     1 +
 taverna-scufl2-rdfxml/pom.xml                   |    97 +
 .../taverna/scufl2/rdfxml/AbstractParser.java   |   120 +
 .../taverna/scufl2/rdfxml/ParserState.java      |   127 +
 .../taverna/scufl2/rdfxml/ProfileParser.java    |   356 +
 .../taverna/scufl2/rdfxml/RDFXMLReader.java     |    80 +
 .../taverna/scufl2/rdfxml/RDFXMLSerializer.java |   860 +
 .../taverna/scufl2/rdfxml/RDFXMLWriter.java     |   164 +
 .../taverna/scufl2/rdfxml/RevisionParser.java   |   173 +
 .../scufl2/rdfxml/WorkflowBundleParser.java     |   190 +
 .../taverna/scufl2/rdfxml/WorkflowParser.java   |   381 +
 .../impl/NamespacePrefixMapperJAXB_RI.java      |    54 +
 ...e.taverna.scufl2.api.io.WorkflowBundleReader |     1 +
 ...e.taverna.scufl2.api.io.WorkflowBundleWriter |     1 +
 .../spring/scufl2-rdfxml-context-osgi.xml       |    32 +
 .../META-INF/spring/scufl2-rdfxml-context.xml   |    31 +
 .../taverna/scufl2/rdfxml/DummyParserTest.java  |   100 +
 .../scufl2/rdfxml/TestProfileParser.java        |   179 +
 .../taverna/scufl2/rdfxml/TestRDFXMLReader.java |   235 +
 .../scufl2/rdfxml/TestRDFXMLSerializer.java     |   490 +
 .../taverna/scufl2/rdfxml/TestRDFXMLWriter.java |   158 +
 .../scufl2/rdfxml/TestResourcesInZip.java       |    98 +
 .../scufl2/rdfxml/TestRevisionParsing.java      |   118 +
 .../taverna/scufl2/rdfxml/example.wfbundle      |   Bin 0 -> 40331 bytes
 .../rdfxml/example/META-INF/container.xml       |    34 +
 .../scufl2/rdfxml/example/META-INF/manifest.xml |    45 +
 .../rdfxml/example/Thumbnails/thumbnail.png     |   Bin 0 -> 19064 bytes
 .../rdfxml/example/Thumbnails/thumbnail.svg     |    91 +
 .../example/annotation/workflow/HelloWorld.rdf  |    70 +
 .../example/annotation/workflowBundle.rdf       |    39 +
 .../example/diagram/workflow/HelloWorld.png     |   Bin 0 -> 10243 bytes
 .../example/diagram/workflow/HelloWorld.svg     |    91 +
 .../taverna/scufl2/rdfxml/example/mimetype      |     1 +
 .../rdfxml/example/ontologies/taverna2.2.rdf    |    55 +
 .../rdfxml/example/profile/tavernaServer.rdf    |    87 +
 .../rdfxml/example/profile/tavernaWorkbench.rdf |    85 +
 .../rdfxml/example/workflow/HelloWorld.rdf      |   161 +
 .../scufl2/rdfxml/example/workflowBundle.rdf    |    59 +
 .../taverna/scufl2/rdfxml/megaProfile.rdf       |   696 +
 .../apache/taverna/scufl2/rdfxml/roevo-test.xml |    71 +
 .../taverna/scufl2/rdfxml/update-bundle.sh      |    26 +
 taverna-scufl2-schemas/pom.xml                  |    75 +
 .../src/main/resources/META-INF/NOTICE.vm       |    39 +
 .../org/apache/taverna/scufl2/rdf/scufl2.rdf    |  1663 +
 .../org/apache/taverna/scufl2/rdf/scufl2.ttl    |  1691 +
 .../apache/taverna/scufl2/rdf/taverna-2.2.rdf   |   143 +
 .../apache/taverna/scufl2/rdf/taverna-2.2.ttl   |   155 +
 .../apache/taverna/scufl2/rdfxml/xsd/owl.xsd    |    70 +
 .../apache/taverna/scufl2/rdfxml/xsd/prov.xsd   |    60 +
 .../apache/taverna/scufl2/rdfxml/xsd/rdf.xsd    |    80 +
 .../apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd   |    54 +
 .../apache/taverna/scufl2/rdfxml/xsd/roevo.xsd  |   117 +
 .../apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd |   570 +
 .../apache/taverna/scufl2/rdfxml/xsd/xml.xsd    |   295 +
 taverna-scufl2-scufl/pom.xml                    |   104 +
 .../scufl2/translator/scufl/ParserState.java    |   149 +
 .../translator/scufl/ScuflExtensionParser.java  |    43 +
 .../scufl2/translator/scufl/ScuflParser.java    |   497 +
 .../scufl2/translator/scufl/ScuflReader.java    |   115 +
 .../AbstractExtensionParser.java                |    51 +
 .../AbstractProcessorExtensionParser.java       |    49 +
 .../ApiConsumerExtensionParser.java             |    60 +
 .../BeanshellExtensionParser.java               |    60 +
 .../BiomartExtensionParser.java                 |    60 +
 .../BiomobyExtensionParser.java                 |    63 +
 .../processorelement/LocalExtensionParser.java  |    60 +
 .../processorelement/RshellExtensionParser.java |    60 +
 .../SoaplabExtensionParser.java                 |    60 +
 .../StringConstantExtensionParser.java          |    91 +
 .../processorelement/WsdlExtensionParser.java   |    59 +
 ...e.taverna.scufl2.api.io.WorkflowBundleReader |     1 +
 ...scufl2.translator.scufl.ScuflExtensionParser |    10 +
 .../translator/scufl/xsd/scufl-abstract.xsd     |    78 +
 .../translator/scufl/xsd/scufl-apiconsumer.xsd  |    82 +
 .../translator/scufl/xsd/scufl-beanshell.xsd    |    86 +
 .../translator/scufl/xsd/scufl-biomart.xsd      |    36 +
 .../translator/scufl/xsd/scufl-biomoby.xsd      |   140 +
 .../translator/scufl/xsd/scufl-dependency.xsd   |    72 +
 .../translator/scufl/xsd/scufl-inferno.xsd      |    67 +
 .../scufl2/translator/scufl/xsd/scufl-local.xsd |    62 +
 .../translator/scufl/xsd/scufl-notification.xsd |    34 +
 .../translator/scufl/xsd/scufl-rshell.xsd       |    84 +
 .../translator/scufl/xsd/scufl-soaplab.xsd      |    41 +
 .../scufl/xsd/scufl-stringconstant.xsd          |    38 +
 .../scufl2/translator/scufl/xsd/scufl-wsdl.xsd  |   118 +
 .../scufl2/translator/scufl/xsd/scufl.xsd       |   354 +
 .../translator/scufl2/TestScuflReader.java      |    47 +
 .../translator/scufl2/TestStarterPack.java      |    33 +
 .../src/test/resources/workflow10.xml           |   979 +
 taverna-scufl2-t2flow/.gitignore                |     4 +
 taverna-scufl2-t2flow/pom.xml                   |   183 +
 .../scufl2/translator/t2flow/ParserState.java   |   140 +
 .../scufl2/translator/t2flow/T2FlowParser.java  |  1214 +
 .../scufl2/translator/t2flow/T2FlowReader.java  |   182 +
 .../scufl2/translator/t2flow/T2Parser.java      |    42 +
 .../AbstractActivityParser.java                 |   232 +
 .../ApiConsomerActivityParser.java              |    99 +
 .../BeanshellActivityParser.java                |   154 +
 .../BiomartActivityParser.java                  |    72 +
 .../BiomobyActivityParser.java                  |    68 +
 .../ComponentActivityParser.java                |    78 +
 .../DataflowActivityParser.java                 |    86 +
 .../InteractionActivityParser.java              |    95 +
 .../defaultactivities/RshellActivityParser.java |   215 +
 .../SoaplabActivityParser.java                  |    89 +
 .../SpreadsheetActivityParser.java              |   125 +
 .../StringConstantActivityParser.java           |    79 +
 .../defaultactivities/WSDLActivityParser.java   |   104 +
 .../WSDLXMLSplitterParser.java                  |   102 +
 .../defaultdispatchstack/ErrorBounceParser.java |    61 +
 .../defaultdispatchstack/FailoverParser.java    |    60 +
 .../defaultdispatchstack/InvokeParser.java      |    61 +
 .../t2flow/defaultdispatchstack/LoopParser.java |   138 +
 .../defaultdispatchstack/ParallelizeParser.java |    83 +
 .../defaultdispatchstack/RetryParser.java       |   107 +
 .../ExternalToolActivityParser.java             |   522 +
 .../t23activities/RESTActivityParser.java       |   165 +
 .../t23activities/XPathActivityParser.java      |   123 +
 ...e.taverna.scufl2.api.io.WorkflowBundleReader |     1 +
 ...he.taverna.scufl2.translator.t2flow.T2Parser |    24 +
 .../spring/scufl2-t2flow-context-osgi.xml       |    62 +
 .../META-INF/spring/scufl2-t2flow-context.xml   |    65 +
 .../translator/t2flow/xsd/componentactivity.xsd |    60 +
 .../t2flow/xsd/externaltoolactivity.xsd         |   202 +
 .../t2flow/xsd/interactionactivity.xsd          |    62 +
 .../translator/t2flow/xsd/restactivity.xsd      |    96 +
 .../translator/t2flow/xsd/t2activities.xsd      |   530 +
 .../translator/t2flow/xsd/t2annotations.xsd     |   164 +
 .../translator/t2flow/xsd/t2flow-extended.xsd   |   145 +
 .../scufl2/translator/t2flow/xsd/t2flow.xsd     |   923 +
 .../scufl2/translator/t2flow/xsd/t2layers.xsd   |   154 +
 .../translator/t2flow/xsd/xpathactivity.xsd     |    68 +
 .../translator/t2flow/MergeParsingTest.java     |    79 +
 .../translator/t2flow/TestActivityParsing.java  |    59 +
 .../t2flow/TestActivityParsingRshell.java       |   334 +
 .../t2flow/TestAnnotationParsing.java           |   188 +
 .../t2flow/TestBeanshellActivityParser.java     |   236 +
 .../t2flow/TestComponentActivityParser.java     |    97 +
 .../t2flow/TestDispatchLayerParsing.java        |   217 +
 .../translator/t2flow/TestFastaWorkflow.java    |    93 +
 .../t2flow/TestInteractionActivityParser.java   |   124 +
 .../t2flow/TestIterationStrategies.java         |   134 +
 .../t2flow/TestSpreadsheetActivityParser.java   |    74 +
 .../translator/t2flow/TestT2FlowParser.java     |    83 +
 .../translator/t2flow/TestT2FlowReader.java     |   103 +
 .../translator/t2flow/TestT2FlowTranslator.java |    94 +
 .../t23activities/TestRESTActivityParser.java   |  1046 +
 .../t23activities/TestXPathActivityParser.java  |    70 +
 .../T3-1226-annotations-with-quotes.t2flow      |    97 +
 .../src/test/resources/annotated2.2.t2flow      |   218 +
 .../resources/annotation_with_backslash.t2flow  |    23 +
 .../src/test/resources/as.t2flow                |  1675 +
 taverna-scufl2-t2flow/src/test/resources/as.txt |   274 +
 .../src/test/resources/beanshell-deps.t2flow    |    47 +
 .../src/test/resources/component_simple.t2flow  |    35 +
 .../resources/dataflow_link_then_merge.t2flow   |    66 +
 .../defaultActivitiesTaverna2.2.t2flow          |   890 +
 .../src/test/resources/dispatchlayers.t2flow    |   153 +
 .../src/test/resources/fasta_and_pscan.t2flow   |   101 +
 .../resources/fasta_pscan_and_dbfetch.t2flow    |   150 +
 .../interaction-with-strange-loop.t2flow        |   212 +
 .../interaction_multiple_choice.t2flow          |   109 +
 .../resources/interaction_simple_tell.t2flow    |    53 +
 .../test/resources/iterationstrategies.t2flow   |   387 +
 .../src/test/resources/merge_fun.t2flow         |    66 +
 .../resources/merge_then_dataflow_link.t2flow   |    66 +
 .../src/test/resources/missing_merge.t2flow     |    66 +
 .../resources/missing_produced_by_941.t2flow    |   247 +
 .../src/test/resources/random.t2flow            |   219 +
 .../src/test/resources/rest-2-2.t2flow          |    79 +
 .../src/test/resources/rshell-2-2.t2flow        |   210 +
 .../semantic_annotations__eclipse.t2flow        |   541 +
 .../src/test/resources/simple_fasta.t2flow      |    78 +
 .../src/test/resources/sleepers.t2flow          |   215 +
 .../spreadsheet_activity_defaults_892.t2flow    |    77 +
 .../src/test/resources/xpath_workflow.t2flow    |   108 +
 taverna-scufl2-ucfpackage/.gitignore            |     1 +
 taverna-scufl2-ucfpackage/LICENSE-odfdom.txt    |   201 +
 taverna-scufl2-ucfpackage/pom.xml               |   105 +
 .../taverna/scufl2/ucfpackage/UCFPackage.java   |   664 +
 .../ucfpackage/impl/odfdom/pkg/OdfPackage.java  |  1880 +
 .../impl/odfdom/pkg/OdfPackageStream.java       |    81 +
 .../impl/odfdom/pkg/OdfXMLHelper.java           |   370 +
 .../impl/odfdom/pkg/StreamHelper.java           |    81 +
 .../ucfpackage/impl/odfdom/pkg/TempDir.java     |    57 +
 .../impl/odfdom/pkg/TempDirDeleter.java         |    83 +
 .../impl/odfdom/pkg/manifest/Algorithm.java     |    51 +
 .../odfdom/pkg/manifest/EncryptionData.java     |    72 +
 .../impl/odfdom/pkg/manifest/KeyDerivation.java |    61 +
 .../impl/odfdom/pkg/manifest/OdfFileEntry.java  |   101 +
 .../src/main/xsd/container.xsd                  |   199 +
 .../src/main/xsd/xenc-schema.xsd                |   146 +
 .../src/main/xsd/xmldsig-core-schema.xsd        |   308 +
 .../scufl2/ucfpackage/TestUCFPackage.java       |   976 +
 taverna-scufl2-validation-correctness/pom.xml   |    68 +
 .../CorrectnessValidationListener.java          |    67 +
 .../correctness/CorrectnessValidator.java       |    49 +
 .../correctness/CorrectnessVisitor.java         |   644 +
 .../DefaultCorrectnessValidationListener.java   |   102 +
 .../correctness/DefaultDispatchingVisitor.java  |   238 +
 .../correctness/DispatchingVisitor.java         |   253 +
 .../ReportCorrectnessValidationListener.java    |   277 +
 .../EmptyIterationStrategyTopNodeProblem.java   |    41 +
 .../IncompatibleGranularDepthProblem.java       |    61 +
 .../report/MismatchConfigurableTypeProblem.java |    53 +
 .../report/NegativeValueProblem.java            |    60 +
 .../report/NonAbsoluteURIProblem.java           |    63 +
 .../correctness/report/NullFieldProblem.java    |    50 +
 .../report/OutOfScopeValueProblem.java          |    60 +
 .../report/PortMentionedTwiceProblem.java       |    51 +
 ...issingFromIterationStrategyStackProblem.java |    54 +
 .../correctness/report/WrongParentProblem.java  |    40 +
 .../validation/correctness/DummyProfile.java    |   117 +
 .../validation/correctness/DummyWorkflow.java   |   195 +
 .../correctness/DummyWorkflowBundle.java        |   133 +
 .../correctness/TestAbstractDepthPort.java      |   143 +
 .../TestAbstractGranularDepthPort.java          |   189 +
 .../correctness/TestBlockingControlLink.java    |   159 +
 .../validation/correctness/TestChild.java       |   140 +
 .../correctness/TestConfiguration.java          |   172 +
 .../validation/correctness/TestDataLink.java    |   389 +
 .../correctness/TestIterationStrategyStack.java |   130 +
 .../TestIterationStrategyTopNode.java           |   187 +
 .../validation/correctness/TestNamed.java       |   136 +
 .../validation/correctness/TestPortNode.java    |   252 +
 .../validation/correctness/TestPorted.java      |   163 +
 .../validation/correctness/TestProcessor.java   |   121 +
 .../correctness/TestProcessorBinding.java       |   496 +
 .../TestProcessorInputPortBinding.java          |   332 +
 .../TestProcessorOutputPortBinding.java         |   332 +
 .../validation/correctness/TestProfile.java     |   226 +
 .../scufl2/validation/correctness/TestRoot.java |   147 +
 .../validation/correctness/TestTyped.java       |   145 +
 .../validation/correctness/TestWorkflow.java    |   242 +
 .../correctness/TestWorkflowBundle.java         |   252 +
 taverna-scufl2-validation-integration/pom.xml   |    67 +
 .../integration/scufl/Test172StarterPack.java   |   148 +
 .../integration/t2flow/Test230StarterPack.java  |   143 +
 .../src/test/resources/t172starterpacklist      |     1 +
 .../src/test/resources/t230starterpacklist      |    30 +
 taverna-scufl2-validation-structural/pom.xml    |    69 +
 .../DefaultStructuralValidationListener.java    |   110 +
 .../ReportStructuralValidationListener.java     |   236 +
 .../StructuralValidationListener.java           |    65 +
 .../structural/StructuralValidator.java         |   412 +
 .../validation/structural/ValidatorState.java   |   184 +
 .../DotProductIterationMismatchProblem.java     |    38 +
 .../report/EmptyCrossProductProblem.java        |    32 +
 .../report/EmptyDotProductProblem.java          |    32 +
 .../report/FailedProcessorProblem.java          |    38 +
 .../report/IncompleteWorkflowProblem.java       |    38 +
 .../MissingIterationStrategyStackProblem.java   |    32 +
 .../MissingMainIncomingDataLinkProblem.java     |    38 +
 ...nrecognizedIterationStrategyNodeProblem.java |    38 +
 .../report/UnresolvedOutputProblem.java         |    38 +
 .../report/UnresolvedProcessorProblem.java      |    38 +
 .../validation/structural/CrossProductTest.java |   138 +
 .../structural/DepthInheritanceTest.java        |   154 +
 .../validation/structural/DotProductTest.java   |   181 +
 .../structural/StagedCombinationTest.java       |   104 +
 .../validation/structural/WorkflowTest.java     |    55 +
 taverna-scufl2-validation/pom.xml               |    51 +
 .../taverna/scufl2/validation/Status.java       |    32 +
 .../scufl2/validation/ValidationException.java  |    39 +
 .../scufl2/validation/ValidationProblem.java    |    45 +
 .../scufl2/validation/ValidationReport.java     |    35 +
 .../taverna/scufl2/validation/Validator.java    |    45 +
 .../scufl2/validation/WorkflowBeanReport.java   |    31 +
 taverna-scufl2-wfdesc/README.md                 |   235 +
 taverna-scufl2-wfdesc/pom.xml                   |   385 +
 .../taverna/scufl2/wfdesc/ConvertToWfdesc.java  |    76 +
 .../apache/taverna/scufl2/wfdesc/Labelled.java  |    36 +
 .../taverna/scufl2/wfdesc/ROEvoSerializer.java  |   122 +
 .../scufl2/wfdesc/TurtleWriterWithBase.java     |    71 +
 .../taverna/scufl2/wfdesc/WfdescAgent.java      |    94 +
 .../taverna/scufl2/wfdesc/WfdescReader.java     |    84 +
 .../taverna/scufl2/wfdesc/WfdescSerialiser.java |   407 +
 .../taverna/scufl2/wfdesc/WfdescWriter.java     |    78 +
 ...e.taverna.scufl2.api.io.WorkflowBundleReader |     1 +
 ...e.taverna.scufl2.api.io.WorkflowBundleWriter |     1 +
 .../spring/scufl2-wfdesc-context-osgi.xml       |    32 +
 .../META-INF/spring/scufl2-wfdesc-context.xml   |    31 +
 .../src/main/resources/com/xmlns/foaf/foaf.rdf  |   608 +
 .../org/purl/wf4ever/wfdesc/.gitignore          |     1 +
 .../org/purl/wf4ever/wfdesc/roterms.ttl         |   315 +
 .../org/purl/wf4ever/wfdesc/wf4ever.ttl         |   241 +
 .../org/purl/wf4ever/wfdesc/wfdesc.ttl          |   356 +
 .../org/purl/wf4ever/wfdesc/wfprov.ttl          |   210 +
 .../src/main/resources/org/w3/prov-o.ttl        |  1321 +
 .../taverna/scufl2/wfdesc/TestAllTypes.java     |   171 +
 .../scufl2/wfdesc/TestAnnotationQuoting.java    |   115 +
 .../scufl2/wfdesc/TestConvertToWfdesc.java      |   191 +
 .../scufl2/wfdesc/TestInvalidURITemplate.java   |    94 +
 .../scufl2/wfdesc/TestLocalDependency.java      |    98 +
 .../taverna/scufl2/wfdesc/TestNested.java       |   172 +
 .../scufl2/wfdesc/TestRoEvoSerializer.java      |    64 +
 .../scufl2/wfdesc/TestSemanticAnnotations.java  |   108 +
 .../taverna/scufl2/wfdesc/TestWfdescReader.java |    65 +
 .../taverna/scufl2/wfdesc/TestWfdescWriter.java |   104 +
 .../T3-1226-annotations-with-quotes.t2flow      |    97 +
 .../test/resources/allTypes.links.sparql.json   |    72 +
 .../src/test/resources/allTypes.t2flow          |   485 +
 .../src/test/resources/enm-v21.t2flow           | 30875 +++++++++++++++++
 .../src/test/resources/helloanyone.t2flow       |   196 +
 .../src/test/resources/helloworld.t2flow        |    84 +
 .../src/test/resources/helloworld.wfdesc.ttl    |    37 +
 .../src/test/resources/localdependency.t2flow   |    29 +
 .../src/test/resources/nested.t2flow            |   228 +
 .../resources/rdf-in-example-annotation.t2flow  |    27 +
 .../valid_component_imagemagickconvert.t2flow   |   394 +
 615 files changed, 127445 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f736862
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.project
+.settings
+.classpath
+target
+.gitignore

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d1618e4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+# 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.
+language: java

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..68c771a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,176 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4c543f7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,230 @@
+<!---
+   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.
+--->
+# Apache Taverna Language
+
+[![Build Status](https://travis-ci.org/taverna-incubator/incubator-taverna-language.svg)](https://travis-ci.org/taverna-incubator/incubator-taverna-language)
+[![doi:10.5281/zenodo.10651](https://zenodo.org/badge/doi/10.5281/zenodo.10651.png)](http://dx.doi.org/10.5281/zenodo.10651)
+
+
+## SCUFL2
+
+
+See also the [SCUFL2 wiki][1]
+
+(c) 2009-2014 University of Manchester, UK
+
+Licensed under the [GNU Lesser General Public License (LGPL) 2.1][6]. 
+See LICENSE.txt for the full terms of LGPL 2.1.
+
+This is the [API][9], model and format of [SCUFL2][1], which replaces 
+[Taverna][5]'s workflow format .t2flow. This API allows 
+JVM applications to inspect, generate and modify Taverna workflow
+definitions without depending on the Taverna runtime.
+
+A new format, called [Scufl2 Workflow Bundle][7] is defined alongside this
+API. This format can be inspected, generated and modified independently
+of this API.
+
+Note that the ability for Scufl2 API to read a workflow bundle (using
+the `scufl2-rdfxml` module) does not guarantee it is valid or
+structurally sound. The experimental modules `scufl2-validation-*` will
+in the future be able to provide such verification.
+
+For more information, see the [SCUFL2 API][9] pages, the
+[Javadoc][10] and the [SCUFL2 examples][8].
+
+Requisites
+----------
+
+* Java 1.6 or newer (tested with Java 1.7)
+* Maven 2.2.2 or newer (for building, tested with Maven 3.0.5)
+
+
+Building
+--------
+
+* `mvn clean install`
+
+This will build each module and run their tests, producing JARs like
+`scufl2-api/target/scufl2-api-0.14.0.jar`. 
+
+First time you build Scufl2 this might download dependencies needed for
+compliation. These have separate open source licenses, but should be
+compatible with LGPL. None of the dependencies are neccessary for
+using the compiled SCUFL2 API.
+
+Some of the experimental modules are not built automatically, to build
+them separately, run the same command from within their folder.
+
+
+
+Usage
+-----
+
+Scufl2 is built as a Maven project, and the easiest way to use it is
+from other Maven projects.
+
+Typical users of the Scufl2 API will depend on the three modules
+*scufl2-api*, *scufl2-t2flow* and *scufl2-rdfxml*. In your Maven
+project's POM file, add this to your `<dependencies>` section:
+
+		<dependency>
+			<groupId>uk.org.taverna.scufl2</groupId>
+			<artifactId>scufl2-api</artifactId>
+			<version>0.14.0</version>
+		</dependency>
+		<dependency>
+			<groupId>uk.org.taverna.scufl2</groupId>
+			<artifactId>scufl2-rdfxml</artifactId>
+			<version>0.14.0</version>
+		</dependency>
+		<dependency>
+			<groupId>uk.org.taverna.scufl2</groupId>
+			<artifactId>scufl2-t2flow</artifactId>
+			<version>0.14.0</version>
+		</dependency>
+
+All Scufl2 modules are also valid OSGi bundles, see the OSGi section
+below.  
+
+You can alternatively copy and add the JARs from these modules to your
+classpath:
+
+* scufl2-api/target/scufl2-api-0.14.0.jar
+* scufl2-rdfxml/target/scufl2-rdfxml-0.14.0.jar
+* scufl2-t2flow/target/scufl2-t2flow-0.14.0.jar
+
+See the [SCUFL2 Javadoc](http://mygrid.github.io/scufl2/api/0.14/) for 
+documentation of classes and methods of SCUFL2. The package
+[uk.o.rg.taverna.scufl2.api](http://mygrid.github.io/scufl2/api/0.14/uk/org/taverna/scufl2/api/package-summary.html)
+is a good starting point.
+
+See the *scufl2-validation* folder for examples of
+usage. The best classes to start exploring would be
+`uk.org.taverna.scufl2.api.io.WorkflowBundleIO` and
+`uk.org.taverna.scufl2.api.container.WorkflowBundle`.
+
+Example of converting .t2flow to .wfbundle:
+
+    import uk.org.taverna.scufl2.api.container.WorkflowBundle;
+    import uk.org.taverna.scufl2.api.io.ReaderException;
+    import uk.org.taverna.scufl2.api.io.WorkflowBundleIO;
+    import uk.org.taverna.scufl2.api.io.WriterException;
+
+    // ..
+    
+    WorkflowBundleIO io = new WorkflowBundleIO();
+    File t2File = new File("workflow.t2flow");
+    File scufl2File = new File("workflow.wfbundle");
+    WorkflowBundle wfBundle = io.readBundle(t2File, "application/vnd.taverna.t2flow+xml");
+    io.writeBundle(wfBundle, scufl2File, "application/vnd.taverna.scufl2.workflow-bundle");
+
+Check out the GitHub project scufl2-examples[8] for examples of using Scufl2, 
+including the above code.
+
+Supported file formats with WorkflowBundleIO and their required modules:
+
+<table>
+    <tr><th>Media type</th>  <th>Support</th> <th>JAR</th> <th>Description</th> </tr>
+    <tr><td>application/vnd.taverna.t2flow+xml</td><td>read</td><td>scufl2-t2flow</td><td>Taverna 2 t2flow</td></tr>
+    <tr><td>application/vnd.taverna.scufl2.workflow-bundle</td><td>read/write</td><td>scufl2-rdfxml</td><td>Taverna 3 workflow bundle</td></tr>
+    <tr><td>application/vnd.taverna.scufl+xml</td><td>read</td><td>scufl2-scufl</td><td>Taverna 1 SCUFL (experimental)</td></tr>
+    <tr><td>text/vnd.taverna.scufl2.structure</td><td>read/write</td><td>scufl2-api</td><td>Textual format for testing/debugging</td></tr>
+    <tr><td>text/vnd.wf4ever.wfdesc+turtle</td><td>write</td><td><a href="https://github.com/wf4ever/scufl2-wfdesc">scufl2-wfdesc</a></td><td>Abstract workflow structure in <a href="http://www.w3.org/TR/turtle/">RDF Turtle</a> according to the <a href="http://purl.org/wf4ever/model#wfdesc">Wf4Ever wfdesc ontology</a></td></tr>
+    <tr><td>text/vnd.mgrast.awe.awf+json</td><td>read</td><td><a href="https://github.com/stain/scufl2-awf">scufl2-awf</a></td> <td>Workflow definition of the MG-RAST <a href="https://github.com/MG-RAST/AWE">AWE</a> workflow engine. (experimental)</td></tr>
+    <tr><td>application/vnd.shiwa.iwir+xml</td><td>read/write</td> <td><a href="https://github.com/stain/scufl2-iwir/">scufl2-iwir</a></td> <td><a href="http://www.shiwa-workflow.eu/">SHIWA</a>'s <a href="https://www.shiwa-workflow.eu/documents/10753/55350/IWIR+v1.1+Specification">IWIR</a> interoperabile workflow language (experimental)</td></tr>
+    <tr><td>application/json</td> <td>write</td> <td><a href="https://github.com/myGrid/scufl2-examples">scufl2-examples</a></td> <td>Abstract workflow as JSON (experimental)</td></tr>
+</table>
+
+
+OSGi services
+-------------
+To use SCUFL2 from OSGi, use the following OSGi Services. Example, from
+META-INF/spring/run-context.osgi.xml:
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <beans:beans xmlns="http://www.springframework.org/schema/osgi"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:beans="http://www.springframework.org/schema/beans"
+                xsi:schemaLocation="http://www.springframework.org/schema/beans
+                                    http://www.springframework.org/schema/beans/spring-beans.xsd
+                                    http://www.springframework.org/schema/osgi
+                                    http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+        <service ref="myService" interface="com.example.MyService"/>
+
+        <reference id="workflowBundleIO" interface="uk.org.taverna.scufl2.api.io.WorkflowBundleIO" />
+
+    </beans:beans>
+
+And in run-context.xml:
+
+    <?xml version="1.0" encoding="UTF-8"?>
+    <beans xmlns="http://www.springframework.org/schema/beans"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.springframework.org/schema/beans
+                            http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+        <bean id="myService" class="com.example.impl.MyServiceImpl" >
+                <property name="workflowBundleIO" ref="workflowBundleIO"/>
+        </bean>
+
+    </beans>
+
+This will provide a WorkflowBundleIO instance with its readers and
+writers loaded through OSGi, which when the bundles for scufl2-t2flow
+and scufl2-rdfxml are loaded, would include support for the Taverna 2
+t2flow format and the Taverna 3 wfbundle format.
+
+Note that you do not need to use OSGi services to instantiate
+Scufl2Tools or URITools, but may do so if you wish.
+
+
+Modules
+-------
+
+Official modules:
+
+* *scufl2-api* Java Beans for working with SCUFL2 
+* *scufl2-t2flow* .t2flow import from Taverna 2
+* *scufl2-rdfxml* .wfbundle import/export (RDF/XML)
+
+Experimental modules:
+
+* *scufl2-usecases* Example code covering [SCUFL2 use cases][4] (out of date)
+* *scufl2-rdf* Pure RDF export/import (out of date)
+* *scufl2-scufl* SCUFL 1 .xml import from Taverna 1
+* *scufl2-validation* API for validating a Scufl2 workflow bundle
+* *scufl2-validation-correctness* 
+  Validate correctness of Scufl2 workflow definition
+* *scufl2-validation-structural*
+  Validate that a Scufl2 workflow definition is structurally sound
+* *scufl2-validation-integration*
+  Integration tests for scufl2-validation modules
+
+
+
+[1]: http://www.mygrid.org.uk/dev/wiki/display/developer/SCUFL2
+[2]: http://www.mygrid.org.uk/
+[3]: http://www.mygrid.org.uk/dev/wiki/display/story/Dataflow+serialization
+[4]: http://www.mygrid.org.uk/dev/wiki/display/developer/SCUFL2+use+cases
+[5]: http://www.taverna.org.uk/
+[6]: http://www.gnu.org/licenses/lgpl-2.1.html
+[7]: http://www.mygrid.org.uk/dev/wiki/display/developer/Taverna+Workflow+Bundle
+[8]: https://github.com/mygrid/scufl2-examples
+[9]: http://www.mygrid.org.uk/dev/wiki/display/developer/SCUFL2+API
+[10]: http://mygrid.github.io/scufl2/api/0.14/

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..030d92f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,350 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.taverna</groupId>
+		<artifactId>taverna-parent</artifactId>
+		<version>1-incubating-SNAPSHOT</version>
+	</parent>
+	<groupId>org.apache.taverna.language</groupId>
+	<artifactId>taverna-language</artifactId>
+	<version>0.16.1-incubating-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<name>Apache Taverna Language APIs (Scufl2, Databundle)</name>
+	<description>Taverna Language API for workflow definitions (SCUFL2)
+		and workflow inputs/outputs/run (DataBundle).
+	</description>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>rat-checks</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<useDefaultExcludes>true</useDefaultExcludes>
+					<excludes>
+						<!-- Following excludes needed for taverna-scufl2-rdf,
+						taverna-scufl2-integration-tests and taverna-scufl2-validation-integration
+						subfolders that should be modules but are not. -->
+						<exclude>**/.classpath</exclude>
+						<exclude>**/.project</exclude>
+						<exclude>**/.settings/</exclude>
+						<exclude>**/target/</exclude>
+						<!-- Text and Markdown files are typically used only for documentation 
+							purposes and license declarations are usually spurious in these files since 
+							often they will refer to the LICENSE/NOTICE for users to find the actual 
+							licenses -->
+						<exclude>**/*.md</exclude>
+						<!-- META-INF services files can include comments but a license header 
+							would be unecessarily clutter so we exclude these -->
+						<exclude>**/META-INF/services/*</exclude>
+						<!-- No headers in JSON which haven't got comments ... -->
+						<exclude>**/*.json</exclude>
+						<!-- Really a binary format, but must look like text -->
+						<exclude>**/mimetype</exclude>
+						<!-- Effectively a binary format -->
+						<exclude>**/*.url</exclude>
+						<!-- The following schemas are W3C; automatic retrieval during build is 
+							blocked by their administrative processes, yet they are explicitly
+							standardised documents intended for wide use. Their licenses should
+							be standard W3C ones, but that's never stated explicitly by the W3C.
+							"Thanks!" -->
+						<exclude>**/xml.xsd</exclude>
+						<exclude>**/xenc-schema.xsd</exclude>
+						<exclude>**/xmldsig-core-schema.xsd</exclude>
+						<!-- This refers to the FOAF spec, which is available online at
+							http://xmlns.com/foaf/spec/ and which uses the CC-BY-SA 1.0
+							license. The RDF downloadable from the site, of which this is a copy,
+							has no copyright statement at all in it. -->
+						<exclude>**/foaf.rdf</exclude>
+						<!-- The following contain a mix of licenses. PROBLEM! -->
+						<exclude>/src/main/resources/ontologies/*.owl</exclude>
+						<exclude>/src/main/resources/ontologies/*.rdf</exclude>
+						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/roterms.ttl</exclude>
+						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/wf4ever.ttl</exclude>
+						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/wfdesc.ttl</exclude>
+						<exclude>/src/main/resources/org/purl/wf4ever/wfdesc/wfprov.ttl</exclude>
+						<exclude>/src/main/resources/org/w3/prov-o.ttl</exclude>
+						<!-- Various files used for testing and test support only. -->
+						<!-- THESE SUPPORT COMMENTS with # --><!--taverna-integration-test-->
+						<exclude>/src/test/resources/t172starterpacklist</exclude>
+						<exclude>/src/test/resources/t230starterpacklist</exclude>
+						<!-- THESE ARE XML AND SUPPORT COMMENTS -->
+						<exclude>/src/test/resources/annotation_with_backslash.t2flow</exclude>
+						<exclude>/src/test/resources/beanshell-deps.t2flow</exclude>
+						<exclude>/src/test/resources/component_simple.t2flow</exclude>
+						<exclude>/src/test/resources/dataflow_link_then_merge.t2flow</exclude>
+						<exclude>/src/test/resources/dispatchlayers-xsd.t2flow</exclude>
+						<exclude>/src/test/resources/dispatchlayers.t2flow</exclude>
+						<exclude>/src/test/resources/fasta_and_pscan.t2flow</exclude>
+						<exclude>/src/test/resources/fasta_pscan_and_dbfetch.t2flow</exclude>
+						<exclude>/src/test/resources/interaction-with-strange-loop.t2flow</exclude>
+						<exclude>/src/test/resources/interaction_multiple_choice.t2flow</exclude>
+						<exclude>/src/test/resources/interaction_simple_tell.t2flow</exclude>
+						<exclude>/src/test/resources/iterationstrategies.t2flow</exclude><!-- TOM -->
+						<exclude>/src/test/resources/merge_fun.t2flow</exclude>
+						<exclude>/src/test/resources/merge_then_dataflow_link.t2flow</exclude>
+						<exclude>/src/test/resources/missing_merge.t2flow</exclude>
+						<exclude>/src/test/resources/missing_produced_by_941.t2flow</exclude>
+						<exclude>/src/test/resources/rest-2-2.t2flow</exclude>
+						<exclude>/src/test/resources/rshell-2-2.t2flow</exclude>
+						<exclude>/src/test/resources/simple_fasta.t2flow</exclude>
+						<exclude>/src/test/resources/sleepers.t2flow</exclude>
+						<exclude>/src/test/resources/apiconsumer.t2flow</exclude>
+						<exclude>/src/test/resources/rest.t2flow</exclude>
+						<exclude>/src/test/resources/valid_component_imagemagickconvert.t2flow</exclude>
+						<exclude>/src/test/resources/enm-v21.t2flow</exclude>
+						<exclude>/src/test/resources/helloworld.wfdesc.ttl</exclude>
+						<exclude>/src/test/resources/localdependency.t2flow</exclude>
+						<exclude>/src/test/resources/nested.t2flow</exclude>
+						<exclude>/src/test/resources/rdf-in-example-annotation.t2flow</exclude>
+						<exclude>/src/test/resources/workflow10.xml</exclude>
+						<exclude>/src/test/resources/full-example/ebi_interproscan_newservices_900329.t2flow</exclude>
+						<!-- Cannot contain comments; content must match program output. -->
+						<exclude>/src/test/resources/org/apache/taverna/scufl2/api/io/HelloWorld.txt</exclude>
+						<exclude>/src/test/resources/as.txt</exclude>
+						<!-- Expanded data bundle. Generated. -->
+						<exclude>/src/test/resources/full-example/ebi-wfrun-2013-05-31/</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		
+			<!--
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<id>add-licenses</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>aggregate-add-third-party</goal>
+						</goals>
+						<configuration>
+							<excludedGroups>.*(mygrid|taverna).*</excludedGroups>
+							<useMissingFile>true</useMissingFile>
+							<missingFile>src/license/THIRD-PARTY.properties</missingFile>
+							<licenseMerges>
+								<licenseMerge>The Apache Software License, Version 2.0|Apache 2|Apache License|Apache License, Version 2.0|Apache Public License 2.0|Apache License Version 2.0|Apache Software License 2.0|Apache Software License - Version 2.0</licenseMerge>
+								<licenseMerge>The BSD License|BSD|BSD License|BSD-style license|BSD style|Aduna BSD license|Aduna BSD-style license</licenseMerge>
+								<licenseMerge>MIT License|The MIT License|MIT license</licenseMerge>
+								<licenseMerge>GNU Lesser General Public License|GNU LESSER GENERAL PUBLIC LICENSE|GNU Library or Lesser General Public License|LGPL</licenseMerge>
+								<licenseMerge>Common Development and Distribution License (CDDL) v1.0|CDDL 1.1|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</licenseMerge>
+								<licenseMerge>Eclipse Public License, Version 1.0|Eclipse Public License</licenseMerge>
+							</licenseMerges>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			-->
+		</plugins>
+		<pluginManagement>
+			<plugins>
+
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>jaxb2-maven-plugin</artifactId>
+					<version>1.6</version>
+					<configuration>
+						<target>2.2</target>
+						<enableIntrospection>true</enableIntrospection>
+						<!--
+						Needed for consistency across Java 6 and Java 7 on optional Booleans.
+						http://www.olivergierke.de/wordpress/2011/03/a-jaxb-or-rather-xjc-odyssey/
+						http://www.mojavelinux.com/blog/archives/2006/09/the_great_jaxb_api_blunder/
+						http://java.net/jira/browse/JAXB-131
+						-->
+						<!--
+						<arguments>-disableXmlSecurity</arguments>
+						-->
+						<!--
+						Needed to read schemas from file: (!!)
+						https://github.com/stianh/gradle-jaxb-plugin/issues/20
+						-->
+					</configuration>
+					<dependencies>
+						<!--
+						<dependency>
+							<groupId>com.sun.xml.bind</groupId>
+							<artifactId>jaxb-xjc</artifactId>
+							<version>${jaxb.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>com.sun.xml.bind</groupId>
+							<artifactId>jaxb-impl</artifactId>
+							<version>${jaxb.version}</version> 
+						</dependency>
+						-->
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.jvnet.jaxb2.maven2</groupId>
+					<artifactId>maven-jaxb2-plugin</artifactId>
+					<version>0.11.0</version>
+					<configuration>
+						<enableIntrospection>true</enableIntrospection>
+						<specVersion>2.2</specVersion>
+						<schemaDirectory>src/main/xsd</schemaDirectory>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+<!-- TODO: Update -->
+	<scm>
+		<!-- TODO: Replace with git.apache.org details :
+		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</connection>
+		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</developerConnection>
+		<url>https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</url>
+		-->
+		<connection>scm:git:https://github.com/taverna-incubator/incubator-taverna-language.git</connection>
+		<developerConnection>scm:git:git@github.com:taverna-incubator/incubator-taverna-language.git</developerConnection>
+		<url>https://github.com/taverna-incubator/incubator-taverna-language</url>
+		<tag>HEAD</tag>
+	</scm>
+
+	<repositories>
+		<!--
+		<repository>
+			<id>com.springsource.repository.bundles.release</id>
+			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
+			<releases />
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>com.springsource.repository.bundles.external</id>
+			<name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/external</url>
+			<releases />
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		-->
+
+<!-- TODO: Remove myGrid repositories -->
+		<repository>
+			<id>taverna-incubating</id>
+			<name>Apache Taverna incubating Repository</name>
+			<url>http://repository.mygrid.org.uk/artifactory/incubator-snapshot-local/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots />
+		</repository>
+		<repository>
+<!-- TODO: Use Apache snapshot repo instead -->
+			<id>taverna-incubating-release</id>
+			<name>Taverna incubating test release</name>
+			<url>http://repository.mygrid.org.uk/artifactory/incubator-release-test/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-core</artifactId>
+				<version>${jackson.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-databind</artifactId>
+				<version>${jackson.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.module</groupId>
+				<artifactId>jackson-module-jsonSchema</artifactId>
+				<version>${jackson.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+				<version>${commons.io.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.jdom</groupId>
+				<artifactId>com.springsource.org.jdom</artifactId>
+				<version>${jdom.version}</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.xml.bind</groupId>
+				<artifactId>jaxb-impl</artifactId>
+				<version>${jaxb.version}</version>
+				<type>jar</type>
+				<optional>true</optional>
+			</dependency>
+			<dependency>
+				<groupId>org.jaxen</groupId>
+				<artifactId>com.springsource.org.jaxen</artifactId>
+				<!-- Was 1.1.4. as "1.1.3 has missing dependencies" but 1.1.1 appears to work fine -->
+				<version>${jaxen.version}</version>
+				<type>jar</type>
+			</dependency>
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>${commons.beanutils.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<modules>
+		<module>taverna-scufl2-ucfpackage</module>
+		<module>taverna-scufl2-api</module>
+		<module>taverna-scufl2-examples</module>
+		<module>taverna-scufl2-rdfxml</module>
+		<module>taverna-scufl2-t2flow</module>
+		<module>taverna-scufl2-scufl</module>
+		<module>taverna-scufl2-validation</module>
+		<module>taverna-scufl2-validation-structural</module>
+		<module>taverna-scufl2-validation-correctness</module>
+		<module>taverna-scufl2-validation-integration</module>
+		<module>taverna-scufl2-integration-tests</module>
+		<module>taverna-scufl2-annotation</module>
+		<module>taverna-scufl2-schemas</module>
+		<module>taverna-scufl2-wfdesc</module>
+		<module>taverna-robundle</module>
+		<module>taverna-databundle</module>
+		<module>taverna-baclava-language</module>
+	</modules>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/taverna-baclava-language/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/pom.xml b/taverna-baclava-language/pom.xml
new file mode 100644
index 0000000..36b5f7d
--- /dev/null
+++ b/taverna-baclava-language/pom.xml
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.taverna.language</groupId>
+		<artifactId>taverna-language</artifactId>
+		<version>0.16.1-incubating-SNAPSHOT</version>
+	</parent>
+  <artifactId>baclava-language</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>baclava</name>
+  <packaging>bundle</packaging>
+  <description>Support for reading and writing Baclava files</description>
+  <build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxb2-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>xjc</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<packageName>org.apache.taverna.baclava</packageName>
+					<schemaDirectory>src/main/resources/xsd/</schemaDirectory>
+				</configuration>
+			</plugin>
+
+	            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+			<plugin>
+				<groupId>org.apache.rat</groupId>
+				<artifactId>apache-rat-plugin</artifactId>
+			</plugin>
+                  </plugins>
+            </build>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
new file mode 100644
index 0000000..8b78826
--- /dev/null
+++ b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
@@ -0,0 +1,42 @@
+package org.apache.taverna.baclava;
+
+/*
+ * 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 java.io.Reader;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+
+public class BaclavaReader {
+	
+	private static JAXBContext jaxbContext;
+	private static Unmarshaller unmarshaller;
+
+	public static DataThingMapType readBaclava(Reader r) throws JAXBException {
+		jaxbContext = JAXBContext.newInstance("org.apache.taverna.baclava");
+		unmarshaller = jaxbContext.createUnmarshaller();
+		JAXBElement<?> jb = (JAXBElement<?>) unmarshaller.unmarshal(r);
+		return (DataThingMapType) jb.getValue();
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
new file mode 100644
index 0000000..cf8917d
--- /dev/null
+++ b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
@@ -0,0 +1,47 @@
+/**
+ * 
+ */
+package org.apache.taverna.baclava;
+
+/*
+ * 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 java.io.Writer;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+
+/**
+ * @author alanrw
+ *
+ */
+public class BaclavaWriter {
+
+	public static void writeBaclava(DataThingMapType d, Writer w) throws JAXBException {
+		JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+		Marshaller marshaller = jaxbContext.createMarshaller();
+		marshaller.setProperty("jaxb.formatted.output", true);
+		
+		ObjectFactory of = new ObjectFactory();
+		marshaller.marshal(of.createDataThingMap(d), w);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/c08405cb/taverna-baclava-language/src/main/resources/xsd/baclava.xsd
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/src/main/resources/xsd/baclava.xsd b/taverna-baclava-language/src/main/resources/xsd/baclava.xsd
new file mode 100644
index 0000000..de1afa9
--- /dev/null
+++ b/taverna-baclava-language/src/main/resources/xsd/baclava.xsd
@@ -0,0 +1,183 @@
+<?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.
+-->
+<schema targetNamespace="http://org.embl.ebi.escience/baclava/0.1alpha"
+	elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:b="http://org.embl.ebi.escience/baclava/0.1alpha"
+	xmlns:s="http://org.embl.ebi.escience/xscufl/0.1alpha"
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+	jaxb:version="2.0">
+
+	<import schemaLocation="xscufl.xsd" namespace="http://org.embl.ebi.escience/xscufl/0.1alpha"></import>
+	<element name="dataThingMap" type="b:DataThingMapType"></element>
+
+	<complexType name="DataThingMapType">
+		<sequence>
+			<element ref="b:dataThing" minOccurs="1"
+				maxOccurs="unbounded">
+			</element>
+		</sequence>
+	</complexType>
+
+	<complexType name="DataThingType">
+		<sequence>
+			<element ref="b:myGridDataDocument" minOccurs="1"
+				maxOccurs="1">
+			</element>
+		</sequence>
+		<attribute name="key" use="required">
+			<simpleType>
+				<restriction base="string">
+					<minLength value="1"></minLength>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+	</complexType>
+
+	<element name="dataThing" type="b:DataThingType"></element>
+
+	<complexType name="MyGridDataDocumentType">
+		<sequence>
+			<element ref="s:metadata" minOccurs="1" maxOccurs="1"></element>
+			<choice minOccurs="1" maxOccurs="1">
+				<element ref="b:partialOrder"></element>
+				<element ref="b:dataElement"></element>
+			</choice>
+		</sequence>
+		<attribute name="lsid" use="required">
+			<simpleType>
+				<restriction base="string">
+					<minLength value="0"></minLength>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+		<attribute name="syntactictype" use="required">
+			<simpleType>
+				<restriction base="string">
+					<minLength value="1"></minLength>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+	</complexType>
+
+	<element name="myGridDataDocument"
+		type="b:MyGridDataDocumentType">
+	</element>
+
+
+	<complexType name="PartialOrderType">
+		<sequence>
+			<element ref="b:relationList" minOccurs="0" maxOccurs="1"></element>
+			<element ref="b:itemList" minOccurs="0" maxOccurs="1"></element>
+		</sequence>
+		<attribute name="lsid" use="required">
+			<simpleType>
+				<restriction base="string">
+					<minLength value="0"></minLength>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+		<attribute name="type" type="string" use="required"
+			fixed="list">
+		</attribute>
+		<attribute name="index" use="optional">
+			<simpleType>
+				<restriction base="int">
+					<minExclusive value="0"></minExclusive>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+	</complexType>
+
+	<complexType name="RelationListType">
+		<sequence>
+			<element ref="b:relation" minOccurs="0" maxOccurs="unbounded"></element>
+		</sequence>
+	</complexType>
+
+	<complexType name="ItemListType">
+		<sequence>
+			<element ref="b:dataElement" minOccurs="0"
+				maxOccurs="unbounded">
+			</element>
+		</sequence>
+	</complexType>
+
+
+
+	<element name="partialOrder" type="b:PartialOrderType"></element>
+
+	<element name="relationList" type="b:RelationListType"></element>
+
+	<element name="itemList" type="b:ItemListType"></element>
+
+	<element name="dataElement" type="b:DataElementType"></element>
+
+	<element name="dataElementData" type="string"></element>
+
+	<complexType name="DataElementType">
+		<sequence>
+			<element ref="b:dataElementData" minOccurs="1"
+				maxOccurs="1">
+			</element>
+		</sequence>
+		<attribute name="lsid" use="required">
+			<simpleType>
+				<restriction base="string">
+					<minLength value="0"></minLength>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+		<attribute name="index" use="optional">
+			<simpleType>
+				<restriction base="int">
+					<minInclusive value="0"></minInclusive>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+	</complexType>
+
+	<complexType name="RelationType">
+		<attribute name="parent" use="required">
+			<simpleType>
+				<restriction base="int">
+					<minInclusive value="0"></minInclusive>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+		<attribute name="child">
+			<simpleType>
+				<restriction base="int">
+					<minExclusive value="0"></minExclusive>
+					<whiteSpace value="collapse"></whiteSpace>
+				</restriction>
+			</simpleType>
+		</attribute>
+	</complexType>
+
+	<element name="relation" type="b:RelationType"></element>
+</schema>
\ No newline at end of file