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 2009/11/01 04:15:00 UTC
svn commit: r831634 - in /cxf/branches/2.2.x-fixes: ./
rt/javascript/src/main/resources/org/apache/cxf/javascript/
rt/javascript/src/test/java/org/apache/cxf/javascript/
rt/javascript/src/test/resources/
Author: dkulp
Date: Sun Nov 1 03:15:00 2009
New Revision: 831634
URL: http://svn.apache.org/viewvc?rev=831634&view=rev
Log:
Merged revisions 831581 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r831581 | bimargulies | 2009-10-31 14:48:48 -0400 (Sat, 31 Oct 2009) | 3 lines
CXF-1266. Array parameters of JAX-WS methods are not nillable=true, so stop the Javascript test case from
trying to send nulls into here. All of this because the original JAXB bug is fixed. Also fix the content-type
in message from the Javascript code to say 'utf-8'.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/javascript/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
cxf/branches/2.2.x-fixes/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/javascript/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/javascript/src/main/resources/org/apache/cxf/javascript/cxf-utils.js?rev=831634&r1=831633&r2=831634&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/javascript/src/main/resources/org/apache/cxf/javascript/cxf-utils.js (original)
+++ cxf/branches/2.2.x-fixes/rt/javascript/src/main/resources/org/apache/cxf/javascript/cxf-utils.js Sun Nov 1 03:15:00 2009
@@ -710,8 +710,9 @@
this.req.setRequestHeader("Content-Type", ctHeader);
} else {
- // for now, assume SOAP 1.1. 1.2 calls for application/xml.
- this.req.setRequestHeader("Content-Type", "text/xml");
+ // for now, assume SOAP 1.1. 1.2 calls for application/xml.
+ // also assume we're talking Unicode here.
+ this.req.setRequestHeader("Content-Type", "text/xml;charset=utf-8");
}
if (headers) { // must be array indexed by header field.
Modified: cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java?rev=831634&r1=831633&r2=831634&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java (original)
+++ cxf/branches/2.2.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java Sun Nov 1 03:15:00 2009
@@ -73,7 +73,12 @@
TestBean1[] beans = new TestBean1[3];
beans[0] = new TestBean1();
beans[0].beanTwoNotRequiredItem = new TestBean2("bean2");
- beans[1] = null;
+ if (useWrapper) {
+ beans[1] = null;
+ } else {
+ // without a wrapper, it can't be null, so put something in there.
+ beans[1] = new TestBean1();
+ }
beans[2] = new TestBean1();
beans[2].optionalIntArrayItem = new int[2];
beans[2].optionalIntArrayItem[0] = 4;
@@ -114,7 +119,6 @@
return null;
}
- @org.junit.Ignore // problems with names on auto-generated wrappers!
@Test
public void callFunctionWithBeans() {
LOG.info("about to call test4/beanFunction");
@@ -253,7 +257,7 @@
public void callTest2WithNullString() {
testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() {
public Void run(Context context) {
- LOG.info("About to call test2 with null string" + getAddress());
+ LOG.info("About to call test2 with null string " + getAddress());
Notifier notifier =
testUtilities.rhinoCallConvert("test2", Notifier.class,
testUtilities.javaToJS(getAddress()),
Modified: cxf/branches/2.2.x-fixes/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml?rev=831634&r1=831633&r2=831634&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/javascript/src/test/resources/DocLitWrappedClientTestBeans.xml Sun Nov 1 03:15:00 2009
@@ -20,7 +20,9 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans
@@ -31,6 +33,13 @@
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-javascript-client.xml" />
+ <!--
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+ -->
<jaxws:server id="dlw-service-endpoint"
address="http://localhost:8808/SimpleDocLitWrapped" >