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 14:44:07 UTC
svn commit: r1687999 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/
implementations/ implementations/fom-impl/
implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/
Author: veithen
Date: Sun Jun 28 12:44:06 2015
New Revision: 1687999
URL: http://svn.apache.org/r1687999
Log:
Add an implementation of Abdera's Feed Object Model (FOM), forked from the original abdera-parser module. The Abdera project is now inactive and will likely be moved to the Attic. By providing a drop in replacement for abdera-parser, we enable users to continue using Abdera 1.1.3 together with the current Axiom version.
Added:
webservices/axiom/trunk/implementations/fom-impl/ (props changed)
- copied from r1687996, abdera/java/trunk/parser/
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
webservices/axiom/trunk/implementations/fom-impl/pom.xml
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
webservices/axiom/trunk/implementations/pom.xml
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj?rev=1687999&r1=1687998&r2=1687999&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomElementSupport.aj Sun Jun 28 12:44:06 2015
@@ -371,7 +371,8 @@ public aspect AxiomElementSupport {
return (AxiomAttribute)coreGetAttribute(Policies.ATTRIBUTE_MATCHER, qname.getNamespaceURI(), qname.getLocalPart());
}
- public final String AxiomElement.getAttributeValue(QName qname) {
+ // TODO: overridden in fom-impl
+ public String AxiomElement.getAttributeValue(QName qname) {
OMAttribute attr = getAttribute(qname);
return attr == null ? null : attr.getAttributeValue();
}
Propchange: webservices/axiom/trunk/implementations/fom-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 28 12:44:06 2015
@@ -0,0 +1,7 @@
+*.iml
+bin
+.classpath
+.project
+.settings
+target
+cobertura.ser
Propchange: webservices/axiom/trunk/implementations/fom-impl/
------------------------------------------------------------------------------
svn:mergeinfo = /abdera/java/branches/axiom-upgrade/parser:1371877-1374810
Modified: webservices/axiom/trunk/implementations/fom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/pom.xml?rev=1687999&r1=1687996&r2=1687999&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/pom.xml (original)
+++ webservices/axiom/trunk/implementations/fom-impl/pom.xml Sun Jun 28 12:44:06 2015
@@ -1,75 +1,59 @@
-<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/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>abdera-parser</artifactId>
- <packaging>bundle</packaging>
- <name>Abdera Parser</name>
- <version>1.2-SNAPSHOT</version>
- <description>Atom Specification Implementation Parser</description>
-
- <properties>
- <topDir>${basedir}/..</topDir>
- <abdera.osgi.default.exports>
- org.apache.abdera.parser.stax.*
- </abdera.osgi.default.exports>
- <abdera.osgi.default.imports>
- !org.dom4j.*,
- !org.jdom.*,
- !nu.xom.*,
- !junit.framework.*,
- !com.sun.msv.*,
- !org.relaxng.datatype.*,
- !org.apache.axiom*,
- *
- </abdera.osgi.default.imports>
- <abdera.osgi.embed.dependencies>
- axiom-api,
- axiom-impl,
- geronimo-stax-api_1.0_spec,
- jaxen,
- wstx-asl
- </abdera.osgi.embed.dependencies>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-core</artifactId>
- <version>1.2-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
+<?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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>implementations</artifactId>
+ <version>1.2.16-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>fom-impl</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Abdera Model (FOM) Implementation</name>
+ <description>Implementation of Abdera's Feed Object Model. Can be used as a drop in replacement for the abdera-parser artifact.</description>
+ <url>http://ws.apache.org/axiom/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <!-- TODO: this should go away -->
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?rev=1687999&r1=1687996&r2=1687999&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java Sun Jun 28 12:44:06 2015
@@ -241,9 +241,10 @@ public class FOMContent extends FOMExten
return (T)this;
}
- public <T extends Element> T setText(String value) {
- return (T)setText(Content.Type.TEXT, value);
- }
+ // TODO: the AspectJ compiler doesn't like this
+// public <T extends Element> T setText(String value) {
+// return (T)setText(Content.Type.TEXT, value);
+// }
public Content setValue(String value) {
complete();
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java?rev=1687999&r1=1687996&r2=1687999&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java Sun Jun 28 12:44:06 2015
@@ -107,9 +107,10 @@ public class FOMText extends FOMElement
return val;
}
- public <T extends Element> T setText(String value) {
- return (T)setText(Text.Type.TEXT, value);
- }
+ // TODO: the AspectJ compiler doesn't like this
+// public <T extends Element> T setText(String value) {
+// return (T)setText(Text.Type.TEXT, value);
+// }
public <T extends Element> T setText(Text.Type type, String value) {
complete();
Modified: webservices/axiom/trunk/implementations/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1687999&r1=1687998&r2=1687999&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (original)
+++ webservices/axiom/trunk/implementations/pom.xml Sun Jun 28 12:44:06 2015
@@ -35,6 +35,7 @@
<modules>
<module>axiom-impl</module>
<module>axiom-dom</module>
+ <module>fom-impl</module>
</modules>
<build>