ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1700905 - in /webservices/axiom/trunk/implementations/fom-impl: pom.xml src/main/java/org/apache/abdera/parser/stax/FOMDocument.java src/main/java/org/apache/abdera/parser/stax/FOMElement.java
Date Wed, 02 Sep 2015 21:04:50 GMT
Author: veithen
Date: Wed Sep  2 21:04:49 2015
New Revision: 1700905

URL: http://svn.apache.org/r1700905
Log:
AXIOM-472: Decouple fom-impl from axiom-impl.

Modified:
    webservices/axiom/trunk/implementations/fom-impl/pom.xml
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
    webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java

Modified: webservices/axiom/trunk/implementations/fom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/pom.xml?rev=1700905&r1=1700904&r2=1700905&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/pom.xml (original)
+++ webservices/axiom/trunk/implementations/fom-impl/pom.xml Wed Sep  2 21:04:49 2015
@@ -40,15 +40,25 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>axiom-impl</artifactId>
+            <artifactId>axiom-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>${stax.impl.groupid}</groupId>
+            <artifactId>${stax.impl.artifact}</artifactId>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>om-aspects</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>shared-aspects</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>fom-aspects</artifactId>

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?rev=1700905&r1=1700904&r2=1700905&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
Wed Sep  2 21:04:49 2015
@@ -29,7 +29,6 @@ import java.util.List;
 import javax.activation.MimeType;
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.abdera.factory.Factory;
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.i18n.rfc4646.Lang;
 import org.apache.abdera.model.Base;
@@ -49,11 +48,10 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMProcessingInstruction;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.llom.OMDocumentImpl;
+import org.apache.axiom.om.impl.common.AxiomDocument;
 
 @SuppressWarnings("unchecked")
-public class FOMDocument<T extends Element> extends OMDocumentImpl implements AbderaDocument<T>
{
+public class FOMDocument<T extends Element> extends FOMSerializable implements AbderaDocument<T>,
AxiomDocument {
 
     private static final long serialVersionUID = -3255339511063344662L;
     protected IRI base = null;
@@ -209,10 +207,6 @@ public class FOMDocument<T extends Eleme
         return this;
     }
 
-    public Factory getFactory() {
-        return (Factory)this.getOMFactory();
-    }
-
     public String[] getProcessingInstruction(String target) {
         List<String> values = new ArrayList<String>();
         for (Iterator i = getChildren(); i.hasNext();) {
@@ -302,7 +296,7 @@ public class FOMDocument<T extends Eleme
     }
 
     public XMLVersion getXmlVersion() {
-        return XmlUtil.getVersion(super.getXMLVersion());
+        return XmlUtil.getVersion(getXMLVersion());
     }
 
     public WriterOptions getDefaultWriterOptions() {

Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1700905&r1=1700904&r2=1700905&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
(original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
Wed Sep  2 21:04:49 2015
@@ -68,10 +68,10 @@ import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMProcessingInstruction;
 import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.llom.OMElementImpl;
+import org.apache.axiom.om.impl.common.AxiomElement;
 
 @SuppressWarnings("unchecked")
-public class FOMElement extends OMElementImpl implements AbderaElement, Constants {
+public class FOMElement extends FOMChildNode implements AbderaElement, AxiomElement, Constants
{
     protected FOMElement(OMFactory factory) {
         super(factory);
     }
@@ -633,7 +633,7 @@ public class FOMElement extends OMElemen
 
     public <T extends Element> T declareNS(String uri, String prefix) {
         if (!isDeclared(uri, prefix)) {
-            super.declareNamespace(uri, prefix);
+            declareNamespace(uri, prefix);
         }
         return (T)this;
     }
@@ -716,8 +716,8 @@ public class FOMElement extends OMElemen
      * consumed, only that that particular element has been completely parsed.
      */
     public <T extends Base> T complete() {
-        if (!isComplete() && builder != null)
-            super.build();
+        if (!isComplete() && getBuilder() != null)
+            build();
         return (T)this;
     }
 



Mime
View raw message