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 2012/04/26 23:09:45 UTC
svn commit: r1331099 - in /cxf/branches/2.3.x-fixes: ./
rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
Author: dkulp
Date: Thu Apr 26 21:09:45 2012
New Revision: 1331099
URL: http://svn.apache.org/viewvc?rev=1331099&view=rev
Log:
Merged revisions 1331095 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1331095 | dkulp | 2012-04-26 17:07:38 -0400 (Thu, 26 Apr 2012) | 18 lines
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.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=1331099&r1=1331098&r2=1331099&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original)
+++ cxf/branches/2.3.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Thu Apr 26 21:09:45 2012
@@ -589,8 +589,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;