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/05 07:13:51 UTC
svn commit: r582076 - in /maven/sandbox/trunk/archetypeng:
archetypeng-common/src/main/java/org/apache/maven/archetype/
archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/
Author: jvanzyl
Date: Thu Oct 4 22:13:47 2007
New Revision: 582076
URL: http://svn.apache.org/viewvc?rev=582076&view=rev
Log:
o some notes for raphael
Modified:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationResult.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetyper.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java?rev=582076&r1=582075&r2=582076&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java Thu Oct 4 22:13:47 2007
@@ -1,6 +1,13 @@
package org.apache.maven.archetype;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
+import java.util.List;
+
/** @author Jason van Zyl */
public class ArchetypeCreationRequest
{
+ private ArtifactRepository localRepository;
+
+ private List remoteRepositories;
}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationResult.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationResult.java?rev=582076&r1=582075&r2=582076&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationResult.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationResult.java Thu Oct 4 22:13:47 2007
@@ -1,6 +1,13 @@
package org.apache.maven.archetype;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
+import java.util.List;
+
/** @author Jason van Zyl */
public class ArchetypeCreationResult
{
-}
+ private ArtifactRepository localRepository;
+
+ private List remoteRepositories;
+}
Modified: maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetyper.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetyper.java?rev=582076&r1=582075&r2=582076&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetyper.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/main/java/org/apache/maven/archetype/DefaultArchetyper.java Thu Oct 4 22:13:47 2007
@@ -1,19 +1,37 @@
package org.apache.maven.archetype;
-/** @author Jason van Zyl */
+import org.apache.maven.archetype.creator.ArchetypeCreator;
+import org.apache.maven.archetype.generator.ArchetypeGenerator;
+
+/**
+ * @plexus.component
+ * @author Jason van Zyl
+ */
public class DefaultArchetyper
implements Archetyper
{
+ /** @plexus.requirement */
+ private ArchetypeCreator creator;
+
+ /** @plexus.requirement */
+ private ArchetypeGenerator generator;
+
public ArchetypeCreationResult createArchetypeFromProject( ArchetypeCreationRequest request )
{
ArchetypeCreationResult result = new ArchetypeCreationResult();
+ // This should take information from the request and that's it.
+ //creator.createArchetype( );
+
return result;
}
public ArchetypeGenerationResult generateProjectFromArchetype( ArchetypeGenerationRequest request )
{
ArchetypeGenerationResult result = new ArchetypeGenerationResult();
+
+ // This should take information from the request and that's it.
+ //generator.generateArchetype( );
return result;
}
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=582076&r1=582075&r2=582076&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 Thu Oct 4 22:13:47 2007
@@ -174,6 +174,9 @@
archetypeRegistryFile
);
+
+ //Create a request here which encapsulates everything below and then use Archetyper to do the creation.
+
creator.createArchetype(
project,
propertyFile,
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java?rev=582076&r1=582075&r2=582076&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java Thu Oct 4 22:13:47 2007
@@ -194,6 +194,8 @@
repositories
);
+ // Create the request here for the archetyper and use that instead of the configurator directly here.
+
configurator.configureArchetype(
settings.getInteractiveMode(),
propertyFile,