Author: vsiveton
Date: Sun Aug 3 06:56:59 2008
New Revision: 682174
URL: http://svn.apache.org/viewvc?rev=682174&view=rev
Log:
o added @version
o reformat, no code change
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=682174&r1=682173&r2=682174&view=diff
==============================================================================
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
Sun Aug 3 06:56:59 2008
@@ -31,11 +31,13 @@
/**
* Lists the profiles which are currently active for this build.
*
+ * @version $Id: $
* @since 2.0
* @goal active-profiles
* @aggregator
*/
-public class ActiveProfilesMojo extends AbstractHelpMojo
+public class ActiveProfilesMojo
+ extends AbstractHelpMojo
{
/**
* This is the list of projects currently slated to be built by Maven.
@@ -117,10 +119,9 @@
{
Profile profile = (Profile) it.next();
- message.append( "\n - " )
- .append( profile.getId() )
- .append( " (source: " )
- .append( profile.getSource() ).append( ")" );
+ message.append( "\n - " ).append( profile.getId() ).append( "
(source: " ).append(
+
profile.getSource() ).append(
+
")" );
}
}
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=682174&r1=682173&r2=682174&view=diff
==============================================================================
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
Sun Aug 3 06:56:59 2008
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -316,7 +315,7 @@
else
{
throw new MojoFailureException(
- "You must either specify \'groupId\' and \'artifactId\', or a
valid \'plugin\' parameter." );
+ "You must either specify
\'groupId\' and \'artifactId\', or a valid \'plugin\' parameter." );
}
if ( descriptor == null && forLookup != null )
@@ -327,18 +326,18 @@
}
catch ( ArtifactResolutionException e )
{
- throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'" + groupId
- + "\'\nartifactId: \'" + artifactId + "\'\nversion: \'" +
version + "\'\n\n", e );
+ throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'"
+ + groupId + "\'\nartifactId: \'" + artifactId +
"\'\nversion: \'" + version + "\'\n\n", e );
}
catch ( PluginManagerException e )
{
- throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'" + groupId
- + "\'\nartifactId: \'" + artifactId + "\'\nversion: \'" +
version + "\'\n\n", e );
+ throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'"
+ + groupId + "\'\nartifactId: \'" + artifactId +
"\'\nversion: \'" + version + "\'\n\n", e );
}
catch ( PluginVersionResolutionException e )
{
- throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'" + groupId
- + "\'\nartifactId: \'" + artifactId + "\'\nversion: \'" +
version + "\'\n\n", e );
+ throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'"
+ + groupId + "\'\nartifactId: \'" + artifactId +
"\'\nversion: \'" + version + "\'\n\n", e );
}
catch ( ArtifactNotFoundException e )
{
@@ -346,13 +345,13 @@
}
catch ( InvalidVersionSpecificationException e )
{
- throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'" + groupId
- + "\'\nartifactId: \'" + artifactId + "\'\nversion: \'" +
version + "\'\n\n", e );
+ throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'"
+ + groupId + "\'\nartifactId: \'" + artifactId +
"\'\nversion: \'" + version + "\'\n\n", e );
}
catch ( InvalidPluginException e )
{
- throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'" + groupId
- + "\'\nartifactId: \'" + artifactId + "\'\nversion: \'" +
version + "\'\n\n", e );
+ throw new MojoExecutionException( "Error retrieving plugin
descriptor for:\n\ngroupId: \'"
+ + groupId + "\'\nartifactId: \'" + artifactId +
"\'\nversion: \'" + version + "\'\n\n", e );
}
catch ( PluginNotFoundException e )
{
@@ -412,7 +411,7 @@
break;
default:
throw new MojoFailureException(
- "plugin parameter must be a plugin prefix, or
conform to: 'groupId:artifactId[:version]." );
+ "plugin parameter must
be a plugin prefix, or conform to: 'groupId:artifactId[:version]." );
}
}
else
@@ -717,7 +716,8 @@
if ( deprecation != null )
{
- buffer.append( "\n\nNOTE: This parameter is deprecated.\n"
).append( deprecation ).append( "\n" );
+ buffer.append( "\n\nNOTE: This parameter is deprecated.\n"
).append( deprecation ).append(
+
"\n" );
}
buffer.append( "\n" );
@@ -764,19 +764,22 @@
if ( lifecycleMapping.getPhases( "default" ).get( key
) != null )
{
- descriptionBuffer.append(
lifecycleMapping.getPhases( "default" ).get( key ) ).append( "\n" );
+ descriptionBuffer.append(
lifecycleMapping.getPhases( "default" ).get( key ) ).append(
+
"\n" );
}
}
descriptionBuffer.append( "\n" );
descriptionBuffer.append(
"It is a part of the lifecycle
for the POM packaging '"
- + project.getPackaging() +
"'. This lifecycle includes the following phases:" ).append( "\n" );
+ + project.getPackaging()
+ + "'. This lifecycle
includes the following phases:" ).append(
+
"\n" );
for ( Iterator it = lifecycle.getPhases().iterator();
it.hasNext(); )
{
String key = (String) it.next();
- descriptionBuffer.append( "* " + key + ": ");
+ descriptionBuffer.append( "* " + key + ": " );
String value = (String) lifecycleMapping.getPhases(
"default" ).get( key );
if ( value != null )
{
@@ -784,7 +787,7 @@
{
descriptionBuffer.append(
tok.nextToken().trim() );
- if (!tok.hasMoreTokens())
+ if ( !tok.hasMoreTokens() )
{
descriptionBuffer.append( "\n" );
}
@@ -802,12 +805,13 @@
}
else
{
- descriptionBuffer.append( "'" + cmd + "' is a lifecycle
with the following phases: " ).append( "\n" );
+ descriptionBuffer.append( "'" + cmd + "' is a lifecycle
with the following phases: " ).append(
+
"\n" );
for ( Iterator it = lifecycle.getPhases().iterator();
it.hasNext(); )
{
String key = (String) it.next();
- descriptionBuffer.append( "* " + key + ": ");
+ descriptionBuffer.append( "* " + key + ": " );
if ( lifecycle.getDefaultPhases().get( key ) != null )
{
descriptionBuffer.append(
lifecycle.getDefaultPhases().get( key ) ).append( "\n" );
@@ -834,7 +838,7 @@
// goals
MojoDescriptor mojoDescriptor = getMojoDescriptor( cmd, session,
project, cmd, true, false );
- descriptionBuffer.append( "'" + cmd + "' is a plugin" ).append( ".\n"
);
+ descriptionBuffer.append( "'" + cmd + "' is a plugin" ).append( ".\n"
);
plugin = mojoDescriptor.getPluginDescriptor().getId();
return true;
@@ -871,8 +875,9 @@
MavenProject.class, String.class,
Boolean.TYPE, Boolean.TYPE } );
m.setAccessible( true );
- MojoDescriptor mojoDescriptor = (MojoDescriptor) m.invoke(
lifecycleExecutor, new Object[] { task, session, project,
- invokedVia, Boolean.valueOf( canUsePrefix ), Boolean.valueOf(
isOptionalMojo ) } );
+ MojoDescriptor mojoDescriptor =
+ (MojoDescriptor) m.invoke( lifecycleExecutor, new Object[] {
task, session, project, invokedVia,
+ Boolean.valueOf( canUsePrefix ), Boolean.valueOf(
isOptionalMojo ) } );
if ( mojoDescriptor == null )
{
throw new MojoExecutionException( "No MOJO exists for '" +
task + "'." );
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java?rev=682174&r1=682173&r2=682174&view=diff
==============================================================================
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
Sun Aug 3 06:56:59 2008
@@ -24,7 +24,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Date;
@@ -34,6 +33,7 @@
/**
* Display the effective POM for this build, with the active profiles factored
in.
*
+ * @version $Id: $
* @since 2.0
* @goal effective-pom
* @aggregator
@@ -153,6 +153,5 @@
{
throw new MojoExecutionException( "Cannot serialize POM to XML.",
e );
}
-
}
}
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java?rev=682174&r1=682173&r2=682174&view=diff
==============================================================================
---
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
(original)
+++
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
Sun Aug 3 06:56:59 2008
@@ -30,6 +30,7 @@
* Print out the calculated settings for this project, given any profile
enhancement and
* the inheritance of the global settings into the user-level settings.
*
+ * @version $Id: $
* @since 2.0
* @goal effective-settings
* @requiresProject false
