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 2014/12/19 19:33:32 UTC
[1/2] cxf git commit: [CXF-6163] Fixed xsd:any behaviour when used
with minOccurs=0, maxOccurs>1 This closes #46
Repository: cxf
Updated Branches:
refs/heads/master 0052a5527 -> 328a1a5cf
[CXF-6163] Fixed xsd:any behaviour when used with minOccurs=0, maxOccurs>1
This closes #46
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcdc4ffc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcdc4ffc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcdc4ffc
Branch: refs/heads/master
Commit: bcdc4ffc4e615c644eb8b461f0973298ed0aaca5
Parents: 0052a55
Author: Andrii Nikitiuk <de...@gmail.com>
Authored: Fri Dec 19 16:17:27 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 19 13:19:52 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/javascript/JavascriptUtils.java | 3 ++-
.../org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bcdc4ffc/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
index c22cd9c..7ff0097 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java
@@ -473,7 +473,8 @@ public class JavascriptUtils {
*/
public void generateCodeToSerializeAny(ParticleInfo itemInfo, String prefix,
SchemaCollection schemaCollection) {
- boolean optional = XmlSchemaUtils.isParticleOptional(itemInfo.getParticle());
+ boolean optional = XmlSchemaUtils.isParticleOptional(itemInfo.getParticle())
+ || (itemInfo.isArray() && itemInfo.getMinOccurs() == 0);
boolean array = XmlSchemaUtils.isParticleArray(itemInfo.getParticle());
appendLine("var anyHolder = this._" + itemInfo.getJavascriptName() + ";");
http://git-wip-us.apache.org/repos/asf/cxf/blob/bcdc4ffc/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
index 3292672..f13a51d 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/types/SchemaJavascriptBuilder.java
@@ -533,6 +533,8 @@ public class SchemaJavascriptBuilder {
// non-matching case
utils.startIf("anyNeeded > 0");
utils.appendLine("throw 'not enough ws:any elements';");
+ utils.appendElse(); // else non-match
+ utils.appendLine("break;");
utils.endBlock(); // non-match+required
utils.endBlock(); // match/non-match.
utils.endBlock(); // while
[2/2] cxf git commit: [CXF-6167] Added ability to specify a function
for parsing parsing error details from failed SOAP response This closes #47
Posted by dk...@apache.org.
[CXF-6167] Added ability to specify a function for parsing parsing error details from failed SOAP response
This closes #47
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/328a1a5c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/328a1a5c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/328a1a5c
Branch: refs/heads/master
Commit: 328a1a5cff2b389df09f13796ea0af00f09f1f71
Parents: bcdc4ff
Author: Andrii Nikitiuk <de...@gmail.com>
Authored: Fri Dec 19 16:21:33 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 19 13:20:06 2014 -0500
----------------------------------------------------------------------
.../apache/cxf/javascript/service/ServiceJavascriptBuilder.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/328a1a5c/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
----------------------------------------------------------------------
diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
index 53bee3b..0ad4f67 100755
--- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
+++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
@@ -420,8 +420,12 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor {
utils.appendLine(" httpStatus = -1;");
utils.appendLine(" httpStatusText = 'Error opening connection to server';");
utils.appendLine("}");
+ utils.startIf("client.parseErrorDetails");
+ utils.appendLine("client.user_onerror(httpStatus, httpStatusText, client.parseErrorDetails(this));");
+ utils.appendElse();
utils.appendLine("client.user_onerror(httpStatus, httpStatusText);");
utils.endBlock();
+ utils.endBlock();
code.append("}\n\n");
code.append(currentInterfaceClassName + ".prototype."
+ errorFunctionPropertyName