svn commit: r640448 - in /incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11: annotator/WrapperBeanAnnotator.java date_type_cust.vm date_type_cust_embed.vm wrapperbean.vm

[dkulp]

Author: dkulp
Date: Mon Mar 24 08:47:19 2008
New Revision: 640448

URL: http://svn.apache.org/viewvc?rev=640448&view=rev
Log:
Fixup some formatting stuff with the generated wrapper beans

Modified:
    
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
    
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust.vm
    
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust_embed.vm
    
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm

Modified: 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java?rev=640448&r1=640447&r2=640448&view=diff
==============================================================================
--- 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
 (original)
+++ 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotator.java
 Mon Mar 24 08:47:19 2008
@@ -60,7 +60,7 @@
         
         List<String> props = new ArrayList<String>();
         for (JavaField f : beanClass.getFields()) {
-            props.add(f.getRawName());
+            props.add(f.getParaName());
         }
         if (props.size() > 1) {
             xmlType.addElement(new JAnnotationElement("propOrder",

Modified: 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust.vm
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust.vm?rev=640448&r1=640447&r2=640448&view=diff
==============================================================================
--- 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust.vm
 (original)
+++ 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust.vm
 Mon Mar 24 08:47:19 2008
@@ -16,7 +16,7 @@
 ## under the License.
 <!--
     * This is a jaxb external customization binding file
-    * was generated by the CXF $version
+    * was generated by $fullversion
     * $currentdate
     * Generated source version: $version
     *

Modified: 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust_embed.vm
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust_embed.vm?rev=640448&r1=640447&r2=640448&view=diff
==============================================================================
--- 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust_embed.vm
 (original)
+++ 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/date_type_cust_embed.vm
 Mon Mar 24 08:47:19 2008
@@ -16,7 +16,7 @@
 ## under the License.
 <!--
     * This is a jaxb external customization binding file
-    * was generated by the CXF $version
+    * was generated by $fullversion
     * $currentdate
     * Generated source version: $version
     *

Modified: 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm?rev=640448&r1=640447&r2=640448&view=diff
==============================================================================
--- 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm
 (original)
+++ 
incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/wrapperbean.vm
 Mon Mar 24 08:47:19 2008
@@ -22,10 +22,9 @@
 #end
 
 /**
- * This class was generated by the CXF $version
+ * This class was generated by $fullversion
  * $currentdate
  * Generated source version: $version
- * 
  */
 
 #foreach ($annotation in $bean.Annotations)
@@ -36,18 +35,17 @@
 
 #foreach ($field in $bean.Fields)
 #foreach($anno in $field.Annotations)
-$anno
+    $anno
 #end
     private $field.Type $field.ParaName;
 #end
 
 #foreach ($method in $bean.Methods)
-    public ${method.return.ClassName} ${method.Name} 
(#if($method.ParameterListWithoutAnnotation.size() == 0))#end 
#if($method.ParameterListWithoutAnnotation.size() != 0) #foreach ($param in 
${method.ParameterListWithoutAnnotation}) $param #end ) #end 
-    {
-       #foreach ($exp in $method.JavaCodeBlock.Expressions)
-           $exp
-        #end
-}
+    public ${method.return.ClassName} 
${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 
0))#else#foreach($param in 
${method.ParameterListWithoutAnnotation})${param}#end) #end {
+#foreach ($exp in $method.JavaCodeBlock.Expressions)
+        $exp
+#end
+    }
 
 #end
 }