Author: veithen
Date: Sun Aug 19 15:36:42 2012
New Revision: 1374773
URL: http://svn.apache.org/viewvc?rev=1374773&view=rev
Log:
Merged latest changes from trunk.
Modified:
abdera/java/branches/axiom-upgrade/ (props changed)
abdera/java/branches/axiom-upgrade/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java
(props changed)
abdera/java/branches/axiom-upgrade/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
(props changed)
Propchange: abdera/java/branches/axiom-upgrade/
------------------------------------------------------------------------------
Merged /abdera/java/trunk:r1374754-1374766
Propchange:
abdera/java/branches/axiom-upgrade/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java
------------------------------------------------------------------------------
Merged
/abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java:r1374754-1374766
Modified:
abdera/java/branches/axiom-upgrade/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java?rev=1374773&r1=1374772&r2=1374773&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
(original)
+++
abdera/java/branches/axiom-upgrade/extensions/sharing/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
Sun Aug 19 15:36:42 2012
@@ -335,8 +335,8 @@ public class SharingHelper {
Feed feed = (Feed)base;
Unpublished unpub = getUnpublished(feed, true);
Entry newentry = (Entry)entry.clone();
- newentry.setParentElement(unpub);
- unpub.addEntry(newentry);
+ // Use addExtension instead of addEntry because addEntry clones the
node
+ unpub.addExtension(newentry);
entry.discard();
return newentry;
}
@@ -350,7 +350,6 @@ public class SharingHelper {
Unpublished unpub = (Unpublished)base;
Feed feed = unpub.getParentElement();
Entry newentry = (Entry)entry.clone();
- newentry.setParentElement(feed);
feed.addEntry(newentry);
entry.discard();
return newentry;
Modified:
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1374773&r1=1374772&r2=1374773&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
Sun Aug 19 15:36:42 2012
@@ -260,7 +260,7 @@ public class FOMElement extends OMElemen
}
if (attr != null)
addAttribute(attr);
- } else {
+ } else if (attr != null) {
removeAttribute(attr);
}
}
Modified:
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
URL:
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java?rev=1374773&r1=1374772&r2=1374773&view=diff
==============================================================================
---
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
(original)
+++
abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMExtensibleElement.java
Sun Aug 19 15:36:42 2012
@@ -180,7 +180,6 @@ public class FOMExtensibleElement extend
if (el == null) {
addExtension(element);
} else {
- element.setParentElement(this);
el.insertSiblingBefore((OMElement)getInternal(element));
}
return (T)element;
Propchange:
abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
------------------------------------------------------------------------------
Merged
/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java:r1374754-1374766
