svn commit: r683279 - in /cxf/trunk/tools/wsdlto: frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/ test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/

[dk...@apache.org]

Author: dkulp
Date: Wed Aug  6 07:35:10 2008
New Revision: 683279

URL: http://svn.apache.org/viewvc?rev=683279&view=rev
Log:
[CXF-1728] Fix javadoc generation to be /** instead of /*
Also, don't output useless empty javadoc 

Modified:
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm
    cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm?rev=683279&r1=683278&r2=683279&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm Wed Aug  6 07:35:10 2008
@@ -30,7 +30,6 @@
 #foreach ($field in $expClass.Fields)
 @WebFault(name = "$field.Name", targetNamespace = "$field.TargetNamespace")
 #end
-
 public class $expClass.Name extends Exception {
     public static final long serialVersionUID = ${suid}L;
 #foreach ($field in $expClass.Fields)

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm?rev=683279&r1=683278&r2=683279&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm Wed Aug  6 07:35:10 2008
@@ -14,11 +14,11 @@
 ## KIND, either express or implied. See the License for the
 ## specific language governing permissions and limitations
 ## under the License.
-
-/*
+#if ($intf.packageJavaDoc != "")
+/**
  * $intf.packageJavaDoc
  */
-
+#end
 package $intf.PackageName;
 
 #foreach ($import in $intf.Imports)
@@ -32,22 +32,22 @@
  * 
  */
  
- /*
-  * $intf.classJavaDoc
-  */
-
-
+#if ($intf.classJavaDoc != "")
+/**
+ * $intf.classJavaDoc
+ */
+#end
 #foreach ($annotation in $intf.Annotations)
 $annotation
 #end
-
 public interface $intf.Name {
 #foreach ($method in $intf.Methods)
 
-/*
- * ${method.JavaDoc}
- */
-
+#if ($method.JavaDoc != "")
+    /**
+     * ${method.JavaDoc}
+     */
+#end
 #foreach ($annotation in $method.Annotations)
     $annotation
 #end

Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm?rev=683279&r1=683278&r2=683279&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm Wed Aug  6 07:35:10 2008
@@ -38,10 +38,12 @@
  * Generated source version: $version
  * 
  */
- 
-/*
+
+#if ($service.classJavaDoc != "")
+/**
  * $service.classJavaDoc
  */
+#end
 
 @WebServiceClient(name = "${service.ServiceName}", 
 #if ($wsdlLocation != "")

Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=683279&r1=683278&r2=683279&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Wed Aug  6 07:35:10 2008
@@ -962,8 +962,8 @@
             "org/mypkg/MyGreeter.java"));
                 
         assertTrue(results1.contains(" * this is package javadoc"));
-        assertTrue(results1.contains("  * this is class javadoc"));
-        assertTrue(results1.contains(" * this is method javadoc"));
+        assertTrue(results1.contains(" * this is class javadoc"));
+        assertTrue(results1.contains("     * this is method javadoc"));
         
         List<String> results2 = FileUtils.readLines(new File(output.getCanonicalPath(), 
             "org/mypkg/SOAPService.java"));