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 2016/02/23 03:00:47 UTC
[5/8] incubator-taverna-language git commit:
org.apache.taverna.scufl2.xml.* package name for xjc
org.apache.taverna.scufl2.xml.* package name for xjc
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/ef632b5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/ef632b5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/ef632b5a
Branch: refs/heads/master
Commit: ef632b5a613ff7f401ebb51041e668a361a8c58c
Parents: 555d7a3
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 23 01:25:14 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 23 01:32:03 2016 +0000
----------------------------------------------------------------------
.../taverna/scufl2/rdfxml/xsd/binding.xjb | 27 ++++
.../apache/taverna/scufl2/rdfxml/xsd/owl.xsd | 14 ++-
.../apache/taverna/scufl2/rdfxml/xsd/prov.xsd | 3 +-
.../apache/taverna/scufl2/rdfxml/xsd/rdf.xsd | 13 +-
.../apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd | 14 ++-
.../apache/taverna/scufl2/rdfxml/xsd/roevo.xsd | 3 +-
.../apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd | 2 +-
.../taverna/scufl2/rdfxml/AbstractParser.java | 2 +-
.../taverna/scufl2/rdfxml/ProfileParser.java | 44 +++----
.../taverna/scufl2/rdfxml/RDFXMLSerializer.java | 124 +++++++++----------
.../taverna/scufl2/rdfxml/RevisionParser.java | 20 +--
.../scufl2/rdfxml/WorkflowBundleParser.java | 10 +-
.../taverna/scufl2/rdfxml/WorkflowParser.java | 46 +++----
.../taverna/scufl2/rdfxml/DummyParserTest.java | 18 +--
14 files changed, 200 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb
new file mode 100644
index 0000000..5604309
--- /dev/null
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/binding.xjb
@@ -0,0 +1,27 @@
+<?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.
+-->
+<jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd">
+ <jaxb:bindings scd="x-schema::xml" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.apache.taverna.robundle.xml.xml" />
+ </jaxb:schemaBindings>
+ </jaxb:bindings>
+
+</jaxb:bindings>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/owl.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/owl.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/owl.xsd
index 55b7c0c..a819c22 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/owl.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/owl.xsd
@@ -18,7 +18,19 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
elementFormDefault="qualified" targetNamespace="http://www.w3.org/2002/07/owl#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:scufl2="http://ns.taverna.org.uk/2010/scufl2#"
- xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+ xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ jxb:version="1.0">
+
+ <xs:annotation>
+ <xs:appinfo>
+ <jxb:globalBindings />
+ <jxb:schemaBindings>
+ <jxb:package name="org.apache.taverna.scufl2.xml.owl" />
+ </jxb:schemaBindings>
+ </xs:appinfo>
+ </xs:annotation>
+
<!--
<xs:import namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/prov.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/prov.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/prov.xsd
index e472bd8..0073723 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/prov.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/prov.xsd
@@ -24,10 +24,9 @@
<xs:annotation>
<xs:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
<jxb:globalBindings />
<jxb:schemaBindings>
- <jxb:package name="org.w3.prov.jaxb" />
+ <jxb:package name="org.apache.taverna.scufl2.xml.prov" />
</jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdf.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdf.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdf.xsd
index eb3dc4c..b7d0e1a 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdf.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdf.xsd
@@ -17,7 +17,18 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
elementFormDefault="qualified" targetNamespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ jxb:version="1.0">
+
+ <xs:annotation>
+ <xs:appinfo>
+ <jxb:globalBindings />
+ <jxb:schemaBindings>
+ <jxb:package name="org.apache.taverna.scufl2.xml.rdf" />
+ </jxb:schemaBindings>
+ </xs:appinfo>
+ </xs:annotation>
<xs:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="xml.xsd" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd
index f95d3b7..6f12da3 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/rdfs.xsd
@@ -17,7 +17,19 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified"
elementFormDefault="qualified" targetNamespace="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ jxb:version="1.0">
+
+ <xs:annotation>
+ <xs:appinfo>
+ <jxb:globalBindings />
+ <jxb:schemaBindings>
+ <jxb:package name="org.apache.taverna.scufl2.xml.rdfs" />
+ </jxb:schemaBindings>
+ </xs:appinfo>
+ </xs:annotation>
+
<xs:import namespace="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
schemaLocation="rdf.xsd" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
index 8bc4f05..5bb374c 100644
--- a/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
+++ b/taverna-scufl2-schemas/src/main/resources/org/apache/taverna/scufl2/rdfxml/xsd/roevo.xsd
@@ -40,10 +40,9 @@ http://w3id.org/ro/roevo
<xs:annotation>
<xs:appinfo>
- <!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
<jxb:globalBindings />
<jxb:schemaBindings>
- <jxb:package name="org.purl.wf4ever.roevo.jaxb" />
+ <jxb:package name="org.apache.taverna.scufl2.xml.roevo" />
</jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/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 c21072a..92daa62 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
@@ -27,7 +27,7 @@
<!-- See http://docs.rakeshv.org/java/jaxb/users-guide/jaxb-custom.html -->
<jxb:globalBindings />
<jxb:schemaBindings>
- <jxb:package name="org.apache.taverna.scufl2.rdfxml.jaxb" />
+ <jxb:package name="org.apache.taverna.scufl2.xml" />
</jxb:schemaBindings>
</xs:appinfo>
</xs:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
index bc4ce6f..08a52fe 100644
--- a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
+++ b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/AbstractParser.java
@@ -33,7 +33,7 @@ import org.apache.taverna.scufl2.api.common.WorkflowBean;
import org.apache.taverna.scufl2.api.container.WorkflowBundle;
import org.apache.taverna.scufl2.api.io.ReaderException;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ObjectFactory;
+import org.apache.taverna.scufl2.xml.ObjectFactory;
public class AbstractParser {
protected JAXBContext jaxbContext;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/ProfileParser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/ProfileParser.java b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/ProfileParser.java
index 1c22929..1386b45 100644
--- a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/ProfileParser.java
+++ b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/ProfileParser.java
@@ -47,11 +47,11 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Configuration;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding.InputPortBinding;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding.OutputPortBinding;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Profile;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProfileDocument;
+import org.apache.taverna.scufl2.xml.Configuration;
+import org.apache.taverna.scufl2.xml.ProcessorBinding.InputPortBinding;
+import org.apache.taverna.scufl2.xml.ProcessorBinding.OutputPortBinding;
+import org.apache.taverna.scufl2.xml.Profile;
+import org.apache.taverna.scufl2.xml.ProfileDocument;
public class ProfileParser extends AbstractParser {
private static Logger logger = Logger.getLogger(ProfileParser.class
@@ -101,7 +101,7 @@ public class ProfileParser extends AbstractParser {
}
protected void parseActivity(
- org.apache.taverna.scufl2.rdfxml.jaxb.Activity original) {
+ org.apache.taverna.scufl2.xml.Activity original) {
Activity activity = new Activity();
getParserState().push(activity);
@@ -113,10 +113,10 @@ public class ProfileParser extends AbstractParser {
org.apache.taverna.scufl2.api.profiles.Profile.class));
if (original.getType() != null)
activity.setType(resolve(original.getType().getResource()));
- for (org.apache.taverna.scufl2.rdfxml.jaxb.Activity.InputActivityPort inputActivityPort : original
+ for (org.apache.taverna.scufl2.xml.Activity.InputActivityPort inputActivityPort : original
.getInputActivityPort())
parseInputActivityPort(inputActivityPort.getInputActivityPort());
- for (org.apache.taverna.scufl2.rdfxml.jaxb.Activity.OutputActivityPort outputActivityPort : original
+ for (org.apache.taverna.scufl2.xml.Activity.OutputActivityPort outputActivityPort : original
.getOutputActivityPort())
parseOutputActivityPort(outputActivityPort
.getOutputActivityPort());
@@ -195,7 +195,7 @@ public class ProfileParser extends AbstractParser {
}
protected void parseInputActivityPort(
- org.apache.taverna.scufl2.rdfxml.jaxb.InputActivityPort original) {
+ org.apache.taverna.scufl2.xml.InputActivityPort original) {
InputActivityPort port = new InputActivityPort();
mapBean(original.getAbout(), port);
port.setParent(getParserState().getCurrent(Activity.class));
@@ -206,7 +206,7 @@ public class ProfileParser extends AbstractParser {
}
protected void parseInputPortBinding(
- org.apache.taverna.scufl2.rdfxml.jaxb.InputPortBinding original)
+ org.apache.taverna.scufl2.xml.InputPortBinding original)
throws ReaderException {
ProcessorInputPortBinding binding = new ProcessorInputPortBinding();
mapBean(original.getAbout(), binding);
@@ -221,7 +221,7 @@ public class ProfileParser extends AbstractParser {
}
protected void parseOutputActivityPort(
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputActivityPort original) {
+ org.apache.taverna.scufl2.xml.OutputActivityPort original) {
OutputActivityPort port = new OutputActivityPort();
mapBean(original.getAbout(), port);
port.setParent(getParserState().getCurrent(Activity.class));
@@ -234,7 +234,7 @@ public class ProfileParser extends AbstractParser {
}
protected void parseOutputPortBinding(
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputPortBinding original)
+ org.apache.taverna.scufl2.xml.OutputPortBinding original)
throws ReaderException {
ProcessorOutputPortBinding binding = new ProcessorOutputPortBinding();
mapBean(original.getAbout(), binding);
@@ -249,7 +249,7 @@ public class ProfileParser extends AbstractParser {
}
protected void parseProcessorBinding(
- org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding original)
+ org.apache.taverna.scufl2.xml.ProcessorBinding original)
throws ReaderException {
org.apache.taverna.scufl2.api.profiles.ProcessorBinding binding = new org.apache.taverna.scufl2.api.profiles.ProcessorBinding();
binding.setParent(getParserState().getCurrent(
@@ -331,25 +331,25 @@ public class ProfileParser extends AbstractParser {
getParserState().setCurrentBase(base);
- org.apache.taverna.scufl2.rdfxml.jaxb.Profile profileElem = null;
+ org.apache.taverna.scufl2.xml.Profile profileElem = null;
for (Object any : elem.getValue().getAny())
- if (any instanceof org.apache.taverna.scufl2.rdfxml.jaxb.Profile) {
+ if (any instanceof org.apache.taverna.scufl2.xml.Profile) {
if (profileElem != null)
throw new ReaderException("More than one <Profile> found");
- profileElem = (org.apache.taverna.scufl2.rdfxml.jaxb.Profile) any;
+ profileElem = (org.apache.taverna.scufl2.xml.Profile) any;
parseProfile(profileElem, profileUri);
- } else if (any instanceof org.apache.taverna.scufl2.rdfxml.jaxb.Activity) {
+ } else if (any instanceof org.apache.taverna.scufl2.xml.Activity) {
if (profileElem == null)
throw new ReaderException("No <Profile> found");
- parseActivity((org.apache.taverna.scufl2.rdfxml.jaxb.Activity) any);
- } else if (any instanceof org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding) {
+ parseActivity((org.apache.taverna.scufl2.xml.Activity) any);
+ } else if (any instanceof org.apache.taverna.scufl2.xml.ProcessorBinding) {
if (profileElem == null)
throw new ReaderException("No <Profile> found");
- parseProcessorBinding((org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding) any);
- } else if (any instanceof org.apache.taverna.scufl2.rdfxml.jaxb.Configuration) {
+ parseProcessorBinding((org.apache.taverna.scufl2.xml.ProcessorBinding) any);
+ } else if (any instanceof org.apache.taverna.scufl2.xml.Configuration) {
if (profileElem == null)
throw new ReaderException("No <Profile> found");
- parseConfiguration((org.apache.taverna.scufl2.rdfxml.jaxb.Configuration) any);
+ parseConfiguration((org.apache.taverna.scufl2.xml.Configuration) any);
}
parseProfileSecond(profileElem);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RDFXMLSerializer.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RDFXMLSerializer.java b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RDFXMLSerializer.java
index 3ab7501..5c4d213 100644
--- a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RDFXMLSerializer.java
+++ b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RDFXMLSerializer.java
@@ -73,29 +73,29 @@ import org.apache.taverna.scufl2.api.profiles.ProcessorOutputPortBinding;
import org.apache.taverna.scufl2.api.profiles.Profile;
import org.apache.taverna.scufl2.rdfxml.impl.NamespacePrefixMapperJAXB_RI;
import org.apache.taverna.scufl2.ucfpackage.UCFPackage;
-import org.w3._1999._02._22_rdf_syntax_ns_.RDF;
-import org.w3._1999._02._22_rdf_syntax_ns_.Resource;
-import org.w3._1999._02._22_rdf_syntax_ns_.Type;
-import org.w3._2000._01.rdf_schema_.SeeAlso;
+import org.apache.taverna.scufl2.xml.rdf.RDF;
+import org.apache.taverna.scufl2.xml.rdf.Resource;
+import org.apache.taverna.scufl2.xml.rdf.Type;
+import org.apache.taverna.scufl2.xml.rdfs.SeeAlso;
import org.xml.sax.SAXException;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Blocking;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Control;
-import org.apache.taverna.scufl2.rdfxml.jaxb.DataLink.MergePosition;
-import org.apache.taverna.scufl2.rdfxml.jaxb.DataLinkEntry;
-import org.apache.taverna.scufl2.rdfxml.jaxb.GranularPortDepth;
-import org.apache.taverna.scufl2.rdfxml.jaxb.IterationStrategyStack.IterationStrategies;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ObjectFactory;
-import org.apache.taverna.scufl2.rdfxml.jaxb.PortDepth;
-import org.apache.taverna.scufl2.rdfxml.jaxb.PortNode.DesiredDepth;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding.ActivityPosition;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding.InputPortBinding;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding.OutputPortBinding;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProductOf;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProfileDocument;
-import org.apache.taverna.scufl2.rdfxml.jaxb.SeeAlsoType;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundleDocument;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowDocument;
+import org.apache.taverna.scufl2.xml.Blocking;
+import org.apache.taverna.scufl2.xml.Control;
+import org.apache.taverna.scufl2.xml.DataLink.MergePosition;
+import org.apache.taverna.scufl2.xml.DataLinkEntry;
+import org.apache.taverna.scufl2.xml.GranularPortDepth;
+import org.apache.taverna.scufl2.xml.IterationStrategyStack.IterationStrategies;
+import org.apache.taverna.scufl2.xml.ObjectFactory;
+import org.apache.taverna.scufl2.xml.PortDepth;
+import org.apache.taverna.scufl2.xml.PortNode.DesiredDepth;
+import org.apache.taverna.scufl2.xml.ProcessorBinding.ActivityPosition;
+import org.apache.taverna.scufl2.xml.ProcessorBinding.InputPortBinding;
+import org.apache.taverna.scufl2.xml.ProcessorBinding.OutputPortBinding;
+import org.apache.taverna.scufl2.xml.ProductOf;
+import org.apache.taverna.scufl2.xml.ProfileDocument;
+import org.apache.taverna.scufl2.xml.SeeAlsoType;
+import org.apache.taverna.scufl2.xml.WorkflowBundleDocument;
+import org.apache.taverna.scufl2.xml.WorkflowDocument;
public class RDFXMLSerializer {
private static final String DOT_RDF = ".rdf";
@@ -104,11 +104,11 @@ public class RDFXMLSerializer {
private static boolean warnedOnce = false;
public class ProfileSerialisationVisitor implements Visitor {
- private org.apache.taverna.scufl2.rdfxml.jaxb.Activity activity;
+ private org.apache.taverna.scufl2.xml.Activity activity;
private final ProfileDocument doc;
- private org.apache.taverna.scufl2.rdfxml.jaxb.Profile profileElem;
+ private org.apache.taverna.scufl2.xml.Profile profileElem;
private Profile profile;
- private org.apache.taverna.scufl2.rdfxml.jaxb.ProcessorBinding processorBindingElem;
+ private org.apache.taverna.scufl2.xml.ProcessorBinding processorBindingElem;
public ProfileSerialisationVisitor(ProfileDocument doc) {
this.doc = doc;
@@ -123,7 +123,7 @@ public class RDFXMLSerializer {
}
private void configuration(Configuration node) {
- org.apache.taverna.scufl2.rdfxml.jaxb.Configuration configuration = objectFactory
+ org.apache.taverna.scufl2.xml.Configuration configuration = objectFactory
.createConfiguration();
configuration.setConfigure(resource(uri(node.getConfigures())));
configuration.setName(node.getName());
@@ -163,20 +163,20 @@ public class RDFXMLSerializer {
}
private void inputActivityPort(InputActivityPort node) {
- org.apache.taverna.scufl2.rdfxml.jaxb.InputActivityPort inputActivityPort = objectFactory
+ org.apache.taverna.scufl2.xml.InputActivityPort inputActivityPort = objectFactory
.createInputActivityPort();
inputActivityPort.setAbout(uri(node));
inputActivityPort.setName(node.getName());
inputActivityPort.setPortDepth(portDepth(node.getDepth()));
- org.apache.taverna.scufl2.rdfxml.jaxb.Activity.InputActivityPort wrapper = objectFactory
+ org.apache.taverna.scufl2.xml.Activity.InputActivityPort wrapper = objectFactory
.createActivityInputActivityPort();
wrapper.setInputActivityPort(inputActivityPort);
activity.getInputActivityPort().add(wrapper);
}
private void outputActivityPort(OutputActivityPort node) {
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputActivityPort outputActivityPort = objectFactory
+ org.apache.taverna.scufl2.xml.OutputActivityPort outputActivityPort = objectFactory
.createOutputActivityPort();
outputActivityPort.setAbout(uri(node));
outputActivityPort.setName(node.getName());
@@ -184,7 +184,7 @@ public class RDFXMLSerializer {
outputActivityPort.setGranularPortDepth(granularPortDepth(node
.getGranularDepth()));
- org.apache.taverna.scufl2.rdfxml.jaxb.Activity.OutputActivityPort wrapper = objectFactory
+ org.apache.taverna.scufl2.xml.Activity.OutputActivityPort wrapper = objectFactory
.createActivityOutputActivityPort();
wrapper.setOutputActivityPort(outputActivityPort);
activity.getOutputActivityPort().add(wrapper);
@@ -219,7 +219,7 @@ public class RDFXMLSerializer {
}
private void processorInputPortBinding(ProcessorInputPortBinding node) {
- org.apache.taverna.scufl2.rdfxml.jaxb.InputPortBinding inputBinding = objectFactory
+ org.apache.taverna.scufl2.xml.InputPortBinding inputBinding = objectFactory
.createInputPortBinding();
inputBinding.setAbout(uri(node));
inputBinding.setBindInputActivityPort(resource(uri(node
@@ -233,7 +233,7 @@ public class RDFXMLSerializer {
}
private void processorOutputPortBinding(ProcessorOutputPortBinding node) {
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputPortBinding outputBinding = objectFactory
+ org.apache.taverna.scufl2.xml.OutputPortBinding outputBinding = objectFactory
.createOutputPortBinding();
outputBinding.setAbout(uri(node));
outputBinding.setBindOutputActivityPort(resource(uri(node
@@ -293,17 +293,17 @@ public class RDFXMLSerializer {
}
public class WorkflowSerialisationVisitor implements Visitor {
- private final org.apache.taverna.scufl2.rdfxml.jaxb.Workflow workflow;
- private org.apache.taverna.scufl2.rdfxml.jaxb.Processor proc;
+ private final org.apache.taverna.scufl2.xml.Workflow workflow;
+ private org.apache.taverna.scufl2.xml.Processor proc;
private Workflow wf;
@SuppressWarnings("unused")
- private org.apache.taverna.scufl2.rdfxml.jaxb.DispatchStack dispatchStack;
- private org.apache.taverna.scufl2.rdfxml.jaxb.IterationStrategyStack iterationStrategyStack;
+ private org.apache.taverna.scufl2.xml.DispatchStack dispatchStack;
+ private org.apache.taverna.scufl2.xml.IterationStrategyStack iterationStrategyStack;
private IterationStrategies iterationStrategies;
private Stack<List<Object>> productStack;
public WorkflowSerialisationVisitor(
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow workflow) {
+ org.apache.taverna.scufl2.xml.Workflow workflow) {
this.workflow = workflow;
}
@@ -350,9 +350,9 @@ public class RDFXMLSerializer {
if (node instanceof InputWorkflowPort) {
InputWorkflowPort ip = (InputWorkflowPort) node;
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow.InputWorkflowPort inP = objectFactory
+ org.apache.taverna.scufl2.xml.Workflow.InputWorkflowPort inP = objectFactory
.createWorkflowInputWorkflowPort();
- org.apache.taverna.scufl2.rdfxml.jaxb.InputWorkflowPort inPort = objectFactory
+ org.apache.taverna.scufl2.xml.InputWorkflowPort inPort = objectFactory
.createInputWorkflowPort();
inP.setInputWorkflowPort(inPort);
inPort.setName(ip.getName());
@@ -366,9 +366,9 @@ public class RDFXMLSerializer {
}
if (node instanceof OutputWorkflowPort) {
OutputWorkflowPort op = (OutputWorkflowPort) node;
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow.OutputWorkflowPort inP = objectFactory
+ org.apache.taverna.scufl2.xml.Workflow.OutputWorkflowPort inP = objectFactory
.createWorkflowOutputWorkflowPort();
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputWorkflowPort outPort = objectFactory
+ org.apache.taverna.scufl2.xml.OutputWorkflowPort outPort = objectFactory
.createOutputWorkflowPort();
inP.setOutputWorkflowPort(outPort);
outPort.setName(op.getName());
@@ -379,7 +379,7 @@ public class RDFXMLSerializer {
}
if (node instanceof Processor) {
Processor processor = (Processor) node;
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow.Processor wfProc = objectFactory
+ org.apache.taverna.scufl2.xml.Workflow.Processor wfProc = objectFactory
.createWorkflowProcessor();
proc = objectFactory.createProcessor();
wfProc.setProcessor(proc);
@@ -391,18 +391,18 @@ public class RDFXMLSerializer {
}
if (node instanceof InputProcessorPort) {
InputProcessorPort inPort = (InputProcessorPort) node;
- org.apache.taverna.scufl2.rdfxml.jaxb.InputProcessorPort port = objectFactory
+ org.apache.taverna.scufl2.xml.InputProcessorPort port = objectFactory
.createInputProcessorPort();
port.setAbout(uri.toASCIIString());
port.setName(inPort.getName());
port.setPortDepth(makePortDepth(inPort.getDepth()));
- org.apache.taverna.scufl2.rdfxml.jaxb.Processor.InputProcessorPort inputProcessorPort = objectFactory
+ org.apache.taverna.scufl2.xml.Processor.InputProcessorPort inputProcessorPort = objectFactory
.createProcessorInputProcessorPort();
inputProcessorPort.setInputProcessorPort(port);
proc.getInputProcessorPort().add(inputProcessorPort);
}
if (node instanceof OutputProcessorPort) {
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputProcessorPort port;
+ org.apache.taverna.scufl2.xml.OutputProcessorPort port;
OutputProcessorPort outPort = (OutputProcessorPort) node;
port = objectFactory.createOutputProcessorPort();
port.setAbout(uri.toASCIIString());
@@ -411,7 +411,7 @@ public class RDFXMLSerializer {
port.setGranularPortDepth(makeGranularPortDepth(outPort
.getGranularDepth()));
- org.apache.taverna.scufl2.rdfxml.jaxb.Processor.OutputProcessorPort outputProcessorPort = objectFactory
+ org.apache.taverna.scufl2.xml.Processor.OutputProcessorPort outputProcessorPort = objectFactory
.createProcessorOutputProcessorPort();
outputProcessorPort.setOutputProcessorPort(port);
proc.getOutputProcessorPort().add(outputProcessorPort);
@@ -420,7 +420,7 @@ public class RDFXMLSerializer {
iterationStrategyStack = objectFactory
.createIterationStrategyStack();
iterationStrategyStack.setAbout(uri.toASCIIString());
- org.apache.taverna.scufl2.rdfxml.jaxb.Processor.IterationStrategyStack processorIterationStrategyStack = objectFactory
+ org.apache.taverna.scufl2.xml.Processor.IterationStrategyStack processorIterationStrategyStack = objectFactory
.createProcessorIterationStrategyStack();
processorIterationStrategyStack
.setIterationStrategyStack(iterationStrategyStack);
@@ -440,7 +440,7 @@ public class RDFXMLSerializer {
productStack.add(dotProductOrCrossProduct);
}
if (node instanceof CrossProduct) {
- org.apache.taverna.scufl2.rdfxml.jaxb.CrossProduct crossProduct = objectFactory
+ org.apache.taverna.scufl2.xml.CrossProduct crossProduct = objectFactory
.createCrossProduct();
crossProduct.setAbout(uri.toASCIIString());
productStack.peek().add(crossProduct);
@@ -450,7 +450,7 @@ public class RDFXMLSerializer {
productStack.add(crossProduct.getProductOf().getCrossProductOrDotProductOrPortNode());
}
if (node instanceof DotProduct) {
- org.apache.taverna.scufl2.rdfxml.jaxb.DotProduct dotProduct = objectFactory
+ org.apache.taverna.scufl2.xml.DotProduct dotProduct = objectFactory
.createDotProduct();
dotProduct.setAbout(uri.toASCIIString());
productStack.peek().add(dotProduct);
@@ -464,7 +464,7 @@ public class RDFXMLSerializer {
PortNode portNode = (PortNode) node;
InputProcessorPort inPort = portNode.getInputProcessorPort();
URI portUri = uriTools.relativeUriForBean(inPort, wf);
- org.apache.taverna.scufl2.rdfxml.jaxb.PortNode port = objectFactory.createPortNode();
+ org.apache.taverna.scufl2.xml.PortNode port = objectFactory.createPortNode();
port.setAbout(uri.toASCIIString());
if (portNode.getDesiredDepth() != null) {
DesiredDepth value = objectFactory.createPortNodeDesiredDepth();
@@ -477,7 +477,7 @@ public class RDFXMLSerializer {
}
if (node instanceof DataLink) {
DataLink dataLink = (DataLink) node;
- org.apache.taverna.scufl2.rdfxml.jaxb.DataLink link = objectFactory
+ org.apache.taverna.scufl2.xml.DataLink link = objectFactory
.createDataLink();
link.setAbout(uri.toASCIIString());
URI fromUri = uriTools.relativeUriForBean(
@@ -539,8 +539,8 @@ public class RDFXMLSerializer {
throws JAXBException {
if (jaxbContextStatic == null) {
Class<?>[] packages = { ObjectFactory.class,
- org.w3._1999._02._22_rdf_syntax_ns_.ObjectFactory.class,
- org.w3._2000._01.rdf_schema_.ObjectFactory.class };
+ org.apache.taverna.scufl2.xml.rdf.ObjectFactory.class,
+ org.apache.taverna.scufl2.xml.rdfs.ObjectFactory.class };
jaxbContextStatic = JAXBContext.newInstance(packages);
}
return jaxbContextStatic;
@@ -612,8 +612,8 @@ public class RDFXMLSerializer {
private ObjectFactory objectFactory = new ObjectFactory();
- private org.w3._2000._01.rdf_schema_.ObjectFactory rdfsObjectFactory = new org.w3._2000._01.rdf_schema_.ObjectFactory();
- private org.w3._1999._02._22_rdf_syntax_ns_.ObjectFactory rdfObjectFactory = new org.w3._1999._02._22_rdf_syntax_ns_.ObjectFactory();
+ private org.apache.taverna.scufl2.xml.rdfs.ObjectFactory rdfsObjectFactory = new org.apache.taverna.scufl2.xml.rdfs.ObjectFactory();
+ private org.apache.taverna.scufl2.xml.rdf.ObjectFactory rdfObjectFactory = new org.apache.taverna.scufl2.xml.rdf.ObjectFactory();
private URITools uriTools = new URITools();
private boolean usingSchema = false;
@@ -685,17 +685,17 @@ public class RDFXMLSerializer {
return doc;
}
- protected org.apache.taverna.scufl2.rdfxml.jaxb.Workflow makeWorkflow(
+ protected org.apache.taverna.scufl2.xml.Workflow makeWorkflow(
Workflow wf, URI documentPath) {
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow workflow = objectFactory
+ org.apache.taverna.scufl2.xml.Workflow workflow = objectFactory
.createWorkflow();
wf.accept(new WorkflowSerialisationVisitor(workflow) {
});
return workflow;
}
- protected org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle makeWorkflowBundleElem() {
- org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle bundle = objectFactory
+ protected org.apache.taverna.scufl2.xml.WorkflowBundle makeWorkflowBundleElem() {
+ org.apache.taverna.scufl2.xml.WorkflowBundle bundle = objectFactory
.createWorkflowBundle();
// FIXME: Support other URIs
bundle.setAbout("");
@@ -708,7 +708,7 @@ public class RDFXMLSerializer {
}
for (Workflow wf : wfBundle.getWorkflows()) {
- org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle.Workflow wfElem = objectFactory
+ org.apache.taverna.scufl2.xml.WorkflowBundle.Workflow wfElem = objectFactory
.createWorkflowBundleWorkflow();
SeeAlsoType seeAlsoElem = objectFactory.createSeeAlsoType();
seeAlsoElem.setAbout(uriTools.relativeUriForBean(wf, wfBundle)
@@ -733,7 +733,7 @@ public class RDFXMLSerializer {
}
for (Profile pf : wfBundle.getProfiles()) {
- org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle.Profile wfElem = objectFactory
+ org.apache.taverna.scufl2.xml.WorkflowBundle.Profile wfElem = objectFactory
.createWorkflowBundleProfile();
SeeAlsoType seeAlsoElem = objectFactory.createSeeAlsoType();
seeAlsoElem.setAbout(uriTools.relativeUriForBean(pf, wfBundle)
@@ -831,7 +831,7 @@ public class RDFXMLSerializer {
public void workflowBundleDoc(OutputStream outputStream, URI path)
throws JAXBException, WriterException {
- org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle bundle = makeWorkflowBundleElem();
+ org.apache.taverna.scufl2.xml.WorkflowBundle bundle = makeWorkflowBundleElem();
WorkflowBundleDocument doc = objectFactory
.createWorkflowBundleDocument();
doc.getAny().add(bundle);
@@ -845,7 +845,7 @@ public class RDFXMLSerializer {
public void workflowDoc(OutputStream outputStream, Workflow wf, URI path)
throws JAXBException, WriterException {
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow wfElem = makeWorkflow(wf,
+ org.apache.taverna.scufl2.xml.Workflow wfElem = makeWorkflow(wf,
path);
WorkflowDocument doc = objectFactory.createWorkflowDocument();
doc.getAny().add(wfElem);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RevisionParser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RevisionParser.java b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RevisionParser.java
index 366069b..59013e1 100644
--- a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RevisionParser.java
+++ b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/RevisionParser.java
@@ -36,12 +36,12 @@ import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.taverna.scufl2.api.annotation.Revision;
import org.apache.taverna.scufl2.api.io.ReaderException;
-import org.purl.wf4ever.roevo.jaxb.Change;
-import org.purl.wf4ever.roevo.jaxb.ChangeSpecification;
-import org.purl.wf4ever.roevo.jaxb.ChangeSpecification.HasChange;
-import org.purl.wf4ever.roevo.jaxb.RoEvoDocument;
-import org.purl.wf4ever.roevo.jaxb.VersionableResource;
-import org.w3._1999._02._22_rdf_syntax_ns_.Resource;
+import org.apache.taverna.scufl2.xml.roevo.Change;
+import org.apache.taverna.scufl2.xml.roevo.ChangeSpecification;
+import org.apache.taverna.scufl2.xml.roevo.ChangeSpecification.HasChange;
+import org.apache.taverna.scufl2.xml.roevo.RoEvoDocument;
+import org.apache.taverna.scufl2.xml.roevo.VersionableResource;
+import org.apache.taverna.scufl2.xml.rdf.Resource;
public class RevisionParser {
@@ -50,10 +50,10 @@ public class RevisionParser {
protected JAXBContext getJaxbContext() throws JAXBException {
if (jaxbContext == null) {
Class<?>[] packages = {
- org.purl.wf4ever.roevo.jaxb.ObjectFactory.class,
- org.w3.prov.jaxb.ObjectFactory.class,
- org.w3._1999._02._22_rdf_syntax_ns_.ObjectFactory.class,
- org.w3._2000._01.rdf_schema_.ObjectFactory.class };
+ org.apache.taverna.scufl2.xml.roevo.ObjectFactory.class,
+ org.apache.taverna.scufl2.xml.prov.ObjectFactory.class,
+ org.apache.taverna.scufl2.xml.rdf.ObjectFactory.class,
+ org.apache.taverna.scufl2.xml.rdfs.ObjectFactory.class };
jaxbContext = JAXBContext.newInstance(packages);
}
return jaxbContext;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowBundleParser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowBundleParser.java b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowBundleParser.java
index 4e56a1f..12da471 100644
--- a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowBundleParser.java
+++ b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowBundleParser.java
@@ -38,7 +38,7 @@ import org.apache.taverna.scufl2.api.io.ReaderException;
import org.apache.taverna.scufl2.ucfpackage.UCFPackage;
import org.apache.taverna.scufl2.ucfpackage.UCFPackage.ResourceEntry;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundleDocument;
+import org.apache.taverna.scufl2.xml.WorkflowBundleDocument;
public class WorkflowBundleParser extends AbstractParser {
@@ -62,7 +62,7 @@ public class WorkflowBundleParser extends AbstractParser {
}
protected WorkflowBundle parseWorkflowBundle(
- org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle wb, URI base)
+ org.apache.taverna.scufl2.xml.WorkflowBundle wb, URI base)
throws ReaderException, IOException {
WorkflowBundle workflowBundle = new WorkflowBundle();
getParserState().push(workflowBundle);
@@ -75,7 +75,7 @@ public class WorkflowBundleParser extends AbstractParser {
workflowBundle.setGlobalBaseURI(base.resolve(wb
.getGlobalBaseURI().getResource()));
mapBean(base.resolve(wb.getAbout()), workflowBundle);
- for (org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle.Workflow wfEntry : wb
+ for (org.apache.taverna.scufl2.xml.WorkflowBundle.Workflow wfEntry : wb
.getWorkflow()) {
URI wfUri = base.resolve(wfEntry.getWorkflow().getAbout());
String resource = wfEntry.getWorkflow().getSeeAlso()
@@ -84,7 +84,7 @@ public class WorkflowBundleParser extends AbstractParser {
.getLocation(), base.resolve(resource));
workflowParser.readWorkflow(wfUri, source);
}
- for (org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle.Profile pfEntry : wb
+ for (org.apache.taverna.scufl2.xml.WorkflowBundle.Profile pfEntry : wb
.getProfile()) {
URI wfUri = base.resolve(pfEntry.getProfile().getAbout());
String resource = pfEntry.getProfile().getSeeAlso()
@@ -177,7 +177,7 @@ public class WorkflowBundleParser extends AbstractParser {
throw new ReaderException(
"Invalid WorkflowBundleDocument, expected only one <WorkflowBundle>");
- org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle wb = (org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle) workflowBundleDocument
+ org.apache.taverna.scufl2.xml.WorkflowBundle wb = (org.apache.taverna.scufl2.xml.WorkflowBundle) workflowBundleDocument
.getAny().get(0);
WorkflowBundle workflowBundle = parseWorkflowBundle(wb, base);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowParser.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowParser.java b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowParser.java
index 6d84ef7..119b5f5 100644
--- a/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowParser.java
+++ b/taverna-scufl2-wfbundle/src/main/java/org/apache/taverna/scufl2/rdfxml/WorkflowParser.java
@@ -40,17 +40,17 @@ import org.apache.taverna.scufl2.api.iterationstrategy.IterationStrategyParent;
import org.apache.taverna.scufl2.api.port.ReceiverPort;
import org.apache.taverna.scufl2.api.port.SenderPort;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Blocking;
-import org.apache.taverna.scufl2.rdfxml.jaxb.CrossProduct;
-import org.apache.taverna.scufl2.rdfxml.jaxb.DataLink;
-import org.apache.taverna.scufl2.rdfxml.jaxb.DispatchStack;
-import org.apache.taverna.scufl2.rdfxml.jaxb.DotProduct;
-import org.apache.taverna.scufl2.rdfxml.jaxb.IterationStrategyStack;
-import org.apache.taverna.scufl2.rdfxml.jaxb.PortNode;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Processor.InputProcessorPort;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Processor.OutputProcessorPort;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProductOf;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowDocument;
+import org.apache.taverna.scufl2.xml.Blocking;
+import org.apache.taverna.scufl2.xml.CrossProduct;
+import org.apache.taverna.scufl2.xml.DataLink;
+import org.apache.taverna.scufl2.xml.DispatchStack;
+import org.apache.taverna.scufl2.xml.DotProduct;
+import org.apache.taverna.scufl2.xml.IterationStrategyStack;
+import org.apache.taverna.scufl2.xml.PortNode;
+import org.apache.taverna.scufl2.xml.Processor.InputProcessorPort;
+import org.apache.taverna.scufl2.xml.Processor.OutputProcessorPort;
+import org.apache.taverna.scufl2.xml.ProductOf;
+import org.apache.taverna.scufl2.xml.WorkflowDocument;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
@@ -187,7 +187,7 @@ public class WorkflowParser extends AbstractParser {
}
protected void parseInputWorkflowPort(
- org.apache.taverna.scufl2.rdfxml.jaxb.InputWorkflowPort original) {
+ org.apache.taverna.scufl2.xml.InputWorkflowPort original) {
org.apache.taverna.scufl2.api.port.InputWorkflowPort port = new org.apache.taverna.scufl2.api.port.InputWorkflowPort();
port.setName(original.getName());
if (original.getPortDepth() != null)
@@ -217,7 +217,7 @@ public class WorkflowParser extends AbstractParser {
}
protected void parseOutputWorkflowPort(
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputWorkflowPort original) {
+ org.apache.taverna.scufl2.xml.OutputWorkflowPort original) {
org.apache.taverna.scufl2.api.port.OutputWorkflowPort port = new org.apache.taverna.scufl2.api.port.OutputWorkflowPort();
port.setName(original.getName());
port.setParent(getParserState().getCurrent(Workflow.class));
@@ -240,7 +240,7 @@ public class WorkflowParser extends AbstractParser {
}
protected void parseProcessor(
- org.apache.taverna.scufl2.rdfxml.jaxb.Processor processor)
+ org.apache.taverna.scufl2.xml.Processor processor)
throws ReaderException {
org.apache.taverna.scufl2.api.core.Processor p = new org.apache.taverna.scufl2.api.core.Processor();
getParserState().push(p);
@@ -279,7 +279,7 @@ public class WorkflowParser extends AbstractParser {
}
protected void parseWorkflow(
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow workflow, URI wfUri)
+ org.apache.taverna.scufl2.xml.Workflow workflow, URI wfUri)
throws ReaderException {
Workflow wf = new Workflow();
wf.setParent(getParserState().getCurrent(WorkflowBundle.class));
@@ -300,20 +300,20 @@ public class WorkflowParser extends AbstractParser {
wf.setIdentifier(getParserState().getCurrentBase().resolve(
workflow.getWorkflowIdentifier().getResource()));
- for (org.apache.taverna.scufl2.rdfxml.jaxb.Workflow.InputWorkflowPort inputWorkflowPort : workflow
+ for (org.apache.taverna.scufl2.xml.Workflow.InputWorkflowPort inputWorkflowPort : workflow
.getInputWorkflowPort())
parseInputWorkflowPort(inputWorkflowPort.getInputWorkflowPort());
- for (org.apache.taverna.scufl2.rdfxml.jaxb.Workflow.OutputWorkflowPort outputWorkflowPort : workflow
+ for (org.apache.taverna.scufl2.xml.Workflow.OutputWorkflowPort outputWorkflowPort : workflow
.getOutputWorkflowPort())
parseOutputWorkflowPort(outputWorkflowPort
.getOutputWorkflowPort());
- for (org.apache.taverna.scufl2.rdfxml.jaxb.Workflow.Processor processor : workflow
+ for (org.apache.taverna.scufl2.xml.Workflow.Processor processor : workflow
.getProcessor())
parseProcessor(processor.getProcessor());
- for (org.apache.taverna.scufl2.rdfxml.jaxb.DataLinkEntry dataLinkEntry : workflow
+ for (org.apache.taverna.scufl2.xml.DataLinkEntry dataLinkEntry : workflow
.getDatalink())
parseDataLink(dataLinkEntry.getDataLink());
- for (org.apache.taverna.scufl2.rdfxml.jaxb.Control c : workflow
+ for (org.apache.taverna.scufl2.xml.Control c : workflow
.getControl())
parseControlLink(c.getBlocking());
} finally {
@@ -322,7 +322,7 @@ public class WorkflowParser extends AbstractParser {
}
protected void processorInputProcessorPort(
- org.apache.taverna.scufl2.rdfxml.jaxb.InputProcessorPort original) {
+ org.apache.taverna.scufl2.xml.InputProcessorPort original) {
org.apache.taverna.scufl2.api.port.InputProcessorPort port = new org.apache.taverna.scufl2.api.port.InputProcessorPort();
port.setName(original.getName());
if (original.getPortDepth() != null)
@@ -333,7 +333,7 @@ public class WorkflowParser extends AbstractParser {
}
protected void processorOutputProcessorPort(
- org.apache.taverna.scufl2.rdfxml.jaxb.OutputProcessorPort original) {
+ org.apache.taverna.scufl2.xml.OutputProcessorPort original) {
org.apache.taverna.scufl2.api.port.OutputProcessorPort port = new org.apache.taverna.scufl2.api.port.OutputProcessorPort();
port.setName(original.getName());
if (original.getPortDepth() != null)
@@ -372,7 +372,7 @@ public class WorkflowParser extends AbstractParser {
if (elem.getValue().getAny().size() != 1)
throw new ReaderException("Expects only a <Workflow> element in "
+ source);
- org.apache.taverna.scufl2.rdfxml.jaxb.Workflow workflow = (org.apache.taverna.scufl2.rdfxml.jaxb.Workflow) elem
+ org.apache.taverna.scufl2.xml.Workflow workflow = (org.apache.taverna.scufl2.xml.Workflow) elem
.getValue().getAny().get(0);
getParserState().setCurrentBase(base);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/ef632b5a/taverna-scufl2-wfbundle/src/test/java/org/apache/taverna/scufl2/rdfxml/DummyParserTest.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/src/test/java/org/apache/taverna/scufl2/rdfxml/DummyParserTest.java b/taverna-scufl2-wfbundle/src/test/java/org/apache/taverna/scufl2/rdfxml/DummyParserTest.java
index 8f5d548..9d8a4a6 100644
--- a/taverna-scufl2-wfbundle/src/test/java/org/apache/taverna/scufl2/rdfxml/DummyParserTest.java
+++ b/taverna-scufl2-wfbundle/src/test/java/org/apache/taverna/scufl2/rdfxml/DummyParserTest.java
@@ -32,13 +32,13 @@ import javax.xml.bind.Unmarshaller;
import org.junit.Before;
import org.junit.Test;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ObjectFactory;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Profile;
-import org.apache.taverna.scufl2.rdfxml.jaxb.ProfileDocument;
-import org.apache.taverna.scufl2.rdfxml.jaxb.Workflow;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundle;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowBundleDocument;
-import org.apache.taverna.scufl2.rdfxml.jaxb.WorkflowDocument;
+import org.apache.taverna.scufl2.xml.ObjectFactory;
+import org.apache.taverna.scufl2.xml.Profile;
+import org.apache.taverna.scufl2.xml.ProfileDocument;
+import org.apache.taverna.scufl2.xml.Workflow;
+import org.apache.taverna.scufl2.xml.WorkflowBundle;
+import org.apache.taverna.scufl2.xml.WorkflowBundleDocument;
+import org.apache.taverna.scufl2.xml.WorkflowDocument;
public class DummyParserTest {
@@ -91,8 +91,8 @@ public class DummyParserTest {
public void makeUnmarshaller() throws JAXBException {
Class<?>[] packages = { ObjectFactory.class,
- org.w3._1999._02._22_rdf_syntax_ns_.ObjectFactory.class,
- org.w3._2000._01.rdf_schema_.ObjectFactory.class };
+ org.apache.taverna.scufl2.xml.rdf.ObjectFactory.class,
+ org.apache.taverna.scufl2.xml.rdfs.ObjectFactory.class };
jaxbContext = JAXBContext.newInstance(packages);
unmarshaller = jaxbContext.createUnmarshaller();
}