svn commit: r780544 - in /cxf/trunk: distribution/src/main/release/samples/aegis/ distribution/src/main/release/samples/aegis/src/demo/hw/server/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ rt/databinding/aegis/src/test/java/or...

[bimargulies]

Author: bimargulies
Date: Mon Jun  1 01:15:49 2009
New Revision: 780544

URL: http://svn.apache.org/viewvc?rev=780544&view=rev
Log:
CXF-2249. Change the name of the param in the aegis sample.

Modified:
    cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
    
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml
    
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java

Modified: cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml?rev=780544&r1=780543&r2=780544&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml Mon Jun  1 
01:15:49 2009
@@ -26,6 +26,11 @@
             <cxf.version>[2,)</cxf.version>
     </properties>
     <build>
+        <resources>
+          <resource>
+            <directory>src</directory>
+          </resource>
+        </resources>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>

Modified: 
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml?rev=780544&r1=780543&r2=780544&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml
 Mon Jun  1 01:15:49 2009
@@ -20,7 +20,7 @@
 <mappings>
     <mapping name="HelloWorld">
         <method name="sayHi">
-            <parameter index="0" name="greeting" nillable='false' />
+            <parameter index="0" mappedName="greeting" nillable='false' />
         </method>
     </mapping>
 </mappings>

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java?rev=780544&r1=780543&r2=780544&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
 Mon Jun  1 01:15:49 2009
@@ -62,6 +62,19 @@
                         + "/xsd:complexty...@name='unmappedAdd']" + 
"/xsd:sequence"
                         + "/xsd:eleme...@name='one']", doc);
     }
+    
+    @Test
+    public void testNamedParameter() throws Exception {
+        Node doc = getWSDLDocument("ArrayService");
+        Definition def = getWSDLDefinition("ArrayService");
+        StringWriter sink = new StringWriter();
+        WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, sink);
+        assertValid("/wsdl:definitions/wsdl:types/"
+                    + "xsd:sche...@targetnamespace= 
'http://services.aegis.cxf.apache.org']"
+                    + "/xsd:complexty...@name='verifyCustomParamName']" 
+                    + "/xsd:sequence" 
+                    + "/xsd:eleme...@name='custom']", doc);
+    }
 
     @Test
     public void testOccursWSDL() throws Exception {

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml?rev=780544&r1=780543&r2=780544&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml
 Mon Jun  1 01:15:49 2009
@@ -25,5 +25,8 @@
         <method name="takeNumber" xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
                <parameter index="0" typeName="xsd:long"/>
         </method>
+        <method name="verifyCustomParamName">
+               <parameter index="0" mappedName="custom"/>
+        </method>
     </mapping>
 </mappings>

Modified: 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java?rev=780544&r1=780543&r2=780544&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
 (original)
+++ 
cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
 Mon Jun  1 01:15:49 2009
@@ -76,6 +76,10 @@
     }
     
     @WebMethod
+    public void verifyCustomParamName(String param) {
+    }
+    
+    @WebMethod
     public void submitJDOMArray(String before, org.jdom.Element[] anything, 
String after) {
         beforeValue = before;
         jdomArray = anything;