Please apply this patch before next 2.0.x branch merge

[Jim Ma]

Hi Dan ,

I  modified some class in javato/ws module . These changes will not be 
merged into javato/core and javato/test module
in 2.0.x branch and some tests will fail. Could you help me apply this 
patch to 2.0.x branch before your next merge ?

Thanks

Jim
Index: 
tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm
===================================================================
--- 
tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm
      (revision 595536)
+++ 
tools/javato/core/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm
      (working copy)
@@ -35,10 +35,10 @@
 public class $bean.Name {
 
 #foreach ($field in $bean.Fields)
-#if($field.Annotation)
-$field.Annotation
+#foreach($anno in $field.Annotations)
+$anno
 #end
-    private $field.Type $field.Name;
+    private $field.Type $field.ParaName;
 #end
 
 #foreach ($method in $bean.Methods)
Index: 
tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
===================================================================
--- 
tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
    (revision 595536)
+++ 
tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
    (working copy)
@@ -59,7 +59,7 @@
         Method method = (Method)opInfo.getProperty("operation.method");
 
         JavaField field  = responseWrapper.buildFields(method, message).get(0);
-        assertEquals("_return", field.getName());
+        assertEquals("_return", field.getParaName());
         assertEquals("String[]", field.getType());
 
         // Test int[]
@@ -71,7 +71,7 @@
         method = (Method) opInfo.getProperty("operation.method");
 
         field = responseWrapper.buildFields(method, message).get(0);
-        assertEquals("_return", field.getName());
+        assertEquals("_return", field.getParaName());
         assertEquals("int[]", field.getType());
 
         // Test TestDataBean[]
@@ -83,7 +83,7 @@
         method = (Method) opInfo.getProperty("operation.method");
 
         field = responseWrapper.buildFields(method, message).get(0);
-        assertEquals("_return", field.getName());
+        assertEquals("_return", field.getParaName());
         
assertEquals("org.apache.cxf.tools.fortest.withannotation.doc.TestDataBean[]", 
field.getType());
     }