Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 11473 invoked from network); 6 Sep 2007 16:43:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Sep 2007 16:43:40 -0000 Received: (qmail 21631 invoked by uid 500); 6 Sep 2007 16:43:34 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 21567 invoked by uid 500); 6 Sep 2007 16:43:33 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 21558 invoked by uid 99); 6 Sep 2007 16:43:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 09:43:33 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 16:44:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BA8341A9832; Thu, 6 Sep 2007 09:43:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573321 - in /incubator/cxf/trunk: distribution/src/main/release/samples/ws_policy/ rt/core/src/main/java/org/apache/cxf/headers/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ rt/databinding/jaxb/src/main/java/org/apac... Date: Thu, 06 Sep 2007 16:43:06 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070906164307.BA8341A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Sep 6 09:43:00 2007 New Revision: 573321 URL: http://svn.apache.org/viewvc?rev=573321&view=rev Log: [CXF-975] Patch from Sergey Beryozkin applied Couple other random fixes Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/client.xml incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/server.xml incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/headers/HeaderManagerImpl.java incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/client.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/client.xml?rev=573321&r1=573320&r2=573321&view=diff ============================================================================== --- incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/client.xml (original) +++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/client.xml Thu Sep 6 09:43:00 2007 @@ -20,12 +20,12 @@ Modified: incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/server.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/server.xml?rev=573321&r1=573320&r2=573321&view=diff ============================================================================== --- incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/server.xml (original) +++ incubator/cxf/trunk/distribution/src/main/release/samples/ws_policy/server.xml Thu Sep 6 09:43:00 2007 @@ -20,10 +20,10 @@ Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/headers/HeaderManagerImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/headers/HeaderManagerImpl.java?rev=573321&r1=573320&r2=573321&view=diff ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/headers/HeaderManagerImpl.java (original) +++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/headers/HeaderManagerImpl.java Thu Sep 6 09:43:00 2007 @@ -47,6 +47,9 @@ } public HeaderProcessor getHeaderProcessor(String namespace) { + if (namespace == null) { + namespace = ""; + } return processors.get(namespace); } Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java?rev=573321&r1=573320&r2=573321&view=diff ============================================================================== --- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java (original) +++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java Thu Sep 6 09:43:00 2007 @@ -41,6 +41,13 @@ import org.junit.Before; import org.junit.Test; + +/** + * Regression test for CXF-959. This is a point test for consistent + * use of namespace prefixes in generated WSDL/XMLSchema. This test could + * be made into a more comprehensive functional test by exercising + * cases such as multiple schema. + */ public class NamespaceConfusionTest extends AbstractAegisTest { private TypeMapping tm; Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java?rev=573321&r1=573320&r2=573321&view=diff ============================================================================== --- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java (original) +++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java Thu Sep 6 09:43:00 2007 @@ -35,7 +35,7 @@ public class JAXBAttachmentMarshaller extends AttachmentMarshaller { - private static final int THRESH_HOLD = 5 * 1024; + private static final int THRESHOLD = 5 * 1024; private Collection atts; private boolean isXop; @@ -56,7 +56,7 @@ mimeType = "application/octet-stream"; } if ("application/octet-stream".equals(mimeType) - && length < THRESH_HOLD) { + && length < THRESHOLD) { return null; } ByteDataSource source = new ByteDataSource(data, offset, length); @@ -86,10 +86,10 @@ try { Object o = handler.getContent(); if (o instanceof String - && ((String)o).length() < THRESH_HOLD) { + && ((String)o).length() < THRESHOLD) { return null; } else if (o instanceof byte[] - && ((byte[])o).length < THRESH_HOLD) { + && ((byte[])o).length < THRESHOLD) { return null; } } catch (IOException e1) {