svn commit: r477055 - in /incubator/cxf/trunk/rt/frontend: jaxws/src/test/java/org/apache/cxf/jaxws/ simple/src/main/java/org/apache/cxf/service/factory/ simple/src/test/java/org/apache/cxf/service/factory/

[tl...@apache.org]

Author: tli
Date: Sun Nov 19 21:42:59 2006
New Revision: 477055

URL: http://svn.apache.org/viewvc?view=rev&rev=477055
Log:
fix default message part name for code first cases

Modified:
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
    incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?view=diff&rev=477055&r1=477054&r2=477055
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Sun Nov 19 21:42:59 2006
@@ -114,7 +114,7 @@
         assertNotNull(res);
 
         addNamespace("h", "http://service.jaxws.cxf.apache.org");
-        assertValid("//s:Body/h:sayHiResponse/h:out", res);
+        assertValid("//s:Body/h:sayHiResponse/h:return", res);
         
         res = invoke("http://localhost:9090/hello", 
                      LocalTransportFactory.TRANSPORT_ID,
@@ -123,6 +123,6 @@
         assertNotNull(res);
 
         addNamespace("h", "http://service.jaxws.cxf.apache.org");
-        assertValid("//s:Body/h:getGreetingsResponse/h:out/item", res);
+        assertValid("//s:Body/h:getGreetingsResponse/h:return/item", res);
     }
 }

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?view=diff&rev=477055&r1=477054&r2=477055
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java Sun Nov 19 21:42:59 2006
@@ -56,7 +56,7 @@
     @Override
     public QName getInParameterName(OperationInfo op, Method method, int paramNumber) {
         return new QName(op.getName().getNamespaceURI(), 
-                         getDefaultLocalName(op, method, paramNumber, "in"));
+                         getDefaultLocalName(op, method, paramNumber, "arg" + paramNumber));
     }
 
     @Override
@@ -67,7 +67,7 @@
     @Override
     public QName getOutParameterName(OperationInfo op, Method method, int paramNumber) {
         return new QName(op.getName().getNamespaceURI(), 
-                         getDefaultLocalName(op, method, paramNumber, "out"));
+                         getDefaultLocalName(op, method, paramNumber, "return"));
     }
 
     private String getDefaultLocalName(OperationInfo op, Method method, int paramNumber, String prefix) {

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?view=diff&rev=477055&r1=477054&r2=477055
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java Sun Nov 19 21:42:59 2006
@@ -65,7 +65,7 @@
         assertEquals("sayHelloResponse", sayHelloOp.getOutput().getName().getLocalPart());
         
         MessagePartInfo mpi = messageParts.get(0);
-        assertEquals("out", mpi.getName().getLocalPart());
+        assertEquals("return", mpi.getName().getLocalPart());
         assertEquals(String.class, mpi.getTypeClass());
 
         
@@ -109,7 +109,7 @@
         assertEquals("sayHelloResponse", unwrappedOp.getOutput().getName().getLocalPart());
         assertEquals(1, messageParts.size());
         MessagePartInfo mpi = messageParts.get(0);
-        assertEquals("out", mpi.getName().getLocalPart());
+        assertEquals("return", mpi.getName().getLocalPart());
         assertEquals(String.class, mpi.getTypeClass());
     }