Author: pgier
Date: Wed Nov 24 15:17:06 2010
New Revision: 1038644
URL: http://svn.apache.org/viewvc?rev=1038644&view=rev
Log:
[ARCHETYPE-347] Allow additional pom fields (URL, description, scm, etc) to be
set for the generated archetype. Patch from G Fernandes (gustavonalle).
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java?rev=1038644&r1=1038643&r2=1038644&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/Constants.java
Wed Nov 24 15:17:06 2010
@@ -48,6 +48,10 @@ public interface Constants
String ARCHETYPE_LANGUAGES = "archetype.languages";
+ String ARCHETYPE_URL = "archetype.url";
+
+ String ARCHETYPE_DESCRIPTION = "archetype.description";
+
List<String> DEFAULT_FILTERED_EXTENSIONS =
Arrays.asList(
new String[]
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=1038644&r1=1038643&r2=1038644&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Wed Nov 24 15:17:06 2010
@@ -340,7 +340,12 @@ public class FilesetArchetypeCreator
model.setVersion( configurationProperties.getProperty(
Constants.ARCHETYPE_VERSION, project.getVersion() ) );
model.setPackaging( "maven-archetype" );
model.setName( configurationProperties.getProperty(
Constants.ARCHETYPE_ARTIFACT_ID, project.getArtifactId() ) );
-
+ model.setUrl( configurationProperties.getProperty(
Constants.ARCHETYPE_URL, project.getUrl() ) );
+ model.setDescription( configurationProperties.getProperty(
Constants.ARCHETYPE_DESCRIPTION,
+
project.getDescription() ) );
+ model.setLicenses( project.getLicenses() );
+ model.setDevelopers( project.getDevelopers() );
+ model.setScm( project.getScm() );
Build build = new Build();
model.setBuild( build );
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java?rev=1038644&r1=1038643&r2=1038644&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeConfiguration.java
Wed Nov 24 15:17:06 2010
@@ -38,6 +38,30 @@ public class ArchetypeConfiguration
private String goals;
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
+ public String getUrl()
+ {
+ return url;
+ }
+
+ public void setUrl( String url )
+ {
+ this.url = url;
+ }
+
+ private String url;
+
+ private String description;
+
private List<String> requiredProperties;
public void addRequiredProperty( String string )
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java?rev=1038644&r1=1038643&r2=1038644&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypeDefinition.java
Wed Nov 24 15:17:06 2010
@@ -36,6 +36,10 @@ public class ArchetypeDefinition
private String goals;
+ private String url;
+
+ private String description;
+
public ArchetypeDefinition()
{
}
@@ -77,6 +81,16 @@ public class ArchetypeDefinition
return this.version;
}
+ public String getUrl()
+ {
+ return this.url;
+ }
+
+ public String getDescription()
+ {
+ return this.description;
+ }
+
public void setArtifactId( String artifactId )
{
this.artifactId = artifactId;
@@ -107,6 +121,16 @@ public class ArchetypeDefinition
this.version = version;
}
+ public void setUrl( String url )
+ {
+ this.url = url;
+ }
+
+ public void setDescription( String description )
+ {
+ this.description = description;
+ }
+
public void reset()
{
setGroupId( null );
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java?rev=1038644&r1=1038643&r2=1038644&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
Wed Nov 24 15:17:06 2010
@@ -190,8 +190,8 @@ public class DefaultArchetypeFactory
configuration.addRequiredProperty( requiredProperty );
configuration.setProperty( requiredProperty,
properties.getProperty( requiredProperty ) );
- getLogger().debug( "Setting property " + requiredProperty + "="
- + configuration.getProperty(
requiredProperty ) );
+ getLogger().debug( "Setting property " + requiredProperty +
"=" +
+ configuration.getProperty(
requiredProperty ) );
}
}
@@ -209,6 +209,10 @@ public class DefaultArchetypeFactory
setProperty( configuration, properties, Constants.ARCHETYPE_VERSION );
+ setProperty( configuration, properties, Constants.ARCHETYPE_URL );
+
+ setProperty( configuration, properties,
Constants.ARCHETYPE_DESCRIPTION );
+
return configuration;
}
@@ -224,6 +228,10 @@ public class DefaultArchetypeFactory
definition.setRepository( properties.getProperty(
Constants.ARCHETYPE_REPOSITORY ) );
+ definition.setUrl( properties.getProperty( Constants.ARCHETYPE_URL ) );
+
+ definition.setDescription( properties.getProperty(
Constants.ARCHETYPE_DESCRIPTION ) );
+
return definition;
}
@@ -237,6 +245,10 @@ public class DefaultArchetypeFactory
configuration.setVersion( properties.getProperty(
Constants.ARCHETYPE_VERSION ) );
+ configuration.setUrl( properties.getProperty( Constants.ARCHETYPE_URL
) );
+
+ configuration.setDescription( properties.getProperty(
Constants.ARCHETYPE_DESCRIPTION ) );
+
return configuration;
}
