You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ra...@apache.org on 2007/09/18 23:48:04 UTC
svn commit: r577078 - in /maven/sandbox/trunk/archetypeng: archetype-generator/src/main/java/org/apache/maven/archetype/generator/ archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/

Author: rafale
Date: Tue Sep 18 14:48:03 2007
New Revision: 577078

URL: http://svn.apache.org/viewvc?rev=577078&view=rev
Log:
create-from-project now have its properties file located in target by default

Modified:
    maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.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/CreateArchetypeMojo.java

Modified: maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java?rev=577078&r1=577077&r2=577078&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetype-generator/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java Tue Sep 18 14:48:03 2007
@@ -637,7 +637,7 @@
         /*if ( StringUtils.isEmpty ( moduleOffset ) )
         {*/
             getLogger ().debug ( "Adding module " + moduleId );
-System.err.println ( "Adding module " + moduleId );
+//System.err.println ( "Adding module " + moduleId );
             pomManager.addModule ( basedirPom, moduleId );
             pomManager.addParent ( pom, basedirPom );
         //}

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=577078&r1=577077&r2=577078&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 Tue Sep 18 14:48:03 2007
@@ -84,9 +84,9 @@
     /**
      * The property file that holds the plugin configuration.
      *
-     * @parameter  default-value="archetype.properties" expression="${archetype.properties}"
+     * @parameter  default-value="target/archetype.properties" expression="${archetype.properties}"
      */
-    private File propertyFile = null;
+    private File propertyFile;
 
 //    /**
 //     * @parameter  expression="${settings}"
@@ -100,6 +100,11 @@
     {
         try
         {
+            if (propertyFile != null)
+            {
+                propertyFile.getParentFile().mkdirs();
+            }
+
             List languages =
                 archetypeRegistryManager.getLanguages ( archetypeLanguages, archetypeRegistryFile );
 

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=577078&r1=577077&r2=577078&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 Tue Sep 18 14:48:03 2007
@@ -120,15 +120,20 @@
     /**
      * The property file that holds the plugin configuration.
      *
-     * @parameter  default-value="archetype.properties" expression="${archetype.properties}"
+     * @parameter  default-value="target/archetype.properties" expression="${archetype.properties}"
      */
-    private File propertyFile = null;
+    private File propertyFile;
 
     public void execute ()
     throws MojoExecutionException, MojoFailureException
     {
         try
         {
+            if (propertyFile != null)
+            {
+                propertyFile.getParentFile().mkdirs();
+            }
+
             List languages =
                 archetypeRegistryManager.getLanguages ( archetypeLanguages, archetypeRegistryFile );