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/11/18 04:19:31 UTC
svn commit: r596042 [3/3] - in /maven/sandbox/trunk/archetypeng: ./
archetype-old/
archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/download/
archetypeng-common/
archetypeng-common/src/main/java/org/apache/maven/archetype/ arc...
Added: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/resources/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/resources/xdocs/navigation.xml?rev=596042&view=auto
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/resources/xdocs/navigation.xml (added)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/resources/xdocs/navigation.xml Sat Nov 17 19:19:28 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Copyright 2004-2006 The Apache Software Foundation.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project name="Maven">
+
+ <title>Maven</title>
+
+ <body>
+ <links>
+ <item name="Plexus" href="http://plexus.codehaus.org"/>
+ </links>
+
+ <menu name="Quick Links">
+ <item name="Model" href="/maven.html"/>
+ </menu>
+ </body>
+</project>
Propchange: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/resources/xdocs/navigation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/resources/xdocs/navigation.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/pom.xml?rev=596042&r1=596041&r2=596042&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/pom.xml (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/pom.xml Sat Nov 17 19:19:28 2007
@@ -54,27 +54,14 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.7</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.2</version>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
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=596042&r1=596041&r2=596042&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 Sat Nov 17 19:19:28 2007
@@ -194,7 +194,7 @@
throw new MojoExecutionException( result.getCause().getMessage(), result.getCause() );
}
- getLog().info( "Archetype created in target/generated-sources/archetypeng" );
+ getLog().info( "OldArchetype created in target/generated-sources/archetypeng" );
if ( testMode )
{
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java?rev=596042&r1=596041&r2=596042&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java Sat Nov 17 19:19:28 2007
@@ -20,7 +20,6 @@
package org.apache.maven.archetype.mojos;
import java.io.IOException;
-import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -28,8 +27,6 @@
import org.apache.maven.project.MavenProject;
import java.io.File;
import org.apache.maven.archetype.Archetyper;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.jar.ManifestException;
/**
* @author rafale
@@ -49,17 +46,6 @@
private File archetypeDirectory;
/**
- * The maven archive configuration to use.
- *
- * <p>See <a
- * href="http://maven.apache.org/ref/current/maven-archiver/apidocs/org/apache/maven/archiver/MavenArchiveConfiguration.html">
- * the Javadocs for MavenArchiveConfiguration</a>.</p>
- *
- * @parameter
- */
- private MavenArchiveConfiguration archive = new MavenArchiveConfiguration( );
-
- /**
* Name of the generated JAR.
*
* @parameter alias="jarName" expression="${project.build.finalName}"
@@ -96,16 +82,9 @@
{
try
{
- File jarFile = archetyper.archiveArchetype( archetypeDirectory, project, outputDirectory, finalName, archive );
- project.getArtifact( ).setFile( jarFile );
- }
- catch ( ArchiverException ex )
- {
- throw new MojoExecutionException( ex.getMessage( ), ex );
- }
- catch ( ManifestException ex )
- {
- throw new MojoExecutionException( ex.getMessage( ), ex );
+ File jarFile = archetyper.archiveArchetype( archetypeDirectory, outputDirectory, finalName );
+
+ project.getArtifact().setFile( jarFile );
}
catch ( DependencyResolutionRequiredException ex )
{
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java?rev=596042&r1=596041&r2=596042&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java Sat Nov 17 19:19:28 2007
@@ -113,7 +113,7 @@
{
if ( !archetypeDefinition.isDefined() )
{
- getLogger().debug( "Archetype is not defined" );
+ getLogger().debug( "OldArchetype is not defined" );
if ( !archetypeDefinition.isGroupDefined() )
{
getLogger().debug( "Asking for archetype's groupId" );
@@ -146,7 +146,7 @@
if ( !archetypeConfiguration.isConfigured() )
{
- getLogger().debug( "Archetype is not configured" );
+ getLogger().debug( "OldArchetype is not configured" );
if ( !archetypeConfiguration.isConfigured( Constants.GROUP_ID ) )
{
getLogger().debug( "Asking for project's groupId" );
Modified: maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java?rev=596042&r1=596041&r2=596042&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeGenerationConfigurator.java Sat Nov 17 19:19:28 2007
@@ -19,7 +19,7 @@
package org.apache.maven.archetype.ui;
-import org.apache.maven.archetype.old.Archetype;
+import org.apache.maven.archetype.old.OldArchetype;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
import org.apache.maven.archetype.common.ArchetypeArtifactManager;
import org.apache.maven.archetype.common.ArchetypeConfiguration;
@@ -46,7 +46,7 @@
implements ArchetypeGenerationConfigurator
{
/** @plexus.requirement */
- Archetype oldArchetype;
+ OldArchetype oldArchetype;
/** @plexus.requirement */
private ArchetypeArtifactManager archetypeArtifactManager;
@@ -160,12 +160,12 @@
}
else if ( !archetypeGenerationQueryer.confirmConfiguration( archetypeConfiguration ) )
{
- getLogger().debug( "Archetype generation configuration not confirmed" );
+ getLogger().debug( "OldArchetype generation configuration not confirmed" );
archetypeConfiguration.reset();
}
else
{
- getLogger().debug( "Archetype generation configuration confirmed" );
+ getLogger().debug( "OldArchetype generation configuration confirmed" );
confirmed = true;
}
Modified: maven/sandbox/trunk/archetypeng/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/pom.xml?rev=596042&r1=596041&r2=596042&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/pom.xml (original)
+++ maven/sandbox/trunk/archetypeng/pom.xml Sat Nov 17 19:19:28 2007
@@ -42,9 +42,12 @@
<module>archetypeng-common</module>
<module>archetypeng-plugin</module>
<module>archetypeng-packaging</module>
- <module>archetype-old</module>
</modules>
+ <properties>
+ <mavenVersion>2.1-SNAPSHOT</mavenVersion>
+ </properties>
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -65,81 +68,67 @@
<artifactId>archetypeng-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-old</artifactId>
- <version>2.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <!-- Maven -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>2.0.7</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0.7</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>2.2</version>
+ <version>${mavenVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <version>2.0.7</version>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- Maven Artifact -->
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
- <version>2.0.7</version>
+ <groupId>org.apache.maven.artifact</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.1</version>
+ <version>1.4.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
+ <version>1.0-alpha-40</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
<version>1.0-alpha-5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-downloader</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>