cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r737761 - in /cxf/trunk: rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/ systests/src/test/java/or...
Date Mon, 26 Jan 2009 17:31:41 GMT
Author: dkulp
Date: Mon Jan 26 17:31:40 2009
New Revision: 737761

URL: http://svn.apache.org/viewvc?rev=737761&view=rev
Log:
[CXF-2005] Add all rpc lit array types, not just non-primitives

Modified:
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthSupplier.java
  (props changed)
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
  (props changed)
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstService.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=737761&r1=737760&r2=737761&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Mon Jan 26 17:31:40 2009
@@ -113,7 +113,7 @@
                     addType(genericType);
                 }
             } else {
-                addType(genericType);
+                addType(genericType, true);
             }
 
             if (isList
@@ -191,9 +191,6 @@
 
 
     private  void addClass(Class<?> cls) {
-        if (cls.isArray() && cls.getComponentType().isPrimitive()) {
-            return;
-        }
         if (Throwable.class.isAssignableFrom(cls)) {
             if (!Throwable.class.equals(cls)
                 && !Exception.class.equals(cls)) {

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthSupplier.java
            ('svn:mergeinfo' removed)

Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpAuthSupplierBeanDefinitionParser.java
            ('svn:mergeinfo' removed)

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=737761&r1=737760&r2=737761&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
Mon Jan 26 17:31:40 2009
@@ -431,11 +431,15 @@
     }
 
     private void runRpcLitTest(RpcLitCodeFirstService port) throws Exception {
+       
+        String ret[] = port.convertToString(new int[] {1, 2 , 3});
+        assertEquals(3, ret.length);
+
         List<String> rev = new ArrayList<String>(Arrays.asList(RpcLitCodeFirstServiceImpl.DATA));
-        Collections.reverse(rev);
+        Collections.reverse(rev);        
         
         String s;
-        
+
         String arrayOut[] = port.arrayOutput();
         assertNotNull(arrayOut);
         assertEquals(3, arrayOut.length);
@@ -524,6 +528,7 @@
         assertEquals(2, foos2.size());
         assertEquals(2, foos2.get(0).length);
         assertEquals(2, foos2.get(1).length);
+        
     }
       
     @Test

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstService.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstService.java?rev=737761&r1=737760&r2=737761&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstService.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstService.java
Mon Jan 26 17:31:40 2009
@@ -23,6 +23,7 @@
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
+import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.ws.Holder;
@@ -35,6 +36,11 @@
 @SOAPBinding(style = SOAPBinding.Style.RPC,
              use = SOAPBinding.Use.LITERAL)
 public interface RpcLitCodeFirstService {
+    
+    @WebMethod(operationName = "ConvertToString")
+    @WebResult(name = "stringNumbers")
+    String[] convertToString(@WebParam(name = "intNumbers") int[] numbers);
+    
     @WebMethod
     String[] arrayOutput();
 
@@ -104,5 +110,6 @@
             return name;
         }
     }
+    
 
 }

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java?rev=737761&r1=737760&r2=737761&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
Mon Jan 26 17:31:40 2009
@@ -127,4 +127,12 @@
         
         return Arrays.asList(new Foo[] {a, b}, new Foo[] {c, d});
     }
+
+    public String[] convertToString(int[] numbers) {
+        String ret[] = new String[numbers.length];
+        for (int x = 0; x < numbers.length; x++) {
+            ret[x] = Integer.toString(numbers[x]);
+        }
+        return ret;
+    }
 }



Mime
View raw message