uk.org.taverna -> org.apache.taverna
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/5d755a68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/5d755a68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/5d755a68 Branch: refs/heads/TAVERNA-1027 Commit: 5d755a68706fcdbc3782918868b266b781146ebf Parents: 6a0421e Author: Stian Soiland-Reyes <st...@apache.org> Authored: Tue Jan 9 23:32:36 2018 +0000 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Tue Jan 9 23:40:07 2018 +0000 ---------------------------------------------------------------------- .../resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd | 2 +- .../taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd | 4 ++-- .../scufl2/translator/t2flow/xsd/externaltoolactivity.xsd | 4 ++-- .../scufl2/translator/t2flow/xsd/interactionactivity.xsd | 4 ++-- .../taverna/scufl2/translator/t2flow/xsd/restactivity.xsd | 4 ++-- .../taverna/scufl2/translator/t2flow/xsd/t2activities.xsd | 4 ++-- .../taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd | 4 ++-- .../taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd | 6 +++--- .../src/test/resources/semantic_annotations__eclipse.t2flow | 4 ++-- .../resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd index 92daa62..b463d31 100644 --- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd +++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd @@ -24,7 +24,7 @@ <xs:annotation> <xs:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> <jxb:globalBindings /> <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd index e55d6db..091d31e 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/componentactivity.xsd @@ -27,9 +27,9 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> - <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.interaction.jaxb" + <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.interaction.jaxb" /> </jxb:schemaBindings> --> </xsd:appinfo> </xsd:annotation> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd index 55a3a86..1d9b8f8 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/externaltoolactivity.xsd @@ -26,10 +26,10 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> <jxb:schemaBindings> - <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.externalTool.jaxb" /> + <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.externalTool.jaxb" /> </jxb:schemaBindings> </xsd:appinfo> </xsd:annotation> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd index e1a6b16..7699fa0 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/interactionactivity.xsd @@ -27,9 +27,9 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> - <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.interaction.jaxb" + <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.interaction.jaxb" /> </jxb:schemaBindings> --> </xsd:appinfo> </xsd:annotation> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd index 7eb4e42..c22f5d5 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/restactivity.xsd @@ -26,11 +26,11 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> <!-- <jxb:schemaBindings> - <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.rest.jaxb" /> + <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.rest.jaxb" /> </jxb:schemaBindings> --> </xsd:appinfo> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd index ffd10c5..01d3940 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2activities.xsd @@ -27,10 +27,10 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> <jxb:schemaBindings> - <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.jaxb" /> + <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.jaxb" /> </jxb:schemaBindings> </xsd:appinfo> </xsd:annotation> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd index f56f228..216d332 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2annotations.xsd @@ -25,9 +25,9 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> - <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.annotations.jaxb" + <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.annotations.jaxb" /> </jxb:schemaBindings> --> </xsd:appinfo> </xsd:annotation> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd index 3f2a875..dcd0ca4 100644 --- a/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd +++ b/taverna-scufl2-t2flow/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/xpathactivity.xsd @@ -26,9 +26,9 @@ under the License. <xsd:annotation> <xsd:appinfo> - <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html --> + <!-- --> - <!-- <jxb:schemaBindings> <jxb:package name="uk.org.taverna.scufl2.xml.t2flow.rest.jaxb" + <!-- <jxb:schemaBindings> <jxb:package name="org.apache.taverna.scufl2.xml.t2flow.rest.jaxb" /> </jxb:schemaBindings> --> </xsd:appinfo> </xsd:annotation> @@ -65,4 +65,4 @@ under the License. </xsd:sequence> </xsd:complexType> -</xsd:schema> \ No newline at end of file +</xsd:schema> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow ---------------------------------------------------------------------- diff --git a/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow b/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow index f2d5e9c..91d7d66 100644 --- a/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow +++ b/taverna-scufl2-t2flow/src/test/resources/semantic_annotations__eclipse.t2flow @@ -18,7 +18,7 @@ * under the License. --> <workflow xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/uk/org/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd " + xsi:schemaLocation="http://taverna.sf.net/2008/xml/t2flow ../../main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/t2flow-extended.xsd " xmlns="http://taverna.sf.net/2008/xml/t2flow"; version="1" producedBy="taverna-2.4.0SNAPSHOT"> <dataflow id="2d726ace-4635-4bd1-89d5-703a50c96c1a" role="top"> @@ -538,4 +538,4 @@ out = in;</script> </annotation_chain> </annotations> </dataflow> -</workflow> \ No newline at end of file +</workflow> http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/5d755a68/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml ---------------------------------------------------------------------- diff --git a/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml b/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml index 4b2415c..ed5a360 100644 --- a/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml +++ b/taverna-scufl2-wfbundle/src/test/resources/org/apache/taverna/scufl2/rdfxml/roevo-test.xml @@ -27,7 +27,7 @@ xmlns:dcterms="http://purl.org/dc/terms/"; xmlns:owl="http://www.w3.org/2002/07/owl#"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:type="RoEvoDocument" xml:base="http://example.com/test/base"; - xsi:schemaLocation="http://purl.org/wf4ever/roevo# ../../../../../../../main/resources/uk/org/taverna/scufl2/rdfxml/xsd/roevo.xsd"> + xsi:schemaLocation="http://purl.org/wf4ever/roevo# ../../../../../../../main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd"> <VersionableResource rdf:about="v3"> <wasChangedBy> <ChangeSpecification>
