TAVERNA-925: New schema makes JAXBElement<Manifest>
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 @@
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
);
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.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 @@
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);
