You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/12 02:06:57 UTC
svn commit: r169734 -
/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator
/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy
/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags
Author: brett
Date: Wed May 11 17:06:54 2005
New Revision: 169734
URL: http://svn.apache.org/viewcvs?rev=169734&view=rev
Log:
remove more deprecated stuff, improve plugin xdoc generation
Added:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java (with props)
Removed:
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParamValidatorTag.java
Modified:
maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java Wed May 11 17:06:54 2005
@@ -23,23 +23,19 @@
public class Parameter
{
private String alias;
-
+
private String name;
private String type;
private boolean required;
-
- private boolean editable = true;
- private String validator;
+ private boolean editable = true;
private String description;
private String expression;
- private String defaultValue;
-
private String deprecated;
// ----------------------------------------------------------------------
@@ -76,16 +72,6 @@
this.required = required;
}
- public String getValidator()
- {
- return validator;
- }
-
- public void setValidator( String validator )
- {
- this.validator = validator;
- }
-
public String getDescription()
{
return description;
@@ -106,16 +92,6 @@
this.expression = expression;
}
- public String getDefaultValue()
- {
- return defaultValue;
- }
-
- public void setDefaultValue( String defaultValue )
- {
- this.defaultValue = defaultValue;
- }
-
public String getDeprecated()
{
return deprecated;
@@ -131,9 +107,9 @@
return name.hashCode();
}
- public boolean equals(Object other)
+ public boolean equals( Object other )
{
- return (other instanceof Parameter) && getName().equals(((Parameter)other).getName());
+ return ( other instanceof Parameter ) && getName().equals( ( (Parameter) other ).getName() );
}
public String getAlias()
@@ -155,7 +131,7 @@
{
this.editable = editable;
}
-
+
public String toString()
{
return "Mojo parameter [name: \'" + getName() + "\'; alias: \'" + getAlias() + "\']";
Modified: maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java (original)
+++ maven/components/trunk/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java Wed May 11 17:06:54 2005
@@ -187,8 +187,6 @@
parameter.setEditable( editable == null || Boolean.valueOf( editable ).booleanValue() );
}
- parameter.setValidator( d.getChild( "validator" ).getValue() );
-
parameter.setDescription( d.getChild( "description" ).getValue() );
parameter.setExpression( d.getChild( "expression" ).getValue() );
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/BeanGenerator.java Wed May 11 17:06:54 2005
@@ -43,7 +43,7 @@
public class BeanGenerator
implements Generator
{
- public void execute( String destinationDirectory, PluginDescriptor pluginDescriptor )
+ public void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
throws IOException
{
for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
@@ -53,7 +53,7 @@
}
}
- protected void processPluginDescriptor( MojoDescriptor descriptor, String destinationDirectory )
+ protected void processPluginDescriptor( MojoDescriptor descriptor, File destinationDirectory )
throws IOException
{
String implementation = descriptor.getImplementation();
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/Generator.java Wed May 11 17:06:54 2005
@@ -19,6 +19,7 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import java.io.IOException;
+import java.io.File;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
@@ -26,6 +27,6 @@
*/
public interface Generator
{
- void execute( String destinationDirectory, PluginDescriptor pluginDescriptor )
+ void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
throws IOException;
}
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java Wed May 11 17:06:54 2005
@@ -43,7 +43,7 @@
public class PluginDescriptorGenerator
implements Generator
{
- public void execute( String destinationDirectory, PluginDescriptor pluginDescriptor )
+ public void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
throws IOException
{
File f = new File( destinationDirectory, "plugin.xml" );
@@ -256,9 +256,6 @@
{
element( w, "deprecated", parameter.getDeprecated() );
}
-
- // TODO: do we still need this?
- element( w, "validator", parameter.getValidator() );
element( w, "required", Boolean.toString( parameter.isRequired() ) );
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java Wed May 11 17:06:54 2005
@@ -33,23 +33,23 @@
/**
* @todo add example usage tag that can be shown in the doco
- * @todo need to add validation directives so that systems embedding maven2 can
- * get validation directives to help users in IDEs.
*/
public class PluginXdocGenerator
implements Generator
{
- public void execute( String destinationDirectory, PluginDescriptor pluginDescriptor )
+ public void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
throws IOException
{
+ // TODO: write an overview page
+
for ( Iterator it = pluginDescriptor.getMojos().iterator(); it.hasNext(); )
{
MojoDescriptor descriptor = (MojoDescriptor) it.next();
- processPluginDescriptor( descriptor, destinationDirectory );
+ processMojoDescriptor( descriptor, destinationDirectory );
}
}
- protected void processPluginDescriptor( MojoDescriptor mojoDescriptor, String destinationDirectory )
+ protected void processMojoDescriptor( MojoDescriptor mojoDescriptor, File destinationDirectory )
throws IOException
{
String id = mojoDescriptor.getGoal();
@@ -57,7 +57,7 @@
FileWriter writer = null;
try
{
- writer = new FileWriter( new File( destinationDirectory, id + "-plugin.xml" ) );
+ writer = new FileWriter( new File( destinationDirectory, id + "-mojo.xml" ) );
writeBody( writer, id, mojoDescriptor );
@@ -83,15 +83,8 @@
w.startElement( "title" );
- w.writeText( "Documentation for the " + id + " plugin." );
-
- w.endElement();
-
- w.startElement( "author" );
-
- w.addAttribute( "email", "dev@maven.apache.org" );
-
- w.writeText( "Maven development team." );
+ // TODO: need a friendly name for a plugin
+ w.writeText( mojoDescriptor.getPluginDescriptor().getArtifactId() + " - " + mojoDescriptor.getFullGoalName() );
w.endElement();
@@ -103,34 +96,24 @@
w.startElement( "section" );
- w.addAttribute( "name", "Goals" );
+ w.addAttribute( "name", mojoDescriptor.getFullGoalName() );
w.startElement( "p" );
- w.writeText( "The goals for the " + id + " are as follows:" );
-
- w.endElement();
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- w.startElement( "subsection" );
-
- w.addAttribute( "name", mojoDescriptor.getGoal() );
-
if ( mojoDescriptor.getDescription() != null )
{
- w.startElement( "p" );
-
- w.writeText( mojoDescriptor.getDescription() );
-
- w.endElement();
+ w.writeMarkup( mojoDescriptor.getDescription() );
+ }
+ else
+ {
+ w.writeText( "No description." );
}
+ w.endElement();
+
w.startElement( "p" );
- w.writeText( "These parameters for this goal: " );
+ w.writeText( "Parameters for the goal: " );
w.endElement();
@@ -138,23 +121,11 @@
w.endElement();
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- w.endElement();
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
w.endElement();
}
private void writeGoalParameterTable( MojoDescriptor mojoDescriptor, XMLWriter w )
{
- w.startElement( "p" );
-
w.startElement( "table" );
w.startElement( "tr" );
@@ -183,24 +154,10 @@
w.endElement();
- w.startElement( "th" );
-
- w.writeText( "Required?" );
-
- w.endElement();
-
- w.startElement( "th" );
-
- w.writeText( "Deprecated?" );
-
- w.endElement();
-
w.endElement();
List parameters = mojoDescriptor.getParameters();
- Map parameterMap = mojoDescriptor.getParameterMap();
-
for ( int i = 0; i < parameters.size(); i++ )
{
Parameter parameter = (Parameter) parameters.get( i );
@@ -220,17 +177,16 @@
paramName = parameter.getName();
}
+ w.startElement( "code" );
+
w.writeText( paramName );
w.endElement();
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- w.startElement( "td" );
-
- w.writeText( parameter.getType() );
+ if ( !parameter.isRequired() )
+ {
+ w.writeMarkup( " <i>(Optional)</i>");
+ }
w.endElement();
@@ -240,7 +196,11 @@
w.startElement( "td" );
- w.writeText( parameter.getExpression() );
+ w.startElement( "code" );
+
+ w.writeText( parameter.getType() );
+
+ w.endElement();
w.endElement();
@@ -250,7 +210,18 @@
w.startElement( "td" );
- w.writeText( parameter.getDescription() );
+ w.startElement( "code" );
+
+ if ( StringUtils.isNotEmpty( parameter.getExpression() ) )
+ {
+ w.writeText( parameter.getExpression() );
+ }
+ else
+ {
+ w.writeText( "-" );
+ }
+
+ w.endElement();
w.endElement();
@@ -260,28 +231,32 @@
w.startElement( "td" );
- w.writeText( Boolean.toString( parameter.isRequired() ) );
-
- w.endElement();
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
+ if ( StringUtils.isNotEmpty( parameter.getDescription() ) )
+ {
+ w.writeMarkup( parameter.getDescription() );
+ }
+ else
+ {
+ w.writeText( "No description." );
+ }
String deprecationWarning = parameter.getDeprecated();
- if ( StringUtils.isNotEmpty( deprecationWarning ) )
+ if ( deprecationWarning != null )
{
- w.startElement( "td" );
-
- w.writeText( deprecationWarning );
+ w.writeMarkup( "<br/><b>Deprecated:</b> ");
+ w.writeMarkup( deprecationWarning );
+ if ( deprecationWarning.length() == 0 )
+ {
+ w.writeText( "No reason given." );
+ }
w.endElement();
}
w.endElement();
- }
- w.endElement();
+ w.endElement();
+ }
w.endElement();
}
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/jelly/JellyHarnessGenerator.java Wed May 11 17:06:54 2005
@@ -48,7 +48,7 @@
return pluginDescriptor.getImplementation() + "Bean";
}
- public void execute( String destinationDirectory, PluginDescriptor pluginDescriptor )
+ public void execute( File destinationDirectory, PluginDescriptor pluginDescriptor )
throws IOException
{
FileWriter writer = null;
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java Wed May 11 17:06:54 2005
@@ -58,7 +58,6 @@
List params = new ArrayList();
Parameter param = new Parameter();
- param.setDefaultValue( "value" );
param.setExpression( "${project.build.directory}" );
param.setName( "dir" );
param.setRequired( true );
@@ -70,6 +69,7 @@
mojoDescriptor.setParameters( params );
PluginDescriptor pluginDescriptor = new PluginDescriptor();
+ mojoDescriptor.setPluginDescriptor( pluginDescriptor );
pluginDescriptor.addMojo( mojoDescriptor );
@@ -86,7 +86,7 @@
File tempFile = File.createTempFile( "testGenerator-outDir", ".marker.txt" ).getAbsoluteFile();
File destinationDirectory = tempFile.getParentFile();
- generator.execute( destinationDirectory.getAbsolutePath(), pluginDescriptor );
+ generator.execute( destinationDirectory, pluginDescriptor );
validate( destinationDirectory );
}
Modified: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java (original)
+++ maven/components/trunk/maven-plugin-tools/maven-plugin-tools-pluggy/src/main/java/org/apache/maven/tools/plugin/pluggy/Main.java Wed May 11 17:06:54 2005
@@ -123,6 +123,6 @@
// Use the generator to process the discovered descriptors and produce
// something with them.
- generator.execute( outputDirectory, pluginDescriptor );
+ generator.execute( new File( outputDirectory ), pluginDescriptor );
}
}
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java Wed May 11 17:06:54 2005
@@ -27,6 +27,7 @@
import org.apache.maven.tools.plugin.util.PluginUtils;
import java.io.IOException;
+import java.io.File;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -52,7 +53,7 @@
*/
protected String goalPrefix;
- protected abstract String getOutputDirectory();
+ protected abstract File getOutputDirectory();
protected abstract Generator createGenerator();
@@ -85,6 +86,8 @@
pluginDescriptor.setDependencies( PluginUtils.toComponentDependencies( project.getRuntimeDependencies() ) );
mojoScanner.populatePluginDescriptor( project, pluginDescriptor );
+
+ getOutputDirectory().mkdirs();
createGenerator().execute( getOutputDirectory(), pluginDescriptor );
}
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/BeanGeneratorMojo.java Wed May 11 17:06:54 2005
@@ -19,6 +19,8 @@
import org.apache.maven.tools.plugin.generator.BeanGenerator;
import org.apache.maven.tools.plugin.generator.Generator;
+import java.io.File;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@@ -31,9 +33,9 @@
* @parameter expression="${project.build.directory}/generated-sources"
* @required
*/
- protected String outputDirectory;
+ protected File outputDirectory;
- protected String getOutputDirectory()
+ protected File getOutputDirectory()
{
return outputDirectory;
}
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java Wed May 11 17:06:54 2005
@@ -19,6 +19,8 @@
import org.apache.maven.tools.plugin.generator.Generator;
import org.apache.maven.tools.plugin.generator.PluginDescriptorGenerator;
+import java.io.File;
+
/**
* Generate a plugin descriptor.
* <p/>
@@ -36,9 +38,9 @@
* @parameter expression="${project.build.outputDirectory}/META-INF/maven"
* @required
*/
- protected String outputDirectory;
+ protected File outputDirectory;
- protected String getOutputDirectory()
+ protected File getOutputDirectory()
{
return outputDirectory;
}
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/JellyGeneratorMojo.java Wed May 11 17:06:54 2005
@@ -19,6 +19,8 @@
import org.apache.maven.tools.plugin.generator.Generator;
import org.apache.maven.tools.plugin.generator.jelly.JellyHarnessGenerator;
+import java.io.File;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@@ -31,9 +33,9 @@
* @parameter expression="${project.build.directory}/generated-sources"
* @required
*/
- protected String outputDirectory;
+ protected File outputDirectory;
- protected String getOutputDirectory()
+ protected File getOutputDirectory()
{
return outputDirectory;
}
Added: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java?rev=169734&view=auto
==============================================================================
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java (added)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java Wed May 11 17:06:54 2005
@@ -0,0 +1,47 @@
+package org.apache.maven.plugin.plugin;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.tools.plugin.generator.Generator;
+import org.apache.maven.tools.plugin.generator.PluginXdocGenerator;
+
+import java.io.File;
+
+/**
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ * @goal xdoc
+ */
+public class XdocGeneratorMojo
+ extends AbstractGeneratorMojo
+{
+ /**
+ * @parameter expression="${project.build.directory}/generated-xdocs"
+ * @required
+ */
+ protected File outputDirectory;
+
+ protected File getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+
+ protected Generator createGenerator()
+ {
+ return new PluginXdocGenerator();
+ }
+}
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java (original)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/MojoDefinitionTagLibrary.java Wed May 11 17:06:54 2005
@@ -43,7 +43,6 @@
registerTag( "expression", ParamExpressionTag.class );
registerTag( "type", ParamTypeTag.class );
registerTag( "default", ParamDefaultTag.class );
- registerTag( "validator", ParamValidatorTag.class );
registerTag( "required", ParamRequiredTag.class );
}
Modified: maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java?rev=169734&r1=169733&r2=169734&view=diff
==============================================================================
--- maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java (original)
+++ maven/components/trunk/maven-script/maven-script-marmalade/src/main/java/org/apache/maven/script/marmalade/tags/ParameterTag.java Wed May 11 17:06:54 2005
@@ -37,10 +37,6 @@
private String expression;
- private String validator;
-
- private String defaultVal;
-
private String deprecated;
private boolean required = true;
@@ -61,12 +57,10 @@
Parameter param = new Parameter();
param.setName( name );
- param.setDefaultValue( defaultVal );
param.setDescription( description );
param.setExpression( expression );
param.setRequired( required );
param.setType( type );
- param.setValidator( validator );
param.setDeprecated( deprecated );
return param;
@@ -92,14 +86,8 @@
this.expression = expression;
}
- public void setValidator( String validator )
- {
- this.validator = validator;
- }
-
public void setDefault( String defaultVal )
{
- this.defaultVal = defaultVal;
}
public void setRequired( boolean required )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org