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 2016/02/23 03:00:48 UTC
[6/8] incubator-taverna-language git commit: TAVERNA-920 Use
marshaller from robundle
TAVERNA-920 Use marshaller from robundle
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/b64e8a3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/b64e8a3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/b64e8a3b
Branch: refs/heads/master
Commit: b64e8a3b9851e9a820931d51f120c632bbcfbd14
Parents: ef632b5
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Feb 23 01:47:23 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Feb 23 01:47:23 2016 +0000
----------------------------------------------------------------------
.../taverna/scufl2/ucfpackage/UCFPackage.java | 31 +++-----------------
1 file changed, 4 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b64e8a3b/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 0d3af71..991f8be 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
@@ -51,10 +51,10 @@ import javax.xml.bind.Unmarshaller;
import org.apache.taverna.robundle.manifest.odf.ODFJaxb;
import org.apache.taverna.scufl2.ucfpackage.impl.odfdom.pkg.OdfPackage;
import org.apache.taverna.scufl2.ucfpackage.impl.odfdom.pkg.manifest.OdfFileEntry;
-import org.oasis_open.names.tc.opendocument.xmlns.container.Container;
-import org.oasis_open.names.tc.opendocument.xmlns.container.Container.RootFiles;
-import org.oasis_open.names.tc.opendocument.xmlns.container.ObjectFactory;
-import org.oasis_open.names.tc.opendocument.xmlns.container.RootFile;
+import org.apache.taverna.robundle.xml.odf.container.Container;
+import org.apache.taverna.robundle.xml.odf.container.Container.RootFiles;
+import org.apache.taverna.robundle.xml.odf.container.ObjectFactory;
+import org.apache.taverna.robundle.xml.odf.container.RootFile;
import org.w3c.dom.Document;
@@ -249,29 +249,6 @@ public class UCFPackage extends ODFJaxb implements Cloneable {
}
}
- protected static synchronized Marshaller createMarshaller()
- throws JAXBException {
- Marshaller marshaller = getJaxbContext().createMarshaller();
- setPrefixMapper(marshaller);
- return marshaller;
- }
-
- protected static synchronized Unmarshaller createUnMarshaller()
- throws JAXBException {
- return getJaxbContext().createUnmarshaller();
- }
-
- protected static synchronized JAXBContext getJaxbContext()
- throws JAXBException {
- if (jaxbContext == null)
- jaxbContext = JAXBContext
- .newInstance(
- org.oasis_open.names.tc.opendocument.xmlns.container.ObjectFactory.class,
- org.w3._2000._09.xmldsig_.ObjectFactory.class,
- org.w3._2001._04.xmlenc_.ObjectFactory.class);
- return jaxbContext;
- }
-
public void addResource(String stringValue, String path, String mediaType)
throws IOException {
try {