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/02/03 16:56:17 UTC
svn commit: r740326 - in /cxf/branches/2.1.x-fixes: ./
common/common/src/main/java/org/apache/cxf/staxutils/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/
systests/src/test/java/org/apache/cxf/systest/swa/
systests/src/test/java/or...
Author: dkulp
Date: Tue Feb 3 15:56:17 2009
New Revision: 740326
URL: http://svn.apache.org/viewvc?rev=740326&view=rev
Log:
Merged revisions 740197 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r740197 | dkulp | 2009-02-02 22:02:19 -0500 (Mon, 02 Feb 2009) | 2 lines
[CXF-2020] Fix problems of using mime binding without generating the mime handlers
........
Added:
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
- copied unchanged from r740197, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/swa-mime-nomime.wsdl
- copied unchanged from r740197, cxf/trunk/testutils/src/main/resources/wsdl/swa-mime-nomime.wsdl
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 3 15:56:17 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=740326&r1=740325&r2=740326&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Tue Feb 3 15:56:17 2009
@@ -720,7 +720,7 @@
private static boolean isDeclared(Element e, String namespaceURI, String prefix) {
Attr att;
if (prefix != null && prefix.length() > 0) {
- att = e.getAttributeNodeNS(XML_NS, "xmlns:" + prefix);
+ att = e.getAttributeNodeNS(XML_NS, prefix);
} else {
att = e.getAttributeNode("xmlns");
}
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java?rev=740326&r1=740325&r2=740326&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java Tue Feb 3 15:56:17 2009
@@ -29,6 +29,7 @@
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
import org.apache.cxf.binding.soap.model.SoapBodyInfo;
+import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.MessageContentsList;
@@ -86,9 +87,22 @@
DataHandler dh = a.getDataHandler();
String ct = dh.getContentType();
Object o = null;
-
- if (DataHandler.class.isAssignableFrom(mpi.getTypeClass())) {
+ Class<?> typeClass = mpi.getTypeClass();
+ if (DataHandler.class.isAssignableFrom(typeClass)) {
o = dh;
+ } else if (String.class.isAssignableFrom(typeClass)) {
+ try {
+ //o = IOUtils.readBytesFromStream(dh.getInputStream());
+ o = dh.getContent();
+ } catch (IOException e) {
+ throw new Fault(e);
+ }
+ } else if (byte[].class.isAssignableFrom(typeClass)) {
+ try {
+ o = IOUtils.readBytesFromStream(dh.getInputStream());
+ } catch (IOException e) {
+ throw new Fault(e);
+ }
} else if (ct.startsWith("image/")) {
try {
o = ImageIO.read(dh.getInputStream());
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=740326&r1=740325&r2=740326&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Tue Feb 3 15:56:17 2009
@@ -127,9 +127,10 @@
}
return;
}
-
+ processAttachments(message, sbi);
+ }
+ protected void processAttachments(SoapMessage message, SoapBodyInfo sbi) {
Collection<Attachment> atts = setupAttachmentOutput(message);
-
List<Object> outObjects = CastUtils.cast(message.getContent(List.class));
for (MessagePartInfo mpi : sbi.getAttachments()) {
@@ -198,6 +199,15 @@
ct = "application/octet-stream";
}
dh = new DataHandler(new ByteArrayDataSource((byte[])o, ct));
+ } else if (o instanceof String) {
+ if (ct == null) {
+ ct = "text/plain; charset=\'UTF-8\'";
+ }
+ try {
+ dh = new DataHandler(new ByteArrayDataSource((String)o, ct));
+ } catch (IOException e) {
+ throw new Fault(e);
+ }
} else {
throw new Fault(new org.apache.cxf.common.i18n.Message("ATTACHMENT_NOT_SUPPORTED",
LOG, o.getClass()));
Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java?rev=740326&r1=740325&r2=740326&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java Tue Feb 3 15:56:17 2009
@@ -54,6 +54,49 @@
}
@Test
+ public void testSwaNoMimeCodeGen() throws Exception {
+ org.apache.cxf.swa_nomime.SwAService service = new org.apache.cxf.swa_nomime.SwAService();
+
+ org.apache.cxf.swa_nomime.SwAServiceInterface port = service.getSwAServiceHttpPort();
+// ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+// "http://localhost:9037/swa");
+
+ Holder<String> textHolder = new Holder<String>("Hi");
+ Holder<byte[]> data = new Holder<byte[]>("foobar".getBytes());
+
+ port.echoData(textHolder, data);
+ String string = IOUtils.newStringFromBytes(data.value);
+ assertEquals("testfoobar", string);
+ assertEquals("Hi", textHolder.value);
+
+ if (Boolean.getBoolean("java.awt.headless")) {
+ return;
+ }
+
+ URL url1 = this.getClass().getResource("resources/attach.text");
+ URL url2 = this.getClass().getResource("resources/attach.html");
+ URL url3 = this.getClass().getResource("resources/attach.xml");
+ URL url4 = this.getClass().getResource("resources/attach.jpeg1");
+ URL url5 = this.getClass().getResource("resources/attach.jpeg2");
+
+ Holder<String> attach1 = new Holder<String>(IOUtils.toString(url1.openStream()));
+ Holder<String> attach2 = new Holder<String>(IOUtils.toString(url2.openStream()));
+ Holder<String> attach3 = new Holder<String>(IOUtils.toString(url3.openStream()));
+ Holder<byte[]> attach4 = new Holder<byte[]>(IOUtils.readBytesFromStream(url4.openStream()));
+ Holder<byte[]> attach5 = new Holder<byte[]>(IOUtils.readBytesFromStream(url5.openStream()));
+ org.apache.cxf.swa_nomime.types.VoidRequest request
+ = new org.apache.cxf.swa_nomime.types.VoidRequest();
+ org.apache.cxf.swa_nomime.types.OutputResponseAll response
+ = port.echoAllAttachmentTypes(request,
+ attach1,
+ attach2,
+ attach3,
+ attach4,
+ attach5);
+ assertNotNull(response);
+ }
+
+ @Test
public void testSwa() throws Exception {
SwAService service = new SwAService();
Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java?rev=740326&r1=740325&r2=740326&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java Tue Feb 3 15:56:17 2009
@@ -29,8 +29,14 @@
protected void run() {
Object implementor = new SwAServiceImpl();
String address = "http://localhost:9036/swa";
+ EndpointImpl ep;
try {
- EndpointImpl ep = (EndpointImpl) Endpoint.create(implementor);
+ ep = (EndpointImpl) Endpoint.create(new SwANoMimeServiceImpl());
+ ep.setWsdlLocation("classpath:wsdl/swa-mime-nomime.wsdl");
+ ep.publish(address + "-nomime");
+
+
+ ep = (EndpointImpl) Endpoint.create(implementor);
ep.setWsdlLocation("classpath:wsdl/swa-mime.wsdl");
ep.publish(address);
} catch (Exception e) {
Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html?rev=740326&r1=740325&r2=740326&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html Tue Feb 3 15:56:17 2009
@@ -1,4 +1,4 @@
-/**
+<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ *-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<head>
<title>This is a title</title>