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 2018/05/11 18:03:10 UTC
[4/4] incubator-taverna-language git commit: TAVERNA-925: New schema
makes JAXBElement
TAVERNA-925: New schema makes JAXBElement<Manifest>
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/22519703
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/22519703
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/22519703
Branch: refs/heads/master
Commit: 2251970368b6b5e6cddf625febf839b23c13aa86
Parents: fb05e13
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 16:34:08 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 16:34:08 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/taverna/robundle/manifest/odf/ODFJaxb.java | 2 +-
.../org/apache/taverna/robundle/manifest/odf/ODFManifest.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/22519703/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 63874c2..770da6c 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
@@ -80,7 +80,7 @@ public class ODFJaxb {
protected static synchronized JAXBContext getJaxbContext() throws JAXBException {
if (jaxbContext == null) {
jaxbContext = JAXBContext.newInstance(ObjectFactory.class,
- org.apache.taverna.robundle.xml.odf.container.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
);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/22519703/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 2962681..dcd24d5 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
@@ -37,6 +37,7 @@ import java.net.URISyntaxException;
import java.nio.file.Path;
import java.util.logging.Logger;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import org.apache.taverna.robundle.Bundle;
@@ -201,7 +202,8 @@ public class ODFManifest extends ODFJaxb {
Path manifestXml = manifestXmlPath(bundle);
Manifest odfManifest;
try (InputStream inStream = newInputStream(manifestXml)) {
- odfManifest = (Manifest) createUnMarshaller().unmarshal(inStream);
+ JAXBElement<Manifest> element = (JAXBElement<Manifest>) createUnMarshaller().unmarshal(inStream);
+ odfManifest = element.getValue();
} catch (JAXBException e) {
// logger.warning("Could not parse " + manifestXml);
throw new IOException("Could not parse " + manifestXml, e);