You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/10/01 04:09:13 UTC
svn commit: r580822 - in /maven/sandbox/trunk/archetypeng:
archetypeng-common/src/main/java/org/apache/maven/archetype/creator/
archetypeng-common/src/test/java/org/apache/maven/archetype/creator/
archetypeng-plugin/src/main/java/org/apache/maven/arche...
Author: jvanzyl
Date: Sun Sep 30 19:09:12 2007
New Revision: 580822
URL: http://svn.apache.org/viewvc?rev=580822&view=rev
Log:
o updating tests to refect the use the localRepository in the creator, which is needed to build the parent so I can get the
deployment information.
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/ArchetypeCreator.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/ArchetypeCreator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/ArchetypeCreator.java?rev=580822&r1=580821&r2=580822&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/ArchetypeCreator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/creator/ArchetypeCreator.java Sun Sep 30 19:09:12 2007
@@ -22,13 +22,12 @@
import org.apache.maven.archetype.exception.ArchetypeNotConfigured;
import org.apache.maven.archetype.exception.ArchetypeNotDefined;
import org.apache.maven.archetype.exception.TemplateCreationException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
-
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.IOException;
-
import java.util.List;
public interface ArchetypeCreator
@@ -45,7 +44,8 @@
boolean preserveCData,
boolean keepParent,
boolean partialArchetype,
- File archetypeRegistryFile
+ File archetypeRegistryFile,
+ ArtifactRepository localRepository
)
throws
IOException,
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java?rev=580822&r1=580821&r2=580822&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java Sun Sep 30 19:09:12 2007
@@ -109,9 +109,10 @@
false,
false,
false,
- getFile( project, "archetype-registry.xml" )
+ getFile( project, "archetype-registry.xml" ),
+ null
);
-
+
File template;
template = getTemplateFile( project, "pom.xml" );
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java?rev=580822&r1=580821&r2=580822&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java Sun Sep 30 19:09:12 2007
@@ -19,13 +19,11 @@
package org.apache.maven.archetype.mojos;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
import org.apache.maven.archetype.common.ArchetypePropertiesManager;
import org.apache.maven.archetype.common.ArchetypeRegistryManager;
-import org.apache.maven.archetype.common.Constants;
import org.apache.maven.archetype.creator.ArchetypeCreator;
import org.apache.maven.archetype.ui.ArchetypeCreationConfigurator;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -33,7 +31,6 @@
import java.io.File;
import java.util.List;
-import java.util.Properties;
/**
* Creates sample archetype from current project.
@@ -115,6 +112,9 @@
*/
private boolean preserveCData = false;
+ /** @parameter expression="${localRepository}" */
+ private ArtifactRepository localRepository;
+
/**
* Poms in archetype are created with their initial parent.
* This property is ignored when preserveCData is true.
@@ -147,18 +147,6 @@
MojoExecutionException,
MojoFailureException
{
- // This is what we need here:
- //
- // - determine what groupId, artifactId, version to use: we default to the POM we're using
- // - configure it: this will probably get pretty sophisticated eventually
- // - populate the request
- //
- // then:
- //
- // result = archetype.createArchetypeFromProject( request );
- //
- // look at the result and respond accordingly.
-
try
{
if ( propertyFile != null )
@@ -192,48 +180,15 @@
preserveCData,
keepParent,
partialArchetype,
- archetypeRegistryFile
+ archetypeRegistryFile,
+ localRepository
);
getLog().info( "Archetype created in target/generated-sources/archetypeng" );
-
- /*
- Properties p = new Properties();
-
- propertiesManager.readProperties( p, new File( outputDirectory, "archetype.properties" ) );
-
- Archetype archetype = new Archetype();
-
- archetype.setGroupId( p.getProperty( Constants.ARCHETYPE_GROUP_ID ) );
-
- archetype.setArtifactId( p.getProperty( Constants.ARCHETYPE_ARTIFACT_ID ) );
-
- archetype.setVersion( p.getProperty( Constants.ARCHETYPE_VERSION ) );
-
- archetype.setDescription( "This is the Archetype description");
-
- ArchetypeCatalog archetypeRegistry = getCatalog();
-
- archetypeRegistry.addArchetype( archetype );
-
- writeCatalog( )
- */
}
catch ( Exception ex )
{
throw new MojoExecutionException( ex.getMessage(), ex );
}
}
-
- /*
- private ArchetypeCatalog getCatalog()
- {
-
- }
-
- private void writeCatalog( File catalogFile, ArchetypeCatalog catalog )
- {
-
- }
- */
}