You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/09/20 04:08:17 UTC
svn commit: r577502 [1/2] - in
/maven/sandbox/trunk/archetypeng/archetype-plugin/src:
main/java/org/apache/maven/archetype/mojos/
main/java/org/apache/maven/archetype/mojos/registry/
main/resources/META-INF/maven/ test/projects/deep-inheritence/ test/p...
Author: jvanzyl
Date: Wed Sep 19 19:08:15 2007
New Revision: 577502
URL: http://svn.apache.org/viewvc?rev=577502&view=rev
Log:
o reformatting
Modified:
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CleanMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureCreationMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureGenerationMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/GenerateProjectMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/SamplePropertiesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddLanguagesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddRepositoriesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/RemoveExtensionsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/RemoveGroupsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/RemoveLanguagesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/RemoveRepositoriesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowExtensionsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowGroupsMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowLanguagesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/ShowRepositoriesMojo.java
maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/resources/META-INF/maven/lifecycle.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml
maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/pom.xml
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/AddArchetypeMetadataMojo.java Wed Sep 19 19:08:15 2007
@@ -33,11 +33,11 @@
* installation and deployment. The first use-case for this is to add the LATEST metadata (which is
* plugin-specific) for shipping alongside the plugin's artifact.
*
- * @phase package
- * @goal add-archetype-metadata
+ * @phase package
+ * @goal add-archetype-metadata
*/
public class AddArchetypeMetadataMojo
-extends AbstractMojo
+ extends AbstractMojo
{
/**
* The prefix for the plugin goal.
@@ -49,42 +49,43 @@
/**
* The project artifact, which should have the LATEST metadata added to it.
*
- * @parameter expression="${project}"
+ * @parameter expression="${project}"
* @required
* @readonly
*/
private MavenProject project;
- public void execute ()
- throws MojoExecutionException
+ public void execute()
+ throws
+ MojoExecutionException
{
- Artifact projectArtifact = project.getArtifact ();
+ Artifact projectArtifact = project.getArtifact();
- Versioning versioning = new Versioning ();
- versioning.setLatest ( projectArtifact.getVersion () );
- versioning.updateTimestamp ();
+ Versioning versioning = new Versioning();
+ versioning.setLatest( projectArtifact.getVersion() );
+ versioning.updateTimestamp();
ArtifactRepositoryMetadata metadata =
- new ArtifactRepositoryMetadata ( projectArtifact, versioning );
- projectArtifact.addMetadata ( metadata );
+ new ArtifactRepositoryMetadata( projectArtifact, versioning );
+ projectArtifact.addMetadata( metadata );
GroupRepositoryMetadata groupMetadata =
- new GroupRepositoryMetadata ( project.getGroupId () );
- groupMetadata.addPluginMapping (
- getGoalPrefix (),
- project.getArtifactId (),
- project.getName ()
+ new GroupRepositoryMetadata( project.getGroupId() );
+ groupMetadata.addPluginMapping(
+ getGoalPrefix(),
+ project.getArtifactId(),
+ project.getName()
);
- projectArtifact.addMetadata ( groupMetadata );
+ projectArtifact.addMetadata( groupMetadata );
}
- private String getGoalPrefix ()
+ private String getGoalPrefix()
{
if ( goalPrefix == null )
{
// goalPrefix = PluginDescriptor.getGoalPrefixFromArtifactId( project.getArtifactId () );
- goalPrefix = project.getArtifactId ();
+ goalPrefix = project.getArtifactId();
}
return goalPrefix;
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CleanMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CleanMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CleanMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CleanMojo.java Wed Sep 19 19:08:15 2007
@@ -28,23 +28,25 @@
/**
* Clean archetype properties file.
*
- * @author rafale
- * @requiresProject false
- * @goal clean
+ * @author rafale
+ * @requiresProject false
+ * @goal clean
*/
public class CleanMojo
-extends AbstractMojo
+ extends AbstractMojo
{
/**
* The property file to delete.
*
- * @parameter default-value="archetype.properties" expression="${archetype.properties}"
+ * @parameter default-value="archetype.properties" expression="${archetype.properties}"
*/
private File propertyFile;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
- propertyFile.delete ();
+ propertyFile.delete();
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureCreationMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureCreationMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureCreationMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureCreationMojo.java Wed Sep 19 19:08:15 2007
@@ -34,48 +34,44 @@
/**
* Configure archetype's creation properties.
*
- * @author rafale
- * @requiresProject true
- * @goal configure-creation
+ * @author rafale
+ * @requiresProject true
+ * @goal configure-creation
*/
public class ConfigureCreationMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
- /**
- * @component
- */
+ /** @component */
ArchetypeCreationConfigurator configurator;
/**
* Languages directories which are checked for project's sources main package.
*
- * @parameter expression="${archetype.languages}"
+ * @parameter expression="${archetype.languages}"
*/
private String archetypeLanguages;
/**
* The location of the registry file.
*
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
/**
* Enable the interactive mode to define the archetype from the project.
*
- * @parameter expression="${interactive}" default-value="false"
+ * @parameter expression="${interactive}" default-value="false"
*/
private boolean interactive;
/**
* The maven Project to create an archetype from.
*
- * @parameter expression="${project}"
+ * @parameter expression="${project}"
* @required
* @readonly
*/
@@ -84,7 +80,7 @@
/**
* The property file that holds the plugin configuration.
*
- * @parameter default-value="target/archetype.properties" expression="${archetype.properties}"
+ * @parameter default-value="target/archetype.properties" expression="${archetype.properties}"
*/
private File propertyFile;
@@ -95,32 +91,34 @@
// */
// private Settings settings;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
try
{
- if (propertyFile != null)
+ if ( propertyFile != null )
{
propertyFile.getParentFile().mkdirs();
}
List languages =
- archetypeRegistryManager.getLanguages ( archetypeLanguages, archetypeRegistryFile );
+ archetypeRegistryManager.getLanguages( archetypeLanguages, archetypeRegistryFile );
- configurator.configureArchetypeCreation (
+ configurator.configureArchetypeCreation(
project,
- new Boolean ( interactive ),
+ new Boolean( interactive ),
// settings.getInteractiveMode (),
- System.getProperties (),
+ System.getProperties(),
propertyFile,
languages
);
- getLog ().info ( "Archetype created in target/generated-sources/archetypeng" );
+ getLog().info( "Archetype created in target/generated-sources/archetypeng" );
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureGenerationMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureGenerationMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureGenerationMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/ConfigureGenerationMojo.java Wed Sep 19 19:08:15 2007
@@ -34,34 +34,30 @@
/**
* Configure archetype's properties.
*
- * @author rafale
- * @requiresProject false
- * @goal configure-generation
+ * @author rafale
+ * @requiresProject false
+ * @goal configure-generation
*/
public class ConfigureGenerationMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
- /**
- * @component
- */
+ /** @component */
ArchetypeGenerationConfigurator configurator;
/**
* The location of the registry file.
*
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
/**
* Local maven repository.
*
- * @parameter expression="${localRepository}"
+ * @parameter expression="${localRepository}"
* @required
* @readonly
*/
@@ -71,7 +67,7 @@
* Remote repositories defined in the project's pom (used only when called from an existing
* project).
*
- * @parameter expression="${project.remoteArtifactRepositories}"
+ * @parameter expression="${project.remoteArtifactRepositories}"
* @required
* @readonly
*/
@@ -80,49 +76,51 @@
/**
* The property file that holds the plugin configuration.
*
- * @parameter default-value="archetype.properties" expression="${archetype.properties}"
+ * @parameter default-value="archetype.properties" expression="${archetype.properties}"
*/
private File propertyFile = null;
/**
* Other remote repositories available for discovering dependencies and extensions.
*
- * @parameter expression="${remoteRepositories}"
+ * @parameter expression="${remoteRepositories}"
*/
private String remoteRepositories;
/**
* User settings use to check the interactiveMode.
*
- * @parameter expression="${settings}"
+ * @parameter expression="${settings}"
* @required
* @readonly
*/
private Settings settings;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
try
{
List repositories =
- archetypeRegistryManager.getRepositories (
+ archetypeRegistryManager.getRepositories(
pomRemoteRepositories,
remoteRepositories,
archetypeRegistryFile
);
- configurator.configureArchetype (
- settings.getInteractiveMode (),
+ configurator.configureArchetype(
+ settings.getInteractiveMode(),
propertyFile,
- System.getProperties (),
+ System.getProperties(),
localRepository,
repositories
);
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java Wed Sep 19 19:08:15 2007
@@ -26,21 +26,26 @@
/**
* Creates sample archetype from current project.
* It delegates to the two mojos of the create lifecycle: configure-creation, create-archetype
- * @author rafale
- * @requiresProject true
- * @goal create-from-project
- * @execute phase="generate-sources" lifecycle="create"
+ *
+ * @author rafale
+ * @requiresProject true
+ * @goal create-from-project
+ * @execute phase="generate-sources" lifecycle="create"
*/
public class CreateArchetypeFromProjectMojo
-extends AbstractMojo
+ extends AbstractMojo
{
/**
* dummy parameter used to fulfill the maven-plugin-plugin
+ *
* @parameter
*/
private String dummy;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
- { }
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
+ {
+ }
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeMojo.java Wed Sep 19 19:08:15 2007
@@ -33,62 +33,58 @@
/**
* Create an archetype from a project.
*
- * @author rafale
- * @requiresProject true
- * @goal create-archetype
+ * @author rafale
+ * @requiresProject true
+ * @goal create-archetype
*/
public class CreateArchetypeMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
- /**
- * @component role-hint="fileset"
- */
+ /** @component role-hint="fileset" */
ArchetypeCreator creator;
/**
* File extensions which are checked for project's text files (vs binary files).
*
- * @parameter expression="${archetype.filteredExtentions}"
+ * @parameter expression="${archetype.filteredExtentions}"
*/
private String archetypeFilteredExtentions;
/**
* Directory names which are checked for project's sources main package.
*
- * @parameter expression="${archetype.languages}"
+ * @parameter expression="${archetype.languages}"
*/
private String archetypeLanguages;
/**
* The location of the registry file.
*
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
/**
* Velocity templates encoding.
*
- * @parameter default-value="UTF-8" expression="${archetype.encoding}"
+ * @parameter default-value="UTF-8" expression="${archetype.encoding}"
*/
private String defaultEncoding;
/**
* Ignore the replica creation.
*
- * @parameter expression="${archetype.ignoreReplica}"
+ * @parameter expression="${archetype.ignoreReplica}"
*/
private boolean ignoreReplica = true;
/**
* Create a partial archetype.
*
- * @parameter expression="${archetype.partialArchetype}"
+ * @parameter expression="${archetype.partialArchetype}"
*/
private boolean partialArchetype = false;
@@ -96,7 +92,7 @@
* Create pom's velocity templates with CDATA preservasion. This uses the String replaceAll
* method and risk to have some overly replacement capabilities (beware of '1.0' value).
*
- * @parameter expression="${archetype.preserveCData}"
+ * @parameter expression="${archetype.preserveCData}"
*/
private boolean preserveCData = false;
@@ -104,14 +100,14 @@
* Poms in archetype are created with their initial parent.
* This property is ignored when preserveCData is true.
*
- * @parameter expression="${archetype.keepParent}"
+ * @parameter expression="${archetype.keepParent}"
*/
private boolean keepParent = true;
/**
* The maven Project to create an archetype from.
*
- * @parameter expression="${project}"
+ * @parameter expression="${project}"
* @required
* @readonly
*/
@@ -120,30 +116,32 @@
/**
* The property file that holds the plugin configuration.
*
- * @parameter default-value="target/archetype.properties" expression="${archetype.properties}"
+ * @parameter default-value="target/archetype.properties" expression="${archetype.properties}"
*/
private File propertyFile;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
try
{
- if (propertyFile != null)
+ if ( propertyFile != null )
{
propertyFile.getParentFile().mkdirs();
}
List languages =
- archetypeRegistryManager.getLanguages ( archetypeLanguages, archetypeRegistryFile );
+ archetypeRegistryManager.getLanguages( archetypeLanguages, archetypeRegistryFile );
List filtereds =
- archetypeRegistryManager.getFilteredExtensions (
+ archetypeRegistryManager.getFilteredExtensions(
archetypeFilteredExtentions,
archetypeRegistryFile
);
- creator.createArchetype (
+ creator.createArchetype(
project,
propertyFile,
languages,
@@ -158,7 +156,7 @@
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java Wed Sep 19 19:08:15 2007
@@ -55,7 +55,7 @@
/** @parameter expression="${basedir}" */
private File basedir;
- /**
+ /**
* Additional goals that can be specified by the user during the creation of the archetype.
*
* @parameter expression="${goals}"
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/GenerateProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/GenerateProjectMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/GenerateProjectMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/GenerateProjectMojo.java Wed Sep 19 19:08:15 2007
@@ -43,7 +43,7 @@
public class GenerateProjectMojo
extends AbstractMojo
implements ContextEnabled
-
+
{
/** @component */
ArchetypeRegistryManager archetypeRegistryManager;
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java Wed Sep 19 19:08:15 2007
@@ -50,22 +50,20 @@
/**
* Execute the archetype integration tests.
*
- * @author rafale
- * @requiresProject true
- * @goal integration-test
+ * @author rafale
+ * @requiresProject true
+ * @goal integration-test
*/
public class IntegrationTestMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
FilesetArchetypeGenerator filesetGenerator;
/**
* The archetype project to execute the integration tests on.
*
- * @parameter expression="${project}"
+ * @parameter expression="${project}"
* @required
* @readonly
*/
@@ -74,234 +72,248 @@
/**
* Skip the integration test.
*
- * @parameter expression="${archetype.test.skip}"
+ * @parameter expression="${archetype.test.skip}"
* @readonly
*/
private boolean skip = false;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
if ( !skip )
{
try
{
File projectsDirectory =
- new File ( project.getBasedir (), "target/test-classes/projects" );
+ new File( project.getBasedir(), "target/test-classes/projects" );
- if ( projectsDirectory.exists () )
+ if ( projectsDirectory.exists() )
{
- File archetypeFile = project.getArtifact ().getFile ();
+ File archetypeFile = project.getArtifact().getFile();
List projectsGoalFiles =
- FileUtils.getFiles ( projectsDirectory, "*/goal.txt", "" );
+ FileUtils.getFiles( projectsDirectory, "*/goal.txt", "" );
- Iterator goalFiles = projectsGoalFiles.iterator ();
+ Iterator goalFiles = projectsGoalFiles.iterator();
- StringWriter errorWriter = new StringWriter ();
- while ( goalFiles.hasNext () )
+ StringWriter errorWriter = new StringWriter();
+ while ( goalFiles.hasNext() )
{
- File goalFile = (File) goalFiles.next ();
+ File goalFile = (File) goalFiles.next();
try
{
- processIntegrationTest ( goalFile, archetypeFile );
+ processIntegrationTest( goalFile, archetypeFile );
}
catch ( IntegrationTestFailure ex )
{
- errorWriter.write (
- "Test " + goalFile.getParentFile ().getName () + " failed\n"
+ errorWriter.write(
+ "Test " + goalFile.getParentFile().getName() + " failed\n"
);
- errorWriter.write ( ex.getStackTrace () + "\n" );
- errorWriter.write ( ex.getMessage () + "\n" );
- errorWriter.write ( "\n" );
+ errorWriter.write( ex.getStackTrace() + "\n" );
+ errorWriter.write( ex.getMessage() + "\n" );
+ errorWriter.write( "\n" );
}
}
- String errors = errorWriter.toString ();
- if ( !StringUtils.isEmpty ( errors ) )
+ String errors = errorWriter.toString();
+ if ( !StringUtils.isEmpty( errors ) )
{
- throw new MojoExecutionException ( errors );
+ throw new MojoExecutionException( errors );
}
}
}
catch ( IOException ex )
{
- throw new MojoFailureException ( ex, ex.getMessage (), ex.getMessage () );
+ throw new MojoFailureException( ex, ex.getMessage(), ex.getMessage() );
}
}
}
- private void assertTest ( File reference, File basedir )
- throws IntegrationTestFailure, IOException
+ private void assertTest( File reference,
+ File basedir )
+ throws
+ IntegrationTestFailure,
+ IOException
{
- List referenceFiles = FileUtils.getFileNames ( reference, "**", null, false );
- List projectFiles = FileUtils.getFileNames ( basedir, "**", null, false );
+ List referenceFiles = FileUtils.getFileNames( reference, "**", null, false );
+ List projectFiles = FileUtils.getFileNames( basedir, "**", null, false );
boolean fileNamesEquals =
- CollectionUtils.isEqualCollection ( referenceFiles, projectFiles );
+ CollectionUtils.isEqualCollection( referenceFiles, projectFiles );
{
- Iterator refs = referenceFiles.iterator ();
- while ( refs.hasNext () )
+ Iterator refs = referenceFiles.iterator();
+ while ( refs.hasNext() )
{
- String ref = (String) refs.next ();
+ String ref = (String) refs.next();
- if ( projectFiles.contains ( ref ) )
+ if ( projectFiles.contains( ref ) )
{
- projectFiles.remove ( ref );
- getLog ().debug ( "Contained " + ref );
+ projectFiles.remove( ref );
+ getLog().debug( "Contained " + ref );
}
else
{
- getLog ().debug ( "Not contained " + ref );
+ getLog().debug( "Not contained " + ref );
}
}
- getLog ().debug ( "Remains " + projectFiles );
+ getLog().debug( "Remains " + projectFiles );
}
if ( !fileNamesEquals )
{
- throw new IntegrationTestFailure ( "Reference and generated project differs" );
+ throw new IntegrationTestFailure( "Reference and generated project differs" );
}
boolean contentEquals = true;
- Iterator files = referenceFiles.iterator ();
- while ( files.hasNext () )
+ Iterator files = referenceFiles.iterator();
+ while ( files.hasNext() )
{
- String file = (String) files.next ();
+ String file = (String) files.next();
- if ( file.endsWith ( "pom.xml" ) )
+ if ( file.endsWith( "pom.xml" ) )
{
- if ( !modelEquals ( new File ( reference, file ), new File ( basedir, file ) ) )
+ if ( !modelEquals( new File( reference, file ), new File( basedir, file ) ) )
{
- getLog ().warn ( "Contents of file " + file + " are not equal" );
+ getLog().warn( "Contents of file " + file + " are not equal" );
contentEquals = false;
}
}
else
{
- if ( !FileUtils.contentEquals (
- new File ( reference, file ),
- new File ( basedir, file )
- )
+ if ( !FileUtils.contentEquals(
+ new File( reference, file ),
+ new File( basedir, file )
)
+ )
{
- getLog ().warn ( "Contents of file " + file + " are not equal" );
+ getLog().warn( "Contents of file " + file + " are not equal" );
contentEquals = false;
}
}
}
if ( !contentEquals )
{
- throw new IntegrationTestFailure ( "Some content are not equals" );
+ throw new IntegrationTestFailure( "Some content are not equals" );
}
}
- private Properties loadProperties ( final File propertiesFile )
- throws IOException, FileNotFoundException
+ private Properties loadProperties( final File propertiesFile )
+ throws
+ IOException,
+ FileNotFoundException
{
- Properties properties = new Properties ();
+ Properties properties = new Properties();
- properties.load ( new FileInputStream ( propertiesFile ) );
+ properties.load( new FileInputStream( propertiesFile ) );
return properties;
}
- private boolean modelEquals ( File referencePom, File generatedPom )
- throws IOException
+ private boolean modelEquals( File referencePom,
+ File generatedPom )
+ throws
+ IOException
{
- return FileUtils.contentEquals ( referencePom, generatedPom );
+ return FileUtils.contentEquals( referencePom, generatedPom );
}
- private void processIntegrationTest ( File goalFile, File archetypeFile )
- throws IntegrationTestFailure
+ private void processIntegrationTest( File goalFile,
+ File archetypeFile )
+ throws
+ IntegrationTestFailure
{
try
{
- Properties testProperties = getTestProperties ( goalFile );
+ Properties testProperties = getTestProperties( goalFile );
- Properties properties = getProperties ( goalFile );
+ Properties properties = getProperties( goalFile );
- String basedir = goalFile.getParentFile ().getPath () + "/project";
+ String basedir = goalFile.getParentFile().getPath() + "/project";
- FileUtils.mkdir ( basedir );
+ FileUtils.mkdir( basedir );
- filesetGenerator.generateArchetype ( properties, archetypeFile, basedir );
+ filesetGenerator.generateArchetype( properties, archetypeFile, basedir );
- File reference = new File ( goalFile.getParentFile (), "reference" );
+ File reference = new File( goalFile.getParentFile(), "reference" );
- assertTest (
+ assertTest(
reference,
- new File ( basedir, properties.getProperty ( Constants.ARTIFACT_ID ) )
+ new File( basedir, properties.getProperty( Constants.ARTIFACT_ID ) )
);
}
catch ( ArchetypeNotConfigured ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
catch ( UnknownArchetype ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
catch ( PomFileExists ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
catch ( ProjectDirectoryExists ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
catch ( ArchetypeGenerationFailure ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
catch ( IOException ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
catch ( OutputFileExists ex )
{
- throw new IntegrationTestFailure ( ex );
+ throw new IntegrationTestFailure( ex );
}
}
- private Properties getProperties ( File goalFile )
- throws IOException
+ private Properties getProperties( File goalFile )
+ throws
+ IOException
{
- File propertiesFile = new File ( goalFile.getParentFile (), "archetype.properties" );
+ File propertiesFile = new File( goalFile.getParentFile(), "archetype.properties" );
- return loadProperties ( propertiesFile );
+ return loadProperties( propertiesFile );
}
- private Properties getTestProperties ( File goalFile )
- throws IOException
+ private Properties getTestProperties( File goalFile )
+ throws
+ IOException
{
- return loadProperties ( goalFile );
+ return loadProperties( goalFile );
}
class IntegrationTestFailure
- extends Exception
+ extends Exception
{
- IntegrationTestFailure ()
+ IntegrationTestFailure()
{
- super ();
+ super();
}
- IntegrationTestFailure ( String message )
+ IntegrationTestFailure( String message )
{
- super ( message );
+ super( message );
}
- IntegrationTestFailure ( Throwable cause )
+ IntegrationTestFailure( Throwable cause )
{
- super ( cause );
+ super( cause );
}
- IntegrationTestFailure ( String message, Throwable cause )
+ IntegrationTestFailure( String message,
+ Throwable cause )
{
- super ( message, cause );
+ super( message, cause );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java Wed Sep 19 19:08:15 2007
@@ -32,37 +32,38 @@
/**
* Create a jar archive from an archetype directory.
- * @author rafale
- * @goal jar
- * @phase package
+ *
+ * @author rafale
+ * @goal jar
+ * @phase package
* @requiresProject
*/
public class JarMojo
-extends AbstractMojo
+ extends AbstractMojo
{
/**
* Directory containing the classes.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter expression="${project.build.outputDirectory}"
* @required
*/
private File archetypeDirectory;
/**
* The maven archive configuration to use.
- *
+ * <p/>
* <p>See <a
* href="http://maven.apache.org/ref/current/maven-archiver/apidocs/org/apache/maven/archiver/MavenArchiveConfiguration.html">
* the Javadocs for MavenArchiveConfiguration</a>.</p>
*
* @parameter
*/
- private MavenArchiveConfiguration archive = new MavenArchiveConfiguration ();
+ private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
/**
* Name of the generated JAR.
*
- * @parameter alias="jarName" expression="${project.build.finalName}"
+ * @parameter alias="jarName" expression="${project.build.finalName}"
* @required
*/
private String finalName;
@@ -70,7 +71,7 @@
/**
* The Jar archiver.
*
- * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
+ * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}"
* @required
*/
private JarArchiver jarArchiver;
@@ -78,7 +79,7 @@
/**
* Directory containing the generated JAR.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter expression="${project.build.directory}"
* @required
*/
private File outputDirectory;
@@ -86,55 +87,59 @@
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter expression="${project}"
* @required
* @readonly
*/
private MavenProject project;
- protected static File getJarFile ( File basedir, String finalName )
+ protected static File getJarFile( File basedir,
+ String finalName )
{
- return new File ( basedir, finalName + ".jar" );
+ return new File( basedir, finalName + ".jar" );
}
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
- File jarFile = createArchive ();
- project.getArtifact ().setFile ( jarFile );
+ File jarFile = createArchive();
+ project.getArtifact().setFile( jarFile );
}
- private File createArchive ()
- throws MojoExecutionException
+ private File createArchive()
+ throws
+ MojoExecutionException
{
- File jarFile = getJarFile ( outputDirectory, finalName );
+ File jarFile = getJarFile( outputDirectory, finalName );
- MavenArchiver archiver = new MavenArchiver ();
+ MavenArchiver archiver = new MavenArchiver();
- archiver.setArchiver ( jarArchiver );
+ archiver.setArchiver( jarArchiver );
- archiver.setOutputFile ( jarFile );
+ archiver.setOutputFile( jarFile );
- archive.setForced ( true );
+ archive.setForced( true );
try
{
- if ( !archetypeDirectory.exists () )
+ if ( !archetypeDirectory.exists() )
{
- getLog ().warn ( "JAR will be empty - no content was marked for inclusion!" );
+ getLog().warn( "JAR will be empty - no content was marked for inclusion!" );
}
else
{
- archiver.getArchiver ().addDirectory ( archetypeDirectory );
+ archiver.getArchiver().addDirectory( archetypeDirectory );
}
- archiver.createArchive ( project, archive );
+ archiver.createArchive( project, archive );
return jarFile;
}
catch ( Exception e )
{
- throw new MojoExecutionException ( "Error assembling JAR", e );
+ throw new MojoExecutionException( "Error assembling JAR", e );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/SamplePropertiesMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/SamplePropertiesMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/SamplePropertiesMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/SamplePropertiesMojo.java Wed Sep 19 19:08:15 2007
@@ -49,44 +49,36 @@
* Creates a sample archetype.properties file using default values taken from the specified
* archetype.
*
- * @author rafale
- * @requiresProject false
- * @goal sample-properties
+ * @author rafale
+ * @requiresProject false
+ * @goal sample-properties
*/
public class SamplePropertiesMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
- /**
- * @component
- */
+ /** @component */
private ArchetypeArtifactManager archetypeArtifactManager;
- /**
- * @component
- */
+ /** @component */
private ArchetypeFactory archetypeFactory;
- /**
- * @component
- */
+ /** @component */
private ArchetypePropertiesManager archetypePropertiesManager;
/**
* The location of the registry file.
*
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
/**
* Local maven repository.
*
- * @parameter expression="${localRepository}"
+ * @parameter expression="${localRepository}"
* @required
* @readonly
*/
@@ -96,7 +88,7 @@
* Remote repositories defined in the project's pom (used only when called from an existing
* project).
*
- * @parameter expression="${project.remoteArtifactRepositories}"
+ * @parameter expression="${project.remoteArtifactRepositories}"
* @required
* @readonly
*/
@@ -105,164 +97,168 @@
/**
* The property file that holds the plugin configuration, which will be created.
*
- * @parameter default-value="archetype.properties" expression="${archetype.properties}"
+ * @parameter default-value="archetype.properties" expression="${archetype.properties}"
*/
private File propertyFile = null;
/**
* Other remote repositories available for discovering dependencies and extensions.
*
- * @parameter expression="${remoteRepositories}"
+ * @parameter expression="${remoteRepositories}"
*/
private String remoteRepositories;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
try
{
List repositories =
- archetypeRegistryManager.getRepositories (
+ archetypeRegistryManager.getRepositories(
pomRemoteRepositories,
remoteRepositories,
archetypeRegistryFile
);
Properties properties =
- initialiseArchetypeProperties ( System.getProperties (), propertyFile );
+ initialiseArchetypeProperties( System.getProperties(), propertyFile );
ArchetypeDefinition archetypeDefinition =
- archetypeFactory.createArchetypeDefinition ( properties );
- if ( !archetypeDefinition.isDefined () )
+ archetypeFactory.createArchetypeDefinition( properties );
+ if ( !archetypeDefinition.isDefined() )
{
- throw new ArchetypeNotDefined ( "The archetype is not defined" );
+ throw new ArchetypeNotDefined( "The archetype is not defined" );
}
- if ( !archetypeArtifactManager.exists (
- archetypeDefinition.getGroupId (),
- archetypeDefinition.getArtifactId (),
- archetypeDefinition.getVersion (),
- localRepository,
- repositories
- )
+ if ( !archetypeArtifactManager.exists(
+ archetypeDefinition.getGroupId(),
+ archetypeDefinition.getArtifactId(),
+ archetypeDefinition.getVersion(),
+ localRepository,
+ repositories
)
+ )
{
- throw new UnknownArchetype (
- "The desired archetype does not exist (" + archetypeDefinition.getGroupId ()
- + ":" + archetypeDefinition.getArtifactId () + ":"
- + archetypeDefinition.getVersion ()
- + ")"
+ throw new UnknownArchetype(
+ "The desired archetype does not exist (" + archetypeDefinition.getGroupId()
+ + ":" + archetypeDefinition.getArtifactId() + ":"
+ + archetypeDefinition.getVersion()
+ + ")"
);
}
ArchetypeConfiguration archetypeConfiguration;
- if ( archetypeArtifactManager.isOldArchetype (
- archetypeDefinition.getGroupId (),
- archetypeDefinition.getArtifactId (),
- archetypeDefinition.getVersion (),
- localRepository,
- repositories
- )
+ if ( archetypeArtifactManager.isOldArchetype(
+ archetypeDefinition.getGroupId(),
+ archetypeDefinition.getArtifactId(),
+ archetypeDefinition.getVersion(),
+ localRepository,
+ repositories
)
+ )
{
org.apache.maven.archetype.descriptor.ArchetypeDescriptor archetypeDescriptor =
- archetypeArtifactManager.getOldArchetypeDescriptor (
- archetypeDefinition.getGroupId (),
- archetypeDefinition.getArtifactId (),
- archetypeDefinition.getVersion (),
+ archetypeArtifactManager.getOldArchetypeDescriptor(
+ archetypeDefinition.getGroupId(),
+ archetypeDefinition.getArtifactId(),
+ archetypeDefinition.getVersion(),
localRepository,
repositories
);
archetypeConfiguration =
- archetypeFactory.createArchetypeConfiguration (
+ archetypeFactory.createArchetypeConfiguration(
archetypeDescriptor,
properties
);
}
else if (
- archetypeArtifactManager.isFileSetArchetype (
- archetypeDefinition.getGroupId (),
- archetypeDefinition.getArtifactId (),
- archetypeDefinition.getVersion (),
+ archetypeArtifactManager.isFileSetArchetype(
+ archetypeDefinition.getGroupId(),
+ archetypeDefinition.getArtifactId(),
+ archetypeDefinition.getVersion(),
localRepository,
repositories
)
- )
+ )
{
org.apache.maven.archetype.metadata.ArchetypeDescriptor archetypeDescriptor =
- archetypeArtifactManager.getFileSetArchetypeDescriptor (
- archetypeDefinition.getGroupId (),
- archetypeDefinition.getArtifactId (),
- archetypeDefinition.getVersion (),
+ archetypeArtifactManager.getFileSetArchetypeDescriptor(
+ archetypeDefinition.getGroupId(),
+ archetypeDefinition.getArtifactId(),
+ archetypeDefinition.getVersion(),
localRepository,
repositories
);
archetypeConfiguration =
- archetypeFactory.createArchetypeConfiguration (
+ archetypeFactory.createArchetypeConfiguration(
archetypeDescriptor,
properties
);
}
else
{
- throw new ArchetypeGenerationConfigurationFailure (
+ throw new ArchetypeGenerationConfigurationFailure(
"The defined artifact is not an archetype"
);
}
- archetypeConfiguration.setProperty ( Constants.GROUP_ID, "com.company" );
- archetypeConfiguration.setProperty ( Constants.ARTIFACT_ID, "project" );
- archetypeConfiguration.setProperty ( Constants.VERSION, "1.0-SNAPSHOT" );
- archetypeConfiguration.setProperty ( Constants.PACKAGE, "com.company.project" );
+ archetypeConfiguration.setProperty( Constants.GROUP_ID, "com.company" );
+ archetypeConfiguration.setProperty( Constants.ARTIFACT_ID, "project" );
+ archetypeConfiguration.setProperty( Constants.VERSION, "1.0-SNAPSHOT" );
+ archetypeConfiguration.setProperty( Constants.PACKAGE, "com.company.project" );
Iterator requiredProperties =
- archetypeConfiguration.getRequiredProperties ().iterator ();
- while ( requiredProperties.hasNext () )
+ archetypeConfiguration.getRequiredProperties().iterator();
+ while ( requiredProperties.hasNext() )
{
- String requiredProperty = (String) requiredProperties.next ();
+ String requiredProperty = (String) requiredProperties.next();
- if ( StringUtils.isEmpty ( archetypeConfiguration.getProperty ( requiredProperty ) )
- )
+ if ( StringUtils.isEmpty( archetypeConfiguration.getProperty( requiredProperty ) )
+ )
{
- archetypeConfiguration.setProperty (
+ archetypeConfiguration.setProperty(
requiredProperty,
- StringUtils.isEmpty (
- archetypeConfiguration.getDefaultValue ( requiredProperty )
+ StringUtils.isEmpty(
+ archetypeConfiguration.getDefaultValue( requiredProperty )
) ? "To be defined"
- : archetypeConfiguration.getDefaultValue ( requiredProperty )
+ : archetypeConfiguration.getDefaultValue( requiredProperty )
);
}
}
- archetypePropertiesManager.writeProperties (
- archetypeConfiguration.toProperties (),
+ archetypePropertiesManager.writeProperties(
+ archetypeConfiguration.toProperties(),
propertyFile
);
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
- private Properties initialiseArchetypeProperties (
+ private Properties initialiseArchetypeProperties(
Properties commandLineProperties,
File propertyFile
)
- throws FileNotFoundException, IOException
+ throws
+ FileNotFoundException,
+ IOException
{
- Properties properties = new Properties ();
- archetypePropertiesManager.readProperties ( properties, propertyFile );
+ Properties properties = new Properties();
+ archetypePropertiesManager.readProperties( properties, propertyFile );
Iterator commandLinePropertiesIterator =
- new ArrayList ( commandLineProperties.keySet () ).iterator ();
- while ( commandLinePropertiesIterator.hasNext () )
+ new ArrayList( commandLineProperties.keySet() ).iterator();
+ while ( commandLinePropertiesIterator.hasNext() )
{
- String propertyKey = (String) commandLinePropertiesIterator.next ();
- properties.setProperty (
+ String propertyKey = (String) commandLinePropertiesIterator.next();
+ properties.setProperty(
propertyKey,
- commandLineProperties.getProperty ( propertyKey )
+ commandLineProperties.getProperty( propertyKey )
);
}
return properties;
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddExtensionsMojo.java Wed Sep 19 19:08:15 2007
@@ -40,93 +40,97 @@
* The registered filtered extensions are used to discriminate
* text files from binary files based on their file extension
* during create-from-project.
- * @author rafale
- * @requiresProject false
- * @goal add-extensions
+ *
+ * @author rafale
+ * @requiresProject false
+ * @goal add-extensions
*/
public class AddExtensionsMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
/**
* The filtered extension to add to the registry.
- *
+ * <p/>
* This option is mutually exclusive with extensions.
- * @parameter expression="${extension}"
+ *
+ * @parameter expression="${extension}"
*/
String extension;
/**
* The filtered extensions to add to the registry: ext1,ext2,...
- *
+ * <p/>
* This option is mutually exclusive with extension.
- * @parameter expression="${extensions}"
+ *
+ * @parameter expression="${extensions}"
*/
String extensions;
/**
* The location of the registry file.
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ *
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
- if ( StringUtils.isEmpty ( extension ) && StringUtils.isEmpty ( extensions ) )
+ if ( StringUtils.isEmpty( extension ) && StringUtils.isEmpty( extensions ) )
{
- throw new MojoFailureException ( "-Dextension or -Dextensions must be set" );
+ throw new MojoFailureException( "-Dextension or -Dextensions must be set" );
}
- else if ( StringUtils.isNotEmpty ( extension ) && StringUtils.isNotEmpty ( extensions ) )
+ else if ( StringUtils.isNotEmpty( extension ) && StringUtils.isNotEmpty( extensions ) )
{
- throw new MojoFailureException ( "Only one of -Dextension or -Dextensions can be set" );
+ throw new MojoFailureException( "Only one of -Dextension or -Dextensions can be set" );
}
try
{
- List extensionsToAdd = new ArrayList ();
- if ( StringUtils.isNotEmpty ( extension ) )
+ List extensionsToAdd = new ArrayList();
+ if ( StringUtils.isNotEmpty( extension ) )
{
- extensionsToAdd.add ( extension );
+ extensionsToAdd.add( extension );
}
else
{
- extensionsToAdd.addAll ( Arrays.asList ( StringUtils.split ( extensions, "," ) ) );
+ extensionsToAdd.addAll( Arrays.asList( StringUtils.split( extensions, "," ) ) );
}
ArchetypeRegistry registry;
try
{
- registry = archetypeRegistryManager.readArchetypeRegistry(archetypeRegistryFile);
+ registry = archetypeRegistryManager.readArchetypeRegistry( archetypeRegistryFile );
}
- catch (FileNotFoundException ex)
+ catch ( FileNotFoundException ex )
{
registry = archetypeRegistryManager.getDefaultArchetypeRegistry();
}
- Iterator extensionsToAddIterator = extensionsToAdd.iterator ();
- while ( extensionsToAddIterator.hasNext () )
+ Iterator extensionsToAddIterator = extensionsToAdd.iterator();
+ while ( extensionsToAddIterator.hasNext() )
{
- String extensionToAdd = (String) extensionsToAddIterator.next ();
- if ( registry.getFilteredExtensions ().contains ( extensionToAdd ) )
+ String extensionToAdd = (String) extensionsToAddIterator.next();
+ if ( registry.getFilteredExtensions().contains( extensionToAdd ) )
{
- getLog ().debug ( "Extension " + extensionToAdd + " already exists" );
+ getLog().debug( "Extension " + extensionToAdd + " already exists" );
}
else
{
- registry.addFilteredExtension ( extensionToAdd.trim () );
- getLog ().debug ( "Extension " + extensionToAdd + " added" );
+ registry.addFilteredExtension( extensionToAdd.trim() );
+ getLog().debug( "Extension " + extensionToAdd + " added" );
}
}
- archetypeRegistryManager.writeArchetypeRegistry ( archetypeRegistryFile, registry );
+ archetypeRegistryManager.writeArchetypeRegistry( archetypeRegistryFile, registry );
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddGroupsMojo.java Wed Sep 19 19:08:15 2007
@@ -38,93 +38,97 @@
/**
* Adds one or more groups in the registry.
* The registered repositories are searched to find archetypes of registered groups.
- * @author rafale
- * @requiresProject false
- * @goal add-groups
+ *
+ * @author rafale
+ * @requiresProject false
+ * @goal add-groups
*/
public class AddGroupsMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
/**
* The group to add to the registry.
- *
+ * <p/>
* This option is mutually exclusive with groups.
- * @parameter expression="${group}"
+ *
+ * @parameter expression="${group}"
*/
String group;
/**
* The groups to add to the registry: group1,group2,...
- *
+ * <p/>
* This option is mutually exclusive with group.
- * @parameter expression="${groups}"
+ *
+ * @parameter expression="${groups}"
*/
String groups;
/**
* The location of the registry file.
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ *
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
- if ( StringUtils.isEmpty ( group ) && StringUtils.isEmpty ( groups ) )
+ if ( StringUtils.isEmpty( group ) && StringUtils.isEmpty( groups ) )
{
- throw new MojoFailureException ( "-Dgroup or -Dgroups must be set" );
+ throw new MojoFailureException( "-Dgroup or -Dgroups must be set" );
}
- else if ( StringUtils.isNotEmpty ( group ) && StringUtils.isNotEmpty ( groups ) )
+ else if ( StringUtils.isNotEmpty( group ) && StringUtils.isNotEmpty( groups ) )
{
- throw new MojoFailureException ( "Only one of -Dgroup or -Dgroups can be set" );
+ throw new MojoFailureException( "Only one of -Dgroup or -Dgroups can be set" );
}
try
{
- List groupsToAdd = new ArrayList ();
- if ( StringUtils.isNotEmpty ( group ) )
+ List groupsToAdd = new ArrayList();
+ if ( StringUtils.isNotEmpty( group ) )
{
- groupsToAdd.add ( group );
+ groupsToAdd.add( group );
}
else
{
- groupsToAdd.addAll ( Arrays.asList ( StringUtils.split ( groups, "," ) ) );
+ groupsToAdd.addAll( Arrays.asList( StringUtils.split( groups, "," ) ) );
}
ArchetypeRegistry registry;
try
{
- registry = archetypeRegistryManager.readArchetypeRegistry(archetypeRegistryFile);
+ registry = archetypeRegistryManager.readArchetypeRegistry( archetypeRegistryFile );
}
- catch (FileNotFoundException ex)
+ catch ( FileNotFoundException ex )
{
registry = archetypeRegistryManager.getDefaultArchetypeRegistry();
}
- Iterator groupsToAddIterator = groupsToAdd.iterator ();
- while ( groupsToAddIterator.hasNext () )
+ Iterator groupsToAddIterator = groupsToAdd.iterator();
+ while ( groupsToAddIterator.hasNext() )
{
- String groupToAdd = (String) groupsToAddIterator.next ();
- if ( registry.getArchetypeGroups ().contains ( groupToAdd ) )
+ String groupToAdd = (String) groupsToAddIterator.next();
+ if ( registry.getArchetypeGroups().contains( groupToAdd ) )
{
- getLog ().debug ( "Group " + groupToAdd + " already exists" );
+ getLog().debug( "Group " + groupToAdd + " already exists" );
}
else
{
- registry.addArchetypeGroup ( groupToAdd.trim () );
- getLog ().debug ( "Group " + groupToAdd + " added" );
+ registry.addArchetypeGroup( groupToAdd.trim() );
+ getLog().debug( "Group " + groupToAdd + " added" );
}
}
- archetypeRegistryManager.writeArchetypeRegistry ( archetypeRegistryFile, registry );
+ archetypeRegistryManager.writeArchetypeRegistry( archetypeRegistryFile, registry );
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddLanguagesMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddLanguagesMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddLanguagesMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddLanguagesMojo.java Wed Sep 19 19:08:15 2007
@@ -40,93 +40,97 @@
* The registered language directories are used to discriminate
* packaging directories from unpackaged ones based on their name
* during create-from-project.
- * @author rafale
- * @requiresProject false
- * @goal add-languages
+ *
+ * @author rafale
+ * @requiresProject false
+ * @goal add-languages
*/
public class AddLanguagesMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
/**
* The language directory to add to the registry.
- *
+ * <p/>
* This option is mutually exclusive with language directories.
- * @parameter expression="${language}"
+ *
+ * @parameter expression="${language}"
*/
String language;
/**
* The language directories to add to the registry: lang1,lang2,...
- *
+ * <p/>
* This option is mutually exclusive with language directory.
- * @parameter expression="${languages}"
+ *
+ * @parameter expression="${languages}"
*/
String languages;
/**
* The location of the registry file.
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ *
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
- if ( StringUtils.isEmpty ( language ) && StringUtils.isEmpty ( languages ) )
+ if ( StringUtils.isEmpty( language ) && StringUtils.isEmpty( languages ) )
{
- throw new MojoFailureException ( "-Dlanguage or -Dlanguages must be set" );
+ throw new MojoFailureException( "-Dlanguage or -Dlanguages must be set" );
}
- else if ( StringUtils.isNotEmpty ( language ) && StringUtils.isNotEmpty ( languages ) )
+ else if ( StringUtils.isNotEmpty( language ) && StringUtils.isNotEmpty( languages ) )
{
- throw new MojoFailureException ( "Only one of -Dlanguage or -Dlanguages can be set" );
+ throw new MojoFailureException( "Only one of -Dlanguage or -Dlanguages can be set" );
}
try
{
- List languagesToAdd = new ArrayList ();
- if ( StringUtils.isNotEmpty ( language ) )
+ List languagesToAdd = new ArrayList();
+ if ( StringUtils.isNotEmpty( language ) )
{
- languagesToAdd.add ( language );
+ languagesToAdd.add( language );
}
else
{
- languagesToAdd.addAll ( Arrays.asList ( StringUtils.split ( languages, "," ) ) );
+ languagesToAdd.addAll( Arrays.asList( StringUtils.split( languages, "," ) ) );
}
ArchetypeRegistry registry;
try
{
- registry = archetypeRegistryManager.readArchetypeRegistry(archetypeRegistryFile);
+ registry = archetypeRegistryManager.readArchetypeRegistry( archetypeRegistryFile );
}
- catch (FileNotFoundException ex)
+ catch ( FileNotFoundException ex )
{
registry = archetypeRegistryManager.getDefaultArchetypeRegistry();
}
- Iterator languagesToAddIterator = languagesToAdd.iterator ();
- while ( languagesToAddIterator.hasNext () )
+ Iterator languagesToAddIterator = languagesToAdd.iterator();
+ while ( languagesToAddIterator.hasNext() )
{
- String languageToAdd = (String) languagesToAddIterator.next ();
- if ( registry.getLanguages ().contains ( languageToAdd ) )
+ String languageToAdd = (String) languagesToAddIterator.next();
+ if ( registry.getLanguages().contains( languageToAdd ) )
{
- getLog ().debug ( "Language " + languageToAdd + " already exists" );
+ getLog().debug( "Language " + languageToAdd + " already exists" );
}
else
{
- registry.addLanguage ( languageToAdd.trim () );
- getLog ().debug ( "Language " + languageToAdd + " added" );
+ registry.addLanguage( languageToAdd.trim() );
+ getLog().debug( "Language " + languageToAdd + " added" );
}
}
- archetypeRegistryManager.writeArchetypeRegistry ( archetypeRegistryFile, registry );
+ archetypeRegistryManager.writeArchetypeRegistry( archetypeRegistryFile, registry );
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}
Modified: maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddRepositoriesMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddRepositoriesMojo.java?rev=577502&r1=577501&r2=577502&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddRepositoriesMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/registry/AddRepositoriesMojo.java Wed Sep 19 19:08:15 2007
@@ -39,131 +39,136 @@
/**
* Adds one or more repositories in the registry.
* The registered repositories are searched to find archetypes of registered groups.
- * @author rafale
- * @requiresProject false
- * @goal add-repositories
+ *
+ * @author rafale
+ * @requiresProject false
+ * @goal add-repositories
*/
public class AddRepositoriesMojo
-extends AbstractMojo
+ extends AbstractMojo
{
- /**
- * @component
- */
+ /** @component */
ArchetypeRegistryManager archetypeRegistryManager;
/**
* The repositories to add to the registry: repo1Id=repo1Url,repo2Id=repo2Url,..
- *
+ * <p/>
* This option is mutually exclusive with repositoryId and repositoryUrl.
- * @parameter expression="${repositories}"
+ *
+ * @parameter expression="${repositories}"
*/
String repositories;
/**
* The Id of the repository to add to the registry.
- *
+ * <p/>
* This option is mutually exclusive with repositories
- * @parameter expression="${repositoryId}"
+ *
+ * @parameter expression="${repositoryId}"
*/
String repositoryId;
/**
* The URL of the repository to add to the registry.
- *
+ * <p/>
* This option is mutually exclusive with repositories
- * @parameter expression="${repositoryUrl}"
+ *
+ * @parameter expression="${repositoryUrl}"
*/
String repositoryUrl;
/**
* The location of the registry file.
- * @parameter expression="${user.home}/.m2/archetype.xml"
+ *
+ * @parameter expression="${user.home}/.m2/archetype.xml"
*/
private File archetypeRegistryFile;
- public void execute ()
- throws MojoExecutionException, MojoFailureException
+ public void execute()
+ throws
+ MojoExecutionException,
+ MojoFailureException
{
- if ( StringUtils.isEmpty ( repositoryId ) && StringUtils.isEmpty ( repositories ) )
+ if ( StringUtils.isEmpty( repositoryId ) && StringUtils.isEmpty( repositories ) )
{
- throw new MojoFailureException (
+ throw new MojoFailureException(
" (-DrepositoryId and -DrepositoryUrl) or -Drepositories must be set"
);
}
else if (
- StringUtils.isNotEmpty ( repositoryId )
- && StringUtils.isNotEmpty ( repositories )
- )
+ StringUtils.isNotEmpty( repositoryId )
+ && StringUtils.isNotEmpty( repositories )
+ )
{
- throw new MojoFailureException (
+ throw new MojoFailureException(
"Only one of (-DrepositoryId and -DrepositoryUrl) or -Drepositories can be set"
);
}
try
{
- List repositoriesToAdd = new ArrayList ();
- if ( StringUtils.isNotEmpty ( repositoryId )
- && StringUtils.isNotEmpty ( repositoryUrl )
- )
+ List repositoriesToAdd = new ArrayList();
+ if ( StringUtils.isNotEmpty( repositoryId )
+ && StringUtils.isNotEmpty( repositoryUrl )
+ )
{
- ArchetypeRepository repository = new ArchetypeRepository ();
+ ArchetypeRepository repository = new ArchetypeRepository();
- repository.setId ( repositoryId );
- repository.setUrl ( repositoryUrl );
+ repository.setId( repositoryId );
+ repository.setUrl( repositoryUrl );
- repositoriesToAdd.add ( repository );
+ repositoriesToAdd.add( repository );
}
else
{
Iterator repositoriesDefinitions =
- Arrays.asList ( StringUtils.split ( repositories, "," ) ).iterator ();
- while ( repositoriesDefinitions.hasNext () )
+ Arrays.asList( StringUtils.split( repositories, "," ) ).iterator();
+ while ( repositoriesDefinitions.hasNext() )
{
- String repositoryDefinition = (String) repositoriesDefinitions.next ();
+ String repositoryDefinition = (String) repositoriesDefinitions.next();
String[] repositoryDefinitionParts =
- StringUtils.split ( repositoryDefinition, "=" );
+ StringUtils.split( repositoryDefinition, "=" );
- ArchetypeRepository repository = new ArchetypeRepository ();
+ ArchetypeRepository repository = new ArchetypeRepository();
- repository.setId ( repositoryDefinitionParts[0] );
- repository.setUrl ( repositoryDefinitionParts[1] );
+ repository.setId( repositoryDefinitionParts[0] );
+ repository.setUrl( repositoryDefinitionParts[1] );
- repositoriesToAdd.add ( repository );
+ repositoriesToAdd.add( repository );
}
}
ArchetypeRegistry registry;
try
{
- registry = archetypeRegistryManager.readArchetypeRegistry(archetypeRegistryFile);
+ registry = archetypeRegistryManager.readArchetypeRegistry( archetypeRegistryFile );
}
- catch (FileNotFoundException ex)
+ catch ( FileNotFoundException ex )
{
registry = archetypeRegistryManager.getDefaultArchetypeRegistry();
}
- Iterator repositoriesToAddIterator = repositoriesToAdd.iterator ();
- while ( repositoriesToAddIterator.hasNext () )
+ Iterator repositoriesToAddIterator = repositoriesToAdd.iterator();
+ while ( repositoriesToAddIterator.hasNext() )
{
ArchetypeRepository repositoryToAdd =
- (ArchetypeRepository) repositoriesToAddIterator.next ();
- if ( registry.getArchetypeRepositories ().contains ( repositoryToAdd ) )
+ (ArchetypeRepository) repositoriesToAddIterator.next();
+ if ( registry.getArchetypeRepositories().contains( repositoryToAdd ) )
{
- getLog ().debug ( "Repository " + repositoryToAdd + " already exists" );
+ getLog().debug( "Repository " + repositoryToAdd + " already exists" );
}
else
{
- registry.addArchetypeRepository ( repositoryToAdd );
- getLog ().debug ( "Repository " + repositoryToAdd + " added" );
+ registry.addArchetypeRepository( repositoryToAdd );
+ getLog().debug( "Repository " + repositoryToAdd + " added" );
}
}
- archetypeRegistryManager.writeArchetypeRegistry ( archetypeRegistryFile, registry );
+ archetypeRegistryManager.writeArchetypeRegistry( archetypeRegistryFile, registry );
}
catch ( Exception ex )
{
- throw new MojoExecutionException ( ex.getMessage (), ex );
+ throw new MojoExecutionException( ex.getMessage(), ex );
}
}
}