You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/06/28 21:25:18 UTC
svn commit: r1688043 - in /webservices/axiom/trunk: ./ aspects/
aspects/fom-aspects/ aspects/fom-aspects/src/ aspects/fom-aspects/src/main/
aspects/fom-aspects/src/main/java/ aspects/fom-aspects/src/main/java/org/
aspects/fom-aspects/src/main/java/org/...
Author: veithen
Date: Sun Jun 28 19:25:17 2015
New Revision: 1688043
URL: http://svn.apache.org/r1688043
Log:
Eliminate some duplicate FOM code.
Added:
webservices/axiom/trunk/aspects/fom-aspects/ (with props)
webservices/axiom/trunk/aspects/fom-aspects/pom.xml (with props)
webservices/axiom/trunk/aspects/fom-aspects/src/
webservices/axiom/trunk/aspects/fom-aspects/src/main/
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaFactory.java (with props)
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java (with props)
webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj (with props)
Modified:
webservices/axiom/trunk/aspects/pom.xml
webservices/axiom/trunk/implementations/fom-impl/pom.xml
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
webservices/axiom/trunk/pom.xml
Propchange: webservices/axiom/trunk/aspects/fom-aspects/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 28 19:25:17 2015
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: webservices/axiom/trunk/aspects/fom-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/pom.xml?rev=1688043&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/pom.xml (added)
+++ webservices/axiom/trunk/aspects/fom-aspects/pom.xml Sun Jun 28 19:25:17 2015
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>aspects</artifactId>
+ <version>1.2.16-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>fom-aspects</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>FOM Aspects</name>
+ <url>http://ws.apache.org/axiom/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: webservices/axiom/trunk/aspects/fom-aspects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaFactory.java?rev=1688043&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaFactory.java (added)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaFactory.java Sun Jun 28 19:25:17 2015
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.fom;
+
+import org.apache.abdera.factory.Factory;
+import org.apache.abdera.model.Element;
+
+public interface AbderaFactory extends Factory {
+ <T extends Element> T getElementWrapper(Element internal);
+}
Propchange: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java?rev=1688043&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java (added)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java Sun Jun 28 19:25:17 2015
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.fom;
+
+import org.apache.abdera.factory.Factory;
+
+public interface AbderaNode {
+ Factory getFactory();
+}
Propchange: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj?rev=1688043&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj (added)
+++ webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj Sun Jun 28 19:25:17 2015
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.fom;
+
+import org.apache.abdera.model.Element;
+
+public aspect AbderaNodeSupport {
+ public final Element AbderaNode.getWrapped(Element internal) {
+ if (internal == null) {
+ return null;
+ } else {
+ AbderaFactory factory = (AbderaFactory)getFactory();
+ return factory.getElementWrapper(internal);
+ }
+ }
+}
Propchange: webservices/axiom/trunk/aspects/fom-aspects/src/main/java/org/apache/axiom/fom/AbderaNodeSupport.aj
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/pom.xml?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/pom.xml Sun Jun 28 19:25:17 2015
@@ -35,6 +35,7 @@
<modules>
<module>core-aspects</module>
<module>dom-aspects</module>
+ <module>fom-aspects</module>
<module>om-aspects</module>
</modules>
Modified: webservices/axiom/trunk/implementations/fom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/pom.xml?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/pom.xml (original)
+++ webservices/axiom/trunk/implementations/fom-impl/pom.xml Sun Jun 28 19:25:17 2015
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
- <version>1.1.3</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -45,10 +44,17 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <!-- TODO: this should go away -->
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fom-aspects</artifactId>
+ <version>${project.version}</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <!-- Already included in axiom-impl -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-aspects</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -56,4 +62,32 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>aspectj-maven-plugin</artifactId>
+ <configuration>
+ <aspectLibraries>
+ <aspectLibrary>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>fom-aspects</artifactId>
+ </aspectLibrary>
+ </aspectLibraries>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCDATASection.java Sun Jun 28 19:25:17 2015
@@ -26,11 +26,12 @@ import org.apache.abdera.factory.Factory
import org.apache.abdera.model.Base;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.TextValue;
+import org.apache.axiom.fom.AbderaNode;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.CDATASectionImpl;
@SuppressWarnings("unchecked")
-public class FOMCDATASection extends CDATASectionImpl implements TextValue {
+public class FOMCDATASection extends CDATASectionImpl implements TextValue, AbderaNode {
public FOMCDATASection(OMFactory factory) {
super(factory);
@@ -53,13 +54,6 @@ public class FOMCDATASection extends CDA
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- protected Element getWrapped(Element internal) {
- if (internal == null)
- return null;
- FOMFactory factory = (FOMFactory)getFactory();
- return factory.getElementWrapper(internal);
- }
-
public Factory getFactory() {
return (Factory)this.getOMFactory();
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCharacterData.java Sun Jun 28 19:25:17 2015
@@ -26,11 +26,12 @@ import org.apache.abdera.factory.Factory
import org.apache.abdera.model.Base;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.TextValue;
+import org.apache.axiom.fom.AbderaNode;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.CharacterDataImpl;
@SuppressWarnings("unchecked")
-public class FOMCharacterData extends CharacterDataImpl implements TextValue {
+public class FOMCharacterData extends CharacterDataImpl implements TextValue, AbderaNode {
public FOMCharacterData(OMFactory factory) {
super(factory);
@@ -53,13 +54,6 @@ public class FOMCharacterData extends Ch
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- protected Element getWrapped(Element internal) {
- if (internal == null)
- return null;
- FOMFactory factory = (FOMFactory)getFactory();
- return factory.getElementWrapper(internal);
- }
-
public Factory getFactory() {
return (Factory)this.getOMFactory();
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMComment.java Sun Jun 28 19:25:17 2015
@@ -21,12 +21,13 @@ import org.apache.abdera.factory.Factory
import org.apache.abdera.model.Base;
import org.apache.abdera.model.Comment;
import org.apache.abdera.model.Element;
+import org.apache.axiom.fom.AbderaNode;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.OMCommentImpl;
@SuppressWarnings("unchecked")
-public class FOMComment extends OMCommentImpl implements Comment {
+public class FOMComment extends OMCommentImpl implements Comment, AbderaNode {
public FOMComment(OMContainer parent, String contentText,
OMFactory factory, boolean fromBuilder) {
@@ -47,13 +48,6 @@ public class FOMComment extends OMCommen
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- protected Element getWrapped(Element internal) {
- if (internal == null)
- return null;
- FOMFactory factory = (FOMFactory)getFactory();
- return factory.getElementWrapper(internal);
- }
-
public Factory getFactory() {
return (Factory)this.getOMFactory();
}
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=1688043&r1=1688042&r2=1688043&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 Sun Jun 28 19:25:17 2015
@@ -57,6 +57,7 @@ import org.apache.abdera.util.Constants;
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.writer.Writer;
import org.apache.abdera.writer.WriterOptions;
+import org.apache.axiom.fom.AbderaNode;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMContainer;
@@ -72,7 +73,7 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.impl.llom.OMElementImpl;
@SuppressWarnings("unchecked")
-public class FOMElement extends OMElementImpl implements Element, OMElement, Constants {
+public class FOMElement extends OMElementImpl implements Element, AbderaNode, OMElement, Constants {
private static final long serialVersionUID = 8024257594220911953L;
@@ -99,13 +100,6 @@ public class FOMElement extends OMElemen
return factory.createOMNamespace(qname.getNamespaceURI(), qname.getPrefix());
}
- protected Element getWrapped(Element internal) {
- if (internal == null)
- return null;
- FOMFactory factory = (FOMFactory)getFactory();
- return factory.getElementWrapper(internal);
- }
-
public <T extends Base> T getParentElement() {
T parent = (T)super.getParent();
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Sun Jun 28 19:25:17 2015
@@ -56,6 +56,7 @@ import org.apache.abdera.util.MimeTypeHe
import org.apache.abdera.util.Version;
import org.apache.axiom.core.CoreCDATASection;
import org.apache.axiom.core.CoreCharacterData;
+import org.apache.axiom.fom.AbderaFactory;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMContainer;
@@ -68,7 +69,7 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
@SuppressWarnings( {"unchecked", "deprecation"})
-public class FOMFactory extends OMLinkedListImplFactory implements Factory, Constants, ExtensionFactory {
+public class FOMFactory extends OMLinkedListImplFactory implements AbderaFactory, Constants, ExtensionFactory {
private final ExtensionFactoryMap factoriesMap;
private final Abdera abdera;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java Sun Jun 28 19:25:17 2015
@@ -21,12 +21,13 @@ import org.apache.abdera.factory.Factory
import org.apache.abdera.model.Base;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.ProcessingInstruction;
+import org.apache.axiom.fom.AbderaNode;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.impl.llom.OMProcessingInstructionImpl;
@SuppressWarnings("unchecked")
-public class FOMProcessingInstruction extends OMProcessingInstructionImpl implements ProcessingInstruction {
+public class FOMProcessingInstruction extends OMProcessingInstructionImpl implements ProcessingInstruction, AbderaNode {
public FOMProcessingInstruction(OMContainer parent, String target, String value,
OMFactory factory, boolean fromBuilder) {
@@ -38,13 +39,6 @@ public class FOMProcessingInstruction ex
return (T)((parent instanceof Element) ? getWrapped((Element)parent) : parent);
}
- protected Element getWrapped(Element internal) {
- if (internal == null)
- return null;
- FOMFactory factory = (FOMFactory)getFactory();
- return factory.getElementWrapper(internal);
- }
-
public Factory getFactory() {
return (Factory)this.getOMFactory();
}
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1688043&r1=1688042&r2=1688043&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Jun 28 19:25:17 2015
@@ -462,6 +462,11 @@
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ <version>1.1.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>