Repository: incubator-taverna-language Updated Branches: refs/heads/master e72c836e0 -> b1a77b353
Correct path relativization for files in COMBINE 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/b1a77b35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/b1a77b35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/b1a77b35 Branch: refs/heads/master Commit: b1a77b3533806e6e2db4a6077e18f123ad823311 Parents: e72c836 Author: Stian Soiland-Reyes <[email protected]> Authored: Tue May 26 14:42:51 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Tue May 26 14:42:51 2015 +0100 ---------------------------------------------------------------------- .../apache/taverna/robundle/manifest/combine/CombineManifest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b1a77b35/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 e75df7b..ddad7af 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 @@ -120,6 +120,7 @@ public class CombineManifest { protected static synchronized Marshaller createMarshaller() throws JAXBException { Marshaller marshaller = getJaxbContext().createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); setPrefixMapper(marshaller); return marshaller; } @@ -429,7 +430,7 @@ public class CombineManifest { if (file == null) { content.setLocation(metadata.getUri().toString()); } else { - Path relPath = metadata.getFile().relativize(bundle.getRoot()); + Path relPath = bundle.getRoot().relativize(file); content.setLocation("./" + relPath); } if (metadata.getMediatype() != null
