TAVERNA-920 org.apache.taverna.robundle.xml.* package name
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/7b067a72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/7b067a72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/7b067a72 Branch: refs/heads/master Commit: 7b067a72cb4a284905c33b73da4400b73867f9c7 Parents: f9212c5 Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Feb 23 01:05:07 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Tue Feb 23 01:05:07 2016 +0000 ---------------------------------------------------------------------- .../manifest/combine/CombineManifest.java | 7 +-- .../taverna/robundle/manifest/odf/ODFJaxb.java | 11 ++--- .../robundle/manifest/odf/ODFManifest.java | 4 +- taverna-robundle/src/main/xsd/binding.xjb | 50 ++++++++++++++++++++ 4 files changed, 61 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7b067a72/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java index 27012d2..0e063b9 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/combine/CombineManifest.java @@ -59,9 +59,10 @@ import org.apache.taverna.robundle.Bundle; import org.apache.taverna.robundle.manifest.Agent; import org.apache.taverna.robundle.manifest.PathAnnotation; import org.apache.taverna.robundle.manifest.PathMetadata; -import org.identifiers.combine_specifications.omex_manifest.Content; -import org.identifiers.combine_specifications.omex_manifest.ObjectFactory; -import org.identifiers.combine_specifications.omex_manifest.OmexManifest; + +import org.apache.taverna.robundle.xml.combine.Content; +import org.apache.taverna.robundle.xml.combine.ObjectFactory; +import org.apache.taverna.robundle.xml.combine.OmexManifest;; import org.xml.sax.InputSource; import org.apache.jena.query.QueryExecution; http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7b067a72/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java index d03e2a9..63874c2 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java @@ -30,7 +30,7 @@ import javax.xml.bind.Unmarshaller; import com.sun.xml.bind.marshaller.NamespacePrefixMapper; -import oasis.names.tc.opendocument.xmlns.manifest._1.ObjectFactory; +import org.apache.taverna.robundle.xml.odf.manifest.ObjectFactory; /** * JAXB bindings for ODF manifest.xml / container.xml @@ -79,11 +79,10 @@ public class ODFJaxb { protected static synchronized JAXBContext getJaxbContext() throws JAXBException { if (jaxbContext == null) { - jaxbContext = JAXBContext.newInstance(ObjectFactory.class - // , - // org.oasis_open.names.tc.opendocument.xmlns.container.ObjectFactory.class, - // org.w3._2000._09.xmldsig_.ObjectFactory.class, - // org.w3._2001._04.xmlenc_.ObjectFactory.class + jaxbContext = JAXBContext.newInstance(ObjectFactory.class, + org.apache.taverna.robundle.xml.odf.container.ObjectFactory.class, + org.apache.taverna.robundle.xml.dsig.ObjectFactory.class, + org.apache.taverna.robundle.xml.xenc.ObjectFactory.class ); } return jaxbContext; http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7b067a72/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java index c13ddec..2962681 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/odf/ODFManifest.java @@ -42,8 +42,8 @@ import javax.xml.bind.JAXBException; import org.apache.taverna.robundle.Bundle; import org.apache.taverna.robundle.manifest.PathMetadata; -import oasis.names.tc.opendocument.xmlns.manifest._1.FileEntry; -import oasis.names.tc.opendocument.xmlns.manifest._1.Manifest; +import org.apache.taverna.robundle.xml.odf.manifest.FileEntry; +import org.apache.taverna.robundle.xml.odf.manifest.Manifest; public class ODFManifest extends ODFJaxb { http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/7b067a72/taverna-robundle/src/main/xsd/binding.xjb ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/xsd/binding.xjb b/taverna-robundle/src/main/xsd/binding.xjb new file mode 100644 index 0000000..398d496 --- /dev/null +++ b/taverna-robundle/src/main/xsd/binding.xjb @@ -0,0 +1,50 @@ +<?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::xenc" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";> + <jaxb:schemaBindings> + <jaxb:package name="org.apache.taverna.robundle.xml.xenc" /> + </jaxb:schemaBindings> + </jaxb:bindings> + <jaxb:bindings scd="x-schema::dsig" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#";> + <jaxb:schemaBindings> + <jaxb:package name="org.apache.taverna.robundle.xml.dsig" /> + </jaxb:schemaBindings> + </jaxb:bindings> + <jaxb:bindings scd="x-schema::manifest" + xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"> + <jaxb:schemaBindings> + <jaxb:package name="org.apache.taverna.robundle.xml.odf.manifest" /> + </jaxb:schemaBindings> + </jaxb:bindings> + <jaxb:bindings scd="x-schema::manifest" + xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:container"> + <jaxb:schemaBindings> + <jaxb:package name="org.apache.taverna.robundle.xml.odf.container" /> + </jaxb:schemaBindings> + </jaxb:bindings> + <jaxb:bindings scd="x-schema::manifest" + xmlns:manifest="http://identifiers.org/combine.specifications/omex-manifest";> + <jaxb:schemaBindings> + <jaxb:package name="org.apache.taverna.robundle.xml.combine" /> + </jaxb:schemaBindings> + </jaxb:bindings> + +</jaxb:bindings> \ No newline at end of file
