[zanata-common/f20] patch to remove xom
Patrick Huang
pahuang at fedoraproject.org
Thu Jul 17 06:21:27 UTC 2014
commit 26cfacc6a0393fd95fe4b5ca47f5cd8b0a777a31
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Jul 17 02:20:59 2014 -0400
patch to remove xom
remove-xom.patch | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 312 insertions(+), 0 deletions(-)
---
diff --git a/remove-xom.patch b/remove-xom.patch
new file mode 100644
index 0000000..127afd7
--- /dev/null
+++ b/remove-xom.patch
@@ -0,0 +1,312 @@
+diff --git zanata-common-util/pom.xml zanata-common-util/pom.xml
+index 4586f63..ba563ab 100644
+--- zanata-common-util/pom.xml
++++ zanata-common-util/pom.xml
+@@ -83,10 +83,6 @@
+ <artifactId>stax-api</artifactId>
+ </dependency>
+
+- <dependency>
+- <groupId>xom</groupId>
+- <artifactId>xom</artifactId>
+- </dependency>
+ </dependencies>
+
+
+diff --git zanata-common-util/src/main/java/org/zanata/common/util/ElementBuilder.java zanata-common-util/src/main/java/org/zanata/common/util/ElementBuilder.java
+deleted file mode 100644
+index ace5a04..0000000
+--- zanata-common-util/src/main/java/org/zanata/common/util/ElementBuilder.java
++++ /dev/null
+@@ -1,212 +0,0 @@
+-/*
+- * Copyright 2013, Red Hat, Inc. and individual contributors
+- * as indicated by the @author tags. See the copyright.txt file in the
+- * distribution for a full listing of individual contributors.
+- *
+- * This is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU Lesser General Public License as
+- * published by the Free Software Foundation; either version 2.1 of
+- * the License, or (at your option) any later version.
+- *
+- * This software is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this software; if not, write to the Free
+- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+- */
+-
+-package org.zanata.common.util;
+-
+-import static com.google.common.base.Strings.isNullOrEmpty;
+-import static javax.xml.stream.XMLStreamConstants.*;
+-
+-import java.util.Iterator;
+-
+-import javax.xml.namespace.QName;
+-import javax.xml.stream.XMLEventReader;
+-import javax.xml.stream.XMLStreamException;
+-import javax.xml.stream.XMLStreamReader;
+-import javax.xml.stream.events.Attribute;
+-import javax.xml.stream.events.Characters;
+-import javax.xml.stream.events.StartElement;
+-import javax.xml.stream.events.XMLEvent;
+-import javax.xml.transform.Transformer;
+-import javax.xml.transform.TransformerException;
+-import javax.xml.transform.dom.DOMResult;
+-import javax.xml.transform.stax.StAXSource;
+-
+-import nu.xom.Attribute.Type;
+-import nu.xom.Element;
+-import nu.xom.converters.DOMConverter;
+-
+-import org.w3c.dom.Document;
+-
+-/**
+- * ElementBuilder consumes a complete element from a StAX XMLStreamReader or
+- * XMLEventReader and returns it as a xom Element.
+- * <p>
+- * {@link nux.xom.io.StaxParser} implements a similar idea.
+- *
+- * @author Sean Flanigan <a
+- * href="mailto:sflaniga at redhat.com">sflaniga at redhat.com</a>
+- */
+-public class ElementBuilder {
+-
+- /**
+- * Converts the element and subelements at the reader's current position
+- * into a xom Element tree
+- *
+- * @param reader
+- * must be in START_ELEMENT state
+- * @return
+- * @throws XMLStreamException
+- */
+- public static Element buildElement(XMLStreamReader reader)
+- throws XMLStreamException {
+- int eventType = reader.getEventType();
+- assert eventType == START_ELEMENT;
+- String localName = reader.getLocalName();
+- String qualName = getName(reader.getPrefix(), localName);
+- Element xElem = new Element(qualName, reader.getNamespaceURI());
+- copyAttributes(reader, xElem);
+-
+- while (reader.hasNext() && eventType != END_ELEMENT) {
+- eventType = reader.next();
+- switch (eventType) {
+- case START_ELEMENT:
+- Element startElement = buildElement(reader);
+- xElem.appendChild(startElement);
+- break;
+- case END_ELEMENT:
+- break;
+- case CHARACTERS:
+- xElem.appendChild(reader.getText());
+- break;
+- case SPACE:
+- break;
+- default:
+- throw new RuntimeException("unhandled event type: " + eventType);
+- }
+- }
+- return xElem;
+- }
+-
+- /**
+- * Converts the element and subsequent subelements at the reader's current
+- * position into a xom Element tree
+- *
+- * @param startElem
+- * @param reader
+- * must be just past the START_ELEMENT event
+- * @return
+- * @throws XMLStreamException
+- */
+- public static Element buildElement(StartElement startElem,
+- XMLEventReader reader) throws XMLStreamException {
+- QName name = startElem.getName();
+- String qualName = getName(name);
+- Element xElem = new Element(qualName, name.getNamespaceURI());
+- copyAttributes(startElem, xElem);
+-
+- while (reader.hasNext() && !reader.peek().isEndElement()) {
+- XMLEvent event = reader.nextEvent();
+- if (event.isStartElement()) {
+- Element startElement =
+- buildElement(event.asStartElement(), reader);
+- xElem.appendChild(startElement);
+- } else if (event.isCharacters()) {
+- Characters characters = event.asCharacters();
+- if (!characters.isIgnorableWhiteSpace()) {
+- xElem.appendChild(characters.getData());
+- }
+- } else {
+- throw new RuntimeException("unhandled event type: "
+- + event.getEventType());
+- }
+- }
+- if (reader.hasNext())
+- reader.nextEvent();
+- return xElem;
+- }
+-
+- public static void copyAttributes(XMLStreamReader reader, Element toElem) {
+- assert reader.getEventType() == START_ELEMENT;
+- for (int i = 0; i < reader.getAttributeCount(); i++) {
+- String prefix = reader.getAttributePrefix(i);
+- String localName = reader.getAttributeLocalName(i);
+- String name = getName(prefix, localName);
+- String uri = reader.getAttributeNamespace(i);
+- String value = reader.getAttributeValue(i);
+- Type attrType = getAttributeType(reader.getAttributeType(i));
+- nu.xom.Attribute xAttr =
+- new nu.xom.Attribute(name, uri, value, attrType);
+- toElem.addAttribute(xAttr);
+- }
+- }
+-
+- public static void copyAttributes(StartElement fromElem, Element toElem) {
+- Iterator<Attribute> attributes = (Iterator<Attribute>) fromElem.getAttributes();
+- while (attributes.hasNext()) {
+- Attribute attr = attributes.next();
+- QName qName = attr.getName();
+- String name = getName(qName);
+- String uri = qName.getNamespaceURI();
+- String value = attr.getValue();
+- Type attrType = getAttributeType(attr.getDTDType());
+- nu.xom.Attribute xAttr =
+- new nu.xom.Attribute(name, uri, value, attrType);
+- toElem.addAttribute(xAttr);
+- }
+- }
+-
+- private static String getName(String prefix, String localName) {
+- String xPrefix = isNullOrEmpty(prefix) ? "" : prefix + ":";
+- String prefixedName = xPrefix + localName;
+- return prefixedName;
+- }
+-
+- private static String getName(QName name) {
+- String prefix = name.getPrefix();
+- String xPrefix = isNullOrEmpty(prefix) ? "" : prefix + ":";
+- String prefixedName = xPrefix + name.getLocalPart();
+- return prefixedName;
+- }
+-
+- private static Type getAttributeType(String name) {
+- try {
+- if (name.equals("ENUMERATED"))
+- return Type.ENUMERATION;
+- return (Type) Type.class.getField(name).get(null);
+- } catch (NoSuchFieldException e) {
+- throw new RuntimeException("unknown DTD type: " + name);
+- } catch (IllegalAccessException e) {
+- throw new RuntimeException(e);
+- }
+- }
+-
+- /**
+- * Converts the element and subelements at the reader's current position
+- * into a xom Element tree
+- *
+- * @param reader
+- * @param transformer
+- * the provided Transformer must support StAXSource
+- * @return
+- * @throws TransformerException
+- */
+- static nu.xom.Element buildElement(XMLStreamReader reader,
+- Transformer transformer) throws TransformerException {
+- DOMResult result = new DOMResult();
+- transformer.transform(new StAXSource(reader), result);
+- Document docNode = (Document) result.getNode();
+- org.w3c.dom.Element elem =
+- (org.w3c.dom.Element) docNode.getFirstChild();
+- nu.xom.Element element = DOMConverter.convert(elem);
+- return element;
+- }
+-
+-}
+diff --git zanata-common-util/src/test/java/org/zanata/common/util/ElementBuilderTest.java zanata-common-util/src/test/java/org/zanata/common/util/ElementBuilderTest.java
+deleted file mode 100644
+index d9b2b23..0000000
+--- zanata-common-util/src/test/java/org/zanata/common/util/ElementBuilderTest.java
++++ /dev/null
+@@ -1,73 +0,0 @@
+-package org.zanata.common.util;
+-
+-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+-
+-import java.io.IOException;
+-import java.io.InputStream;
+-
+-import javax.xml.stream.XMLEventReader;
+-import javax.xml.stream.XMLInputFactory;
+-import javax.xml.stream.XMLStreamReader;
+-import javax.xml.stream.events.XMLEvent;
+-import javax.xml.transform.Transformer;
+-import javax.xml.transform.TransformerFactory;
+-
+-import org.junit.Before;
+-import org.junit.Ignore;
+-import org.junit.Test;
+-
+-public class ElementBuilderTest {
+-
+- @Before
+- public void before() throws IOException {
+- is = getClass().getResourceAsStream("ElementBuilderTest.xml");
+- }
+-
+- private XMLInputFactory xif = XMLInputFactory.newInstance();
+- private InputStream is;
+-
+- @Test
+- public void buildElementXMLStreamReader() throws Exception {
+- XMLStreamReader reader = xif.createXMLStreamReader(is);
+- while (reader.hasNext()) {
+- int eventType = reader.next();
+- if (eventType == START_ELEMENT
+- && reader.getLocalName().equals("tu")) {
+- ElementBuilder.buildElement(reader).toXML();
+- }
+- }
+- }
+-
+- @Test
+- public void buildElementStartElementXMLEventReader() throws Exception {
+- XMLEventReader reader = xif.createXMLEventReader(is);
+- while (reader.hasNext()) {
+- XMLEvent event = reader.nextEvent();
+- if (event.isStartElement()
+- && event.asStartElement().getName().getLocalPart()
+- .equals("tu")) {
+- ElementBuilder.buildElement(event.asStartElement(), reader)
+- .toXML();
+- }
+- }
+- }
+-
+- @Test
+- @Ignore
+- public void buildElementXMLStreamReaderTransformer() throws Exception {
+- // Nasty way to ensure that we get a Transformer which supports
+- // StAXSource:
+- System.setProperty("javax.xml.transform.TransformerFactory",
+- "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
+- Transformer t = TransformerFactory.newInstance().newTransformer();
+-
+- XMLStreamReader reader = xif.createXMLStreamReader(is);
+- while (reader.hasNext()) {
+- int eventType = reader.next();
+- if (eventType == START_ELEMENT
+- && reader.getLocalName().equals("tu")) {
+- ElementBuilder.buildElement(reader, t).toXML();
+- }
+- }
+- }
+-}
More information about the scm-commits
mailing list