Repository: maven-archetype Updated Branches: refs/heads/ARCHETYPE-494 d60b87650 -> 2c73f84b4
Rename the post-create script to archetype-post-generate and remove the property in CreateArchetypeFromProjectMojo. Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/2c73f84b Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/2c73f84b Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/2c73f84b Branch: refs/heads/ARCHETYPE-494 Commit: 2c73f84b41d3e6890d2f2ccabb6d0c9ca4125ce0 Parents: d60b876 Author: Petar Tahchiev <paranoia...@gmail.com> Authored: Sat Dec 19 11:19:22 2015 +0200 Committer: Petar Tahchiev <paranoia...@gmail.com> Committed: Sat Dec 19 11:19:22 2015 +0200 ---------------------------------------------------------------------- .../archetype/ArchetypeCreationRequest.java | 14 -------------- .../apache/maven/archetype/common/Constants.java | 2 +- .../creator/FilesetArchetypeCreator.java | 19 +++++++++++-------- .../DefaultFilesetArchetypeGenerator.java | 2 +- .../META-INF/archetype-post-generate.groovy | 6 ++++++ .../META-INF/post_create.groovy | 6 ------ .../mojos/CreateArchetypeFromProjectMojo.java | 9 +-------- 7 files changed, 20 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java ---------------------------------------------------------------------- diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java index 9acfa58..2617da5 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java @@ -56,8 +56,6 @@ public class ArchetypeCreationRequest private String postPhase; - private String postScript; - private File outputDirectory; public String getPostPhase() @@ -72,18 +70,6 @@ public class ArchetypeCreationRequest return this; } - public String getPostScript() - { - return postScript; - } - - public ArchetypeCreationRequest setPostScript( String postScript ) - { - this.postScript = postScript; - - return this; - } - public ArtifactRepository getLocalRepository() { return localRepository; http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java ---------------------------------------------------------------------- diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java b/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java index e0b6f08..2cbbce0 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java @@ -34,7 +34,7 @@ public interface Constants String ARCHETYPE_DESCRIPTOR = "META-INF/maven/archetype-metadata.xml"; - String ARCHETYPE_POST_GENERATION_SCRIPT = "META-INF/post_create.groovy"; + String ARCHETYPE_POST_GENERATION_SCRIPT = "META-INF/archetype-post-generate.groovy"; String ARCHETYPE_POST_GENERATION_GOALS = "archetype.goals"; http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java ---------------------------------------------------------------------- diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java index 9c32a65..1c7138e 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java @@ -19,6 +19,7 @@ package org.apache.maven.archetype.creator; * under the License. */ +import org.apache.commons.collections.CollectionUtils; import org.apache.maven.archetype.ArchetypeCreationRequest; import org.apache.maven.archetype.ArchetypeCreationResult; import org.apache.maven.archetype.common.ArchetypeFilesResolver; @@ -147,13 +148,16 @@ public class FilesetArchetypeCreator File archetypeDescriptorFile = new File( archetypeResourcesDirectory, Constants.ARCHETYPE_DESCRIPTOR ); archetypeDescriptorFile.getParentFile().mkdirs(); - if ( request.getPostScript() != null ) - { - File archetypePostGenerationScript = new File( archetypeResourcesDirectory, - Constants.ARCHETYPE_POST_GENERATION_SCRIPT ); - archetypePostGenerationScript.getParentFile().mkdirs(); + File archetypePostGenerationScript = + new File( archetypeResourcesDirectory, Constants.ARCHETYPE_POST_GENERATION_SCRIPT ); + archetypePostGenerationScript.getParentFile().mkdirs(); - File inputFile = new File( request.getPostScript() ); + if ( request.getProject().getBuild() != null && CollectionUtils.isNotEmpty( + request.getProject().getBuild().getResources() ) ) + { + File inputFile = new File( + request.getProject().getBuild().getResources().get( 0 ).getDirectory() + File.separator + + Constants.ARCHETYPE_POST_GENERATION_SCRIPT ); if ( inputFile.exists() ) { FileUtils.copyFile( inputFile, archetypePostGenerationScript ); @@ -627,7 +631,7 @@ public class FilesetArchetypeCreator && !profile.getDependencyManagement().getDependencies().isEmpty() ) { for ( Iterator<Dependency> dependencies = - profile.getDependencyManagement().getDependencies().iterator(); dependencies.hasNext(); ) + profile.getDependencyManagement().getDependencies().iterator(); dependencies.hasNext(); ) { rewriteDependencyReferences( dependencies.next(), rootArtifactId, groupId ); } @@ -880,7 +884,6 @@ public class FilesetArchetypeCreator pom.setDescription( getReversedPlainContent( pom.getDescription(), pomReversedProperties ) ); pom.setUrl( getReversedPlainContent( pom.getUrl(), pomReversedProperties ) ); - rewriteReferences( pom, pomReversedProperties.getProperty( Constants.ARTIFACT_ID ), pomReversedProperties.getProperty( Constants.GROUP_ID ) ); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java ---------------------------------------------------------------------- diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java index 9dad01b..c4a74be 100644 --- a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java +++ b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java @@ -235,7 +235,7 @@ public class DefaultFilesetArchetypeGenerator // ---------------------------------------------------------------------- if ( getLogger().isInfoEnabled() ) { - getLogger().info( "project created from Archetype in dir: " + outputDirectoryFile.getAbsolutePath() ); + getLogger().info( "Project created from Archetype in dir: " + outputDirectoryFile.getAbsolutePath() ); } } catch ( FileNotFoundException ex ) http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy ---------------------------------------------------------------------- diff --git a/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy new file mode 100644 index 0000000..7b01980 --- /dev/null +++ b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy @@ -0,0 +1,6 @@ +println "Executing the post_create script..."; + +def projectFolder = this.'user.dir' + this.'file.separator' + "target/test-classes/projects" + this.'file.separator' + "generate-13" + this.'file.separator' + "file-value" + this.'file.separator'; + +println "Removing file: ${projectFolder}src/main/java/file/value/package/ToDelete.java"; +new File(projectFolder + "src/main/java/file/value/package/ToDelete.java").delete(); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/post_create.groovy ---------------------------------------------------------------------- diff --git a/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/post_create.groovy b/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/post_create.groovy deleted file mode 100644 index 7b01980..0000000 --- a/archetype-common/src/test/archetypes/fileset_with_postscript-1.0/META-INF/post_create.groovy +++ /dev/null @@ -1,6 +0,0 @@ -println "Executing the post_create script..."; - -def projectFolder = this.'user.dir' + this.'file.separator' + "target/test-classes/projects" + this.'file.separator' + "generate-13" + this.'file.separator' + "file-value" + this.'file.separator'; - -println "Removing file: ${projectFolder}src/main/java/file/value/package/ToDelete.java"; -new File(projectFolder + "src/main/java/file/value/package/ToDelete.java").delete(); http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/2c73f84b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java ---------------------------------------------------------------------- diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java index b9eb5f6..ab0162a 100644 --- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java +++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java @@ -205,13 +205,6 @@ public class CreateArchetypeFromProjectMojo private String archetypePostPhase; /** - * The property telling the location of a groovy script which will be included in the archetype. This script is executed after - * a project is created from this artchetype. - */ - @Parameter( property = "archetype.postScript", defaultValue = "${project.build.resources[0].directory}/post_create.groovy" ) - private String archetypePostScript; - - /** * The directory where the archetype should be created. */ @Parameter( defaultValue = "${project.build.directory}/generated-sources/archetype" ) @@ -258,7 +251,7 @@ public class CreateArchetypeFromProjectMojo /* This should be used before there and use only languages and filtereds */.setArchetypeRegistryFile( archetypeRegistryFile ).setLocalRepository( localRepository ) /* this should be resolved and asked for user to verify */.setPackageName( packageName ).setPostPhase( - archetypePostPhase ).setPostScript( archetypePostScript ).setOutputDirectory( outputDirectory ); + archetypePostPhase ).setOutputDirectory( outputDirectory ); ArchetypeCreationResult result = manager.createArchetypeFromProject( request );
