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 28690C30B for ; Thu, 26 Apr 2012 21:08:00 +0000 (UTC) Received: (qmail 3489 invoked by uid 500); 26 Apr 2012 21:08:00 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 3432 invoked by uid 500); 26 Apr 2012 21:08:00 -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 3425 invoked by uid 99); 26 Apr 2012 21:08:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 21:08:00 +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; Thu, 26 Apr 2012 21:07:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E1B50238897D; Thu, 26 Apr 2012 21:07:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331095 - /cxf/branches/2.4.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Date: Thu, 26 Apr 2012 21:07:38 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120426210738.E1B50238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Apr 26 21:07:38 2012 New Revision: 1331095 URL: http://svn.apache.org/viewvc?rev=1331095&view=rev Log: Merged revisions 1331090 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1331090 | dkulp | 2012-04-26 17:05:07 -0400 (Thu, 26 Apr 2012) | 11 lines Merged revisions 1331085 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1331085 | dkulp | 2012-04-26 17:01:45 -0400 (Thu, 26 Apr 2012) | 3 lines [CXF-4269] Make sure the prefix for the RPC wrapper element is mapped and declared prior to writing out the prefixes. ........ ........ Modified: cxf/branches/2.4.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Modified: cxf/branches/2.4.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=1331095&r1=1331094&r2=1331095&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original) +++ cxf/branches/2.4.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Thu Apr 26 21:07:38 2012 @@ -583,8 +583,12 @@ public class ServiceJavascriptBuilder ex + "]);"); px++; } + } else if (isRPC) { + //make sure the rpc element has a valid prefix + prefixAccumulator.xmlElementString(currentOperation.getName()); } + if (soapBindingInfo != null) { SoapVersion soapVersion = soapBindingInfo.getSoapVersion(); assert soapVersion.getVersion() == 1.1;