commit edc391948eaa1c61df8f87d5dece9862a1435d2f
author Raphael Pieroni <rafale@apache.org> Thu Apr 24 21:21:07 2008 +0000
committer Raphael Pieroni <rafale@apache.org> Thu Apr 24 21:21:07 2008 +0000
tree 8fd235a395b0113ee7c9324c72083be1234ddcb8
parent f4aab8ef5d1764552d22e95a40001fbfd7762203
parent 937164a89a2ed83d5bbfc41b38b14b5488b3a084

[maven-release-plugin]  copy for tag maven-archetype-2.0-alpha-3

git-svn-id: https://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-2.0-alpha-3@651428 13f79535-47bb-0310-9956-ffa450edef68

archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java

diff --git a/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java b/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
index c6fa0f8..1e5d64e 100644
--- a/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
+++ b/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
@@ -93,7 +93,8 @@
         if( null != properties.getProperty( Constants.ARTIFACT_ID ) )

         {

             configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );

-            configuration.setDefaultProperty( Constants.ARTIFACT_ID, configuration.getProperty( Constants.ARTIFACT_ID ) );

+            configuration.setDefaultProperty( Constants.ARTIFACT_ID,

+                configuration.getProperty( Constants.ARTIFACT_ID ) );

         }

         getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="

             + configuration.getProperty( Constants.ARTIFACT_ID ) );

@@ -103,12 +104,12 @@
         if( null != properties.getProperty( Constants.VERSION ) )

         {

             configuration.setProperty( Constants.VERSION, properties.getProperty( Constants.VERSION ) );

+            configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );

         }

         else

         {

-            configuration.setProperty( Constants.VERSION, "1.0-SNAPSHOT" );

+            configuration.setDefaultProperty( Constants.VERSION, "1.0-SNAPSHOT" );

         }

-        configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );

         getLogger().debug( "Setting property " + Constants.VERSION + "="

             + configuration.getProperty( Constants.VERSION ) );

 

@@ -190,7 +191,8 @@
                     configuration.getDefaultValue( Constants.ARTIFACT_ID ) ) )

             {

                 configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );

-                configuration.setDefaultProperty( Constants.ARTIFACT_ID, configuration.getProperty( Constants.ARTIFACT_ID ) );

+                configuration.setDefaultProperty( Constants.ARTIFACT_ID,

+                    configuration.getProperty( Constants.ARTIFACT_ID ) );

             }

             getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="

                 + configuration.getProperty( Constants.ARTIFACT_ID ) );

@@ -204,12 +206,12 @@
             {

                 configuration.setProperty( Constants.VERSION,

                     properties.getProperty( Constants.VERSION, configuration.getDefaultValue( Constants.VERSION ) ) );

+                configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );

             }

             else

             {

-                configuration.setProperty( Constants.VERSION, "1.0-SNAPSHOT" );

+                configuration.setDefaultProperty( Constants.VERSION, "1.0-SNAPSHOT" );

             }

-            configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );

             getLogger().debug( "Setting property " + Constants.VERSION + "="

                 + configuration.getProperty( Constants.VERSION ) );

         }