You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pt...@apache.org on 2016/01/10 23:31:50 UTC
[1/2] maven-archetype git commit: Iterate over every resource folder
when preparing archetype.
Repository: maven-archetype
Updated Branches:
refs/heads/master 0bee18dea -> d9566b03a
Iterate over every resource folder when preparing archetype.
Iterate over every resource folder to find archetype's post-generation script when preparing the archetype.
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/c034e1ca
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/c034e1ca
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/c034e1ca
Branch: refs/heads/master
Commit: c034e1ca51776f93295c0dd6258cfda73134b68f
Parents: 0bee18d
Author: Petar Tahchiev <pa...@gmail.com>
Authored: Mon Jan 11 00:16:49 2016 +0200
Committer: Petar Tahchiev <pa...@gmail.com>
Committed: Mon Jan 11 00:16:49 2016 +0200
----------------------------------------------------------------------
.../archetype/creator/FilesetArchetypeCreator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/c034e1ca/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 e755749..df62ba6 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
@@ -43,6 +43,7 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Profile;
+import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -155,12 +156,14 @@ public class FilesetArchetypeCreator
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() )
+ for ( Resource resource : request.getProject().getBuild().getResources() )
{
- FileUtils.copyFile( inputFile, archetypePostGenerationScript );
+ File inputFile = new File(
+ resource.getDirectory() + File.separator + Constants.ARCHETYPE_POST_GENERATION_SCRIPT );
+ if ( inputFile.exists() )
+ {
+ FileUtils.copyFile( inputFile, archetypePostGenerationScript );
+ }
}
}
[2/2] maven-archetype git commit: Do not change request content with
extra properties.
Posted by pt...@apache.org.
Do not change request content with extra properties.
Avoid dirtying the request content with extra properties. Instead create a separate holder
to keep track of the request properties and the system properties.
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/d9566b03
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/d9566b03
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/d9566b03
Branch: refs/heads/master
Commit: d9566b03a1027e374f2c6d4c6676bbcd008243f6
Parents: c034e1c
Author: Petar Tahchiev <pa...@gmail.com>
Authored: Mon Jan 11 00:30:07 2016 +0200
Committer: Petar Tahchiev <pa...@gmail.com>
Committed: Mon Jan 11 00:30:07 2016 +0200
----------------------------------------------------------------------
.../generator/DefaultFilesetArchetypeGenerator.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/d9566b03/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 11e7383..0b28263 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
@@ -64,6 +64,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -215,14 +216,17 @@ public class DefaultFilesetArchetypeGenerator
Binding binding = new Binding();
+ final Properties archetypeGeneratorProperties = new Properties();
+ archetypeGeneratorProperties.putAll( System.getProperties() );
+
if ( request.getProperties() != null )
{
- request.getProperties().putAll( System.getProperties() );
+ archetypeGeneratorProperties.putAll( request.getProperties() );
+ }
- for ( Map.Entry<Object, Object> entry : request.getProperties().entrySet() )
- {
- binding.setVariable( entry.getKey().toString(), entry.getValue() );
- }
+ for ( Map.Entry<Object, Object> entry : archetypeGeneratorProperties.entrySet() )
+ {
+ binding.setVariable( entry.getKey().toString(), entry.getValue() );
}
GroovyShell shell = new GroovyShell( binding );