cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r741187 - in /cxf/branches/2.0.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...
Date Thu, 05 Feb 2009 17:20:15 GMT
Author: dkulp
Date: Thu Feb  5 17:20:13 2009
New Revision: 741187

URL: http://svn.apache.org/viewvc?rev=741187&view=rev
Log:
Merged revisions 740326 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r740326 | dkulp | 2009-02-03 10:56:17 -0500 (Tue, 03 Feb 2009) | 9 lines
  
  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.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
      - copied unchanged from r740326, cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
    cxf/branches/2.0.x-fixes/testutils/src/main/resources/wsdl/swa-mime-nomime.wsdl
      - copied unchanged from r740326, cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/swa-mime-nomime.wsdl
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 17:20:13 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740959
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740844
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740959
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740844
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=741187&r1=741186&r2=741187&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Thu Feb  5 17:20:13 2009
@@ -686,7 +686,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.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java?rev=741187&r1=741186&r2=741187&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAInInterceptor.java
Thu Feb  5 17:20:13 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.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=741187&r1=741186&r2=741187&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
Thu Feb  5 17:20:13 2009
@@ -122,9 +122,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()) {
@@ -193,6 +194,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.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java?rev=741187&r1=741186&r2=741187&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
Thu Feb  5 17:20:13 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.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java?rev=741187&r1=741186&r2=741187&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/Server.java
Thu Feb  5 17:20:13 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.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html?rev=741187&r1=741186&r2=741187&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/swa/resources/attach.html
Thu Feb  5 17:20:13 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>



Mime
View raw message