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:54:17 UTC
[1/3] 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/3.0.x-fixes 8bfc34f12 -> 4ccaa6d5e
[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/4ea7db88
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4ea7db88
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4ea7db88
Branch: refs/heads/3.0.x-fixes
Commit: 4ea7db88c0894904f8b904d4049753be4ebec068
Parents: 8bfc34f
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:54:02 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/4ea7db88/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/4ea7db88/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/3] 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/67305480
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67305480
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67305480
Branch: refs/heads/3.0.x-fixes
Commit: 673054808121de3f4911fe8b25cbd1333db3be55
Parents: 4ea7db8
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:54:07 2014 -0500
----------------------------------------------------------------------
.../apache/cxf/javascript/service/ServiceJavascriptBuilder.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/67305480/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
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4ccaa6d5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4ccaa6d5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4ccaa6d5
Branch: refs/heads/3.0.x-fixes
Commit: 4ccaa6d5e605ea65978b493dc7bf673ba72a8ed9
Parents: 6730548
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Dec 19 13:54:08 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 19 13:54:08 2014 -0500
----------------------------------------------------------------------
.gitmergeinfo | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4ccaa6d5/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 444b925..22f12f1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -25,6 +25,7 @@ B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
B 1f02b3d4f2c9d341046ce35222c8f4d7674b10b2
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
+B 27c2c25dc3c2c3019543e31afdca7b166911f278
B 29f0620a9a025afcd2057cdf97c7d93caf6c179f
B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
B 2ba77327488a8446e6a92af137f644eaf3b06e2e
@@ -37,6 +38,7 @@ B 384ad75433037358ea1607c4ddcb0cd978fae10c
B 388d6eaf045c0215c7cffc891526a402c70625ec
B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
+B 431db5275e3a056d6cedf4608533197580cb6073
B 43aa455461fb8a33b0e5844512b263a262c2420c
B 43c65b07658b8041f6689d16a34ff98132b8a424
B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
@@ -47,6 +49,7 @@ B 478de215af2da2c03f439bbbd8341b234bb7bee8
B 47b1a4ae21cfc70cea3b48ebd2be72fd184f1370
B 481466c7a42a57c87c992a02ab560be046bf5797
B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
+B 4b44512d8c3fe76620dbac37d220038435c75ba5
B 4d49814ba85310599ee76e41742208383f3f6450
B 4f61ca801deed173c648b2d424ac231663acd704
B 4f70bdf4199a666829cf9c6c62c508d12afbe251
@@ -54,6 +57,7 @@ B 4fe7844935f9b4ad797760613d143949f9448905
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 55bda33699ea1c2e84a125253edd594cc2a32ea3
B 593525139909e081ae809278d301688c0ba03697
+B 5bac26a132e7999bf0bd108d4cffb674873a56ca
B 5e06ba0c4970700477484bd2409a226aa9ec7f0a
B 5fbd407bac5af5e55bb280125405d75b7add872b
B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
@@ -68,6 +72,7 @@ B 6e4f0f60785de1f5774644323edafb4741b9e4a4
B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e
B 702f27bc4a334b2d117262252632bf580f20f711
B 71488c6fa7635c88285214a0479379aafef9ed3c
+B 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c
B 71ced4709dedf62264a4bb630aaf4780cb94ce48
B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
@@ -94,6 +99,7 @@ B 94cfe7e48a50104b22457aa47b39d06329d16d32
B 970feeed0db20bfe9df5095b6b335146344c222c
B 9896b920035a1d1be1aef28a1d1a5eb876445c82
B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
+B 9dd4194ce6af00377b0e1bdc6b15744fe03e29c9
B 9dfb278c7739b9f4621f43b8146d057e21fafb64
B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415
B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
@@ -111,6 +117,7 @@ B b4872363fda49f205001d4385ecbc35133c2c755
B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
B b5fc90f09c6b039a54564e0825a264310453c550
B b67537dbace0896073b55b375b8ccdc4cce83365
+B ba00202288bce9ba80692f151c2d73b101400c50
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
@@ -200,6 +207,7 @@ M c55664128b1223667dedacc2011ccd5945d9c8b9
M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
M d4a35c40d53fde17fec3d08c25215c7533dcb667
M e2ad037fbc74f42655ac968415fcb4bded87bb38
+M e47e394114d6a3bf06401960618e6bd556a904d7
M e5a805853864e291626bdb913448fc4e2409cca0
M e80d3da7612db41f7efe9c5d3128965ec7d2809b
M eb3dd938052b3e853b0cf85dacf31ef7f802af38