svn commit: r825539 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/

[dkulp]

Author: dkulp
Date: Thu Oct 15 16:05:31 2009
New Revision: 825539

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

........
  r825300 | bimargulies | 2009-10-14 17:45:20 -0400 (Wed, 14 Oct 2009) | 1 line
  
  add test case for Holder.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/Echo.java
    
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/EchoImpl.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java?rev=825539&r1=825538&r2=825539&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
 Thu Oct 15 16:05:31 2009
@@ -19,11 +19,16 @@
 
 package org.apache.cxf.aegis.client;
 
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Holder;
+
 import org.apache.cxf.aegis.AbstractAegisTest;
 import org.apache.cxf.aegis.databinding.AegisDatabinding;
 
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
 import org.apache.cxf.frontend.ServerFactoryBean;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.invoker.BeanInvoker;
 import org.junit.Before;
@@ -45,6 +50,23 @@
         svrFac.setServiceClass(Echo.class);
         svrFac.setBus(getBus());
         svrFac.create();
+        
+        Endpoint endpoint = Endpoint.create(new EchoImpl());
+        EndpointImpl impl = (EndpointImpl) endpoint;
+        impl.setDataBinding(new AegisDatabinding());
+        endpoint.publish("local://JaxWsEcho");
+    }
+    
+    @Test
+    public void talkToJaxWsHolder() throws Exception {
+        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+        factory.setServiceClass(Echo.class);
+        factory.setDataBinding(new AegisDatabinding());
+        factory.setAddress("local://JaxWsEcho");
+        Echo client = (Echo) factory.create();
+        Holder<String> sholder = new Holder<String>();
+        client.echo("Channa Doll", sholder);
+        assertEquals("Channa Doll", sholder.value);
     }
     
     @Test

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/Echo.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/Echo.java?rev=825539&r1=825538&r2=825539&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/Echo.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/Echo.java
 Thu Oct 15 16:05:31 2009
@@ -25,9 +25,9 @@
 
 @WebService
 public interface Echo {
-    String echo(String text,
-                @WebParam(mode = Mode.OUT)
+    String echo(@WebParam(name = "in", mode = Mode.IN)
+                String text,
+                @WebParam(name = "out", mode = Mode.OUT)
                 Holder<String> textAgain);
-    
     String simpleEcho(String text);
 }

Modified: 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/EchoImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/EchoImpl.java?rev=825539&r1=825538&r2=825539&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/EchoImpl.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/EchoImpl.java
 Thu Oct 15 16:05:31 2009
@@ -22,7 +22,7 @@
 
 public class EchoImpl implements Echo {
     public String echo(String text, Holder<String> textAgain) {
-        textAgain.value = "header2";
+        textAgain.value = text;
         return text;
     }