svn commit: r643559 - in /maven/plugin-tools/trunk/maven-plugin-tools-api/src: main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java

[bentmann]

Author: bentmann
Date: Tue Apr  1 13:49:26 2008
New Revision: 643559

URL: http://svn.apache.org/viewvc?rev=643559&view=rev
Log:
[MPLUGIN-98] Remove javadoc inline tags from output of help mojo

Modified:
    
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
    
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java?rev=643559&r1=643558&r2=643559&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
 Tue Apr  1 13:49:26 2008
@@ -35,6 +35,7 @@
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.tools.plugin.util.PluginUtils;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.logging.console.ConsoleLogger;
@@ -524,7 +525,7 @@
             }
         };
 
-        parser.parse( new StringReader( str ), htmlCallback, true );
+        parser.parse( new StringReader( PluginUtils.makeHtmlValid( str ) ), 
htmlCallback, true );
 
         return StringUtils.replace( sb.toString(), "\"", "'" ); // for CDATA
     }

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java?rev=643559&r1=643558&r2=643559&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginHelpGeneratorTest.java
 Tue Apr  1 13:49:26 2008
@@ -39,5 +39,9 @@
         // wrong HTML
         javadoc = "Generates <i>something</i> <b> for the project.";
         assertEquals( "Generates something for the project.", 
PluginHelpGenerator.toText( javadoc ) );
+
+        // javadoc inline tags
+        javadoc = "Generates [EMAIL PROTECTED] something} for the project.";
+        assertEquals( "Generates something for the project.", 
PluginHelpGenerator.toText( javadoc ) );
     }
-}
\ No newline at end of file
+}