cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r609013 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ systests/src/test/java/org/apache/cxf/cxf1332/
Date Fri, 04 Jan 2008 21:21:11 GMT
Author: dkulp
Date: Fri Jan  4 13:21:10 2008
New Revision: 609013

URL: http://svn.apache.org/viewvc?rev=609013&view=rev
Log:
Merged revisions 609002 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r609002 | bimargulies | 2008-01-04 15:58:28 -0500 (Fri, 04 Jan 2008) | 2 lines
  
  fix cxf 1332.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Impl.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=609013&r1=609012&r2=609013&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Fri Jan  4 13:21:10 2008
@@ -643,6 +643,7 @@
                     obj = ((JAXBElement)obj).getValue();
                 }
                 ret.add(obj);
+                reader.nextTag();
             }
             return ret;
         } catch (Fault ex) {

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332.java?rev=609013&r1=609012&r2=609013&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332.java
Fri Jan  4 13:21:10 2008
@@ -27,6 +27,6 @@
 public interface Cxf1332 {
     @WebMethod(operationName = "SendData", action = "")
     @WebResult(name = "result", targetNamespace = "urn:org.apache.cxf.1332.result")
-    String hostSendData(@WebParam(name = "params")String[] strs);
+    String hostSendData(@WebParam(name = "params", targetNamespace = "") String[] strs);
 
 }

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Impl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Impl.java?rev=609013&r1=609012&r2=609013&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Impl.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/cxf1332/Cxf1332Impl.java
Fri Jan  4 13:21:10 2008
@@ -32,7 +32,7 @@
     /** {@inheritDoc}*/
     @WebMethod(operationName = "SendData", action = "")
     @WebResult(name = "result", targetNamespace = "urn:org.apache.cxf.1332.result")
-    public String hostSendData(@WebParam(name = "params") String[] strs) {
+    public String hostSendData(@WebParam(name = "params", targetNamespace = "") String[]
strs) {
         return "Bloop";
     }
 }



Mime
View raw message