You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/07/22 15:48:35 UTC
svn commit: r1149607 - in /cxf/branches/2.4.x-fixes: ./
common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
parent/pom.xml
Author: dkulp
Date: Fri Jul 22 13:48:34 2011
New Revision: 1149607
URL: http://svn.apache.org/viewvc?rev=1149607&view=rev
Log:
Merged revisions 1149605 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1149605 | dkulp | 2011-07-22 09:43:51 -0400 (Fri, 22 Jul 2011) | 1 line
Update to latest neethi. Remove a el.setPrefix call
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/branches/2.4.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1149607&r1=1149606&r2=1149607&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Fri Jul 22 13:48:34 2011
@@ -963,10 +963,13 @@ public final class StaxUtils {
switch (event) {
case XMLStreamConstants.START_ELEMENT: {
elementCount++;
- Element e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
+ Element e;
if (!StringUtils.isEmpty(reader.getPrefix())) {
- e.setPrefix(reader.getPrefix());
- }
+ e = doc.createElementNS(reader.getNamespaceURI(),
+ reader.getPrefix() + ":" + reader.getLocalName());
+ } else {
+ e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
+ }
e = (Element)parent.appendChild(e);
recordLoc = addLocation(doc, e, reader, recordLoc);
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1149607&r1=1149606&r2=1149607&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Fri Jul 22 13:48:34 2011
@@ -95,7 +95,7 @@
<cxf.opensamlws.version>1.4.1</cxf.opensamlws.version>
<cxf.opensaml.osgi.version>2.4.1_1</cxf.opensaml.osgi.version>
<cxf.opensaml.xmltooling.version>1.3.1</cxf.opensaml.xmltooling.version>
- <cxf.neethi.version>3.0.0</cxf.neethi.version>
+ <cxf.neethi.version>3.0.1</cxf.neethi.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
<cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>