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 2015/07/02 16:49:13 UTC
[18/25] incubator-taverna-language git commit: Updated dependencies
Updated dependencies
Some generated jaxb package names changed
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/da9dc927
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/da9dc927
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/da9dc927
Branch: refs/heads/ucfpackage-robundle
Commit: da9dc927782039503b59fd66815225d0880a45c0
Parents: bc6428e
Author: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Authored: Thu Jun 12 10:57:32 2014 +0100
Committer: Stian Soiland-Reyes <so...@cs.manchester.ac.uk>
Committed: Thu Jul 2 15:14:13 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/da9dc927/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java b/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java
index f578ff0..9fed2d9 100644
--- a/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java
+++ b/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java
@@ -102,6 +102,7 @@ public class UCFPackage implements Cloneable {
} catch (Exception e) {
throw new IOException("Could not create empty UCF Package", e);
}
+ Bundles.setMimeType(bundle, MIME_EPUB);
// odfPackage.setMediaType(MIME_EPUB);
}
@@ -149,7 +150,7 @@ public class UCFPackage implements Cloneable {
createdContainerXml = true;
return;
}
- try {
+ try {
InputStream containerStream = getResourceAsInputStream(CONTAINER_XML);
Unmarshaller unMarshaller = createUnMarshaller();
containerXml = (JAXBElement<Container>) unMarshaller