Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BA7E9EBE for ; Tue, 17 Apr 2012 19:49:52 +0000 (UTC) Received: (qmail 46171 invoked by uid 500); 17 Apr 2012 19:49:52 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 46127 invoked by uid 500); 17 Apr 2012 19:49:52 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 46119 invoked by uid 99); 17 Apr 2012 19:49:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Apr 2012 19:49:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Apr 2012 19:49:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ED718238896F; Tue, 17 Apr 2012 19:49:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1327243 - in /cxf/trunk/api/src: main/java/org/apache/cxf/feature/StaxTransformFeature.java main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java Date: Tue, 17 Apr 2012 19:49:30 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120417194930.ED718238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Tue Apr 17 19:49:30 2012 New Revision: 1327243 URL: http://svn.apache.org/viewvc?rev=1327243&view=rev Log: [CXF-4244] OutTransformWriter's defaultNamespace setting may not replace all default namespace declarations Modified: cxf/trunk/api/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java cxf/trunk/api/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java?rev=1327243&r1=1327242&r2=1327243&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java Tue Apr 17 19:49:30 2012 @@ -84,6 +84,10 @@ public class StaxTransformFeature extend in.setInTransformElements(inElements); } + public void setOutDefaultNamespace(String ns) { + out.setDefaultNamespace(ns); + } + public void setContextPropertyName(String propertyName) { in.setContextPropertyName(propertyName); out.setContextPropertyName(propertyName); Modified: cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java?rev=1327243&r1=1327242&r2=1327243&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java Tue Apr 17 19:49:30 2012 @@ -119,7 +119,8 @@ public class OutTransformWriter extends return; } String value = nsMap.get(uri); - if (value != null && value.length() == 0) { + if ((value != null && value.length() == 0) + || (isDefaultNamespaceRedefined() && !isDefaultNamespaceRedefined(uri))) { return; } @@ -139,7 +140,8 @@ public class OutTransformWriter extends return; } String value = nsMap.get(uri); - if (value != null && value.length() == 0) { + if ((value != null && value.length() == 0) + || (isDefaultNamespaceRedefined() && !isDefaultNamespaceRedefined(uri))) { return; } Modified: cxf/trunk/api/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java?rev=1327243&r1=1327242&r2=1327243&view=diff ============================================================================== --- cxf/trunk/api/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java (original) +++ cxf/trunk/api/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java Tue Apr 17 19:49:30 2012 @@ -416,4 +416,25 @@ public class OutTransformWriterTest exte "../resources/multiNS.xml", transformElements, null, null, null, null); } + + @Test + public void testReplaceDefaultNamespace() throws Exception { + InputStream is = new ByteArrayInputStream( + "1".getBytes()); + + ByteArrayOutputStream os = new ByteArrayOutputStream(); + XMLStreamWriter writer = + new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, "UTF-8"), + null, null, null, null, false, ""); + StaxUtils.copy(new StreamSource(is), writer); + writer.flush(); + + XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray())); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + StaxUtils.copy(reader, bos); + String value = bos.toString(); + assertEquals("1", value); + } + }