maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources pom.xml
Date Thu, 07 Apr 2005 15:42:46 GMT
brett       2005/04/07 08:42:46

  Modified:    maven-archetype pom.xml
               maven-archetype/maven-archetype-core pom.xml
               maven-archetype/maven-archetype-core/src/test/java/org/apache/maven/archetype
                        ArchetypeTest.java
               maven-archetype/maven-archetype-plugin pom.xml
               maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype
                        MavenArchetypePlugin.java
               maven-archetype/maven-archetypes pom.xml
               maven-archetype/maven-archetypes/maven-archetype-mojo
                        pom.xml
               maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources
                        pom.xml
               maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java
                        MyMojo.java
               maven-archetype/maven-archetypes/maven-archetype-quickstart
                        pom.xml
               maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources
                        pom.xml
               maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java
                        App.java
               maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java
                        AppTest.java
               maven-archetype/maven-archetypes/maven-archetype-webapp
                        pom.xml
               maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources
                        pom.xml
  Removed:     maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java
                        AbstractTestCase.java
  Log:
  update the archetypes
  
  Revision  Changes    Path
  1.7       +5 -0      maven-components/maven-archetype/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pom.xml	5 Apr 2005 16:30:54 -0000	1.6
  +++ pom.xml	7 Apr 2005 15:42:45 -0000	1.7
  @@ -8,4 +8,9 @@
     <artifactId>maven-archetype</artifactId>
     <packaging>pom</packaging>
     <version>1.0-alpha-1-SNAPSHOT</version>
  +  <modules>
  +    <module>maven-archetype-core</module>
  +    <module>maven-archetype-plugin</module>
  +    <module>maven-archetypes</module>
  +  </modules>
   </model>
  
  
  
  1.6       +3 -7      maven-components/maven-archetype/maven-archetype-core/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetype-core/pom.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pom.xml	1 Apr 2005 16:03:42 -0000	1.5
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.6
  @@ -11,25 +11,20 @@
     <dependencies>
       <dependency>
         <groupId>plexus</groupId>
  -      <artifactId>plexus-container-default</artifactId>
  +      <artifactId>plexus-utils</artifactId>
         <version>1.0-alpha-2</version>
  -      <type>jar</type>
  -      <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>plexus</groupId>
         <artifactId>plexus-velocity</artifactId>
         <version>1.0</version>
  -      <type>jar</type>
  -      <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>
         <version>2.0-SNAPSHOT</version>
  -      <type>jar</type>
  -      <scope>compile</scope>
       </dependency>
  +<!--
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-http-lightweight</artifactId>
  @@ -37,5 +32,6 @@
         <type>jar</type>
         <scope>compile</scope>
       </dependency>
  +-->
     </dependencies>
   </model>
  
  
  
  1.4       +14 -14    maven-components/maven-archetype/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java
  
  Index: ArchetypeTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetype-core/src/test/java/org/apache/maven/archetype/ArchetypeTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ArchetypeTest.java	18 Mar 2005 22:02:08 -0000	1.3
  +++ ArchetypeTest.java	7 Apr 2005 15:42:46 -0000	1.4
  @@ -17,15 +17,14 @@
    */
   
   import org.apache.maven.artifact.repository.ArtifactRepository;
  +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
   import org.codehaus.plexus.PlexusTestCase;
   
   import java.io.File;
  -import java.io.FileInputStream;
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.List;
   import java.util.Map;
  -import java.util.Properties;
   
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  @@ -51,27 +50,28 @@
   
           parameters.put( "package", "org.apache.maven.quickstart" );
   
  -        parameters.put( "outputDirectory",new File( getBasedir(), "target/archetype" ).getPath()
);
  +        parameters.put( "outputDirectory", new File( getBasedir(), "target/archetype" ).getPath()
);
   
           // ----------------------------------------------------------------------
           // This needs to be encapsulated in a maven test case.
           // ----------------------------------------------------------------------
   
  -        File mavenPropertiesFile = new File( System.getProperty( "user.home" ), ".m2/maven.properties"
);
  +        ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) container.lookup(
ArtifactRepositoryLayout.ROLE,
  +                                                                                      
"default" );
   
  -        Properties mavenProperties = new Properties();
  -
  -        mavenProperties.load( new FileInputStream( mavenPropertiesFile ) );
  -
  -        ArtifactRepository localRepository = new ArtifactRepository( "local", "file://"
+ mavenProperties.getProperty( "maven.repo.local" ) );
  +        String mavenRepoLocal = getTestFile( "target/local-repository" ).toURL().toString();
  +        ArtifactRepository localRepository = new ArtifactRepository( "local", mavenRepoLocal,
layout );
   
           List remoteRepositories = new ArrayList();
   
  -        ArtifactRepository remoteRepository = new ArtifactRepository( "remote", "http://repo1.maven.org"
);
  +        String mavenRepoRemote = getTestFile( "src/test/repository" ).toURL().toString();
  +        ArtifactRepository remoteRepository = new ArtifactRepository( "remote", mavenRepoRemote,
layout );
   
           remoteRepositories.add( remoteRepository );
   
  -        archetype.createArchetype( "maven", "maven-archetype-quickstart", "1.0-alpha-1-SNAPSHOT",
  -                                   localRepository, remoteRepositories, parameters);
  +        archetype.createArchetype( "org.apache.maven.archetypes", "maven-archetype-quickstart",
"1.0-alpha-1-SNAPSHOT",
  +                                   localRepository, remoteRepositories, parameters );
  +
  +        // TODO: validate output
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.5       +1 -1      maven-components/maven-archetype/maven-archetype-plugin/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetype-plugin/pom.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pom.xml	23 Mar 2005 06:52:51 -0000	1.4
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.5
  @@ -1,7 +1,7 @@
   <model>
     <parent>
       <artifactId>maven-plugin-parent</artifactId>
  -    <groupId>org.apache.maven</groupId>
  +    <groupId>org.apache.maven.plugins</groupId>
       <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
  
  
  1.4       +87 -94    maven-components/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypePlugin.java
  
  Index: MavenArchetypePlugin.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetype-plugin/src/main/java/org/apache/maven/plugin/archetype/MavenArchetypePlugin.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MavenArchetypePlugin.java	18 Mar 2005 22:02:09 -0000	1.3
  +++ MavenArchetypePlugin.java	7 Apr 2005 15:42:46 -0000	1.4
  @@ -1,7 +1,7 @@
   package org.apache.maven.plugin.archetype;
   
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 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.
  @@ -19,95 +19,81 @@
   import org.apache.maven.archetype.Archetype;
   import org.apache.maven.artifact.repository.ArtifactRepository;
   import org.apache.maven.plugin.AbstractPlugin;
  +import org.apache.maven.plugin.PluginExecutionException;
   import org.apache.maven.plugin.PluginExecutionRequest;
   import org.apache.maven.plugin.PluginExecutionResponse;
   
  -import java.util.ArrayList;
  +import java.io.File;
   import java.util.List;
   
   /**
    * @goal create
  - *
    * @description Builds archetype containers.
  - *
  - * @parameter
  - *   name="archetype"
  - *   type="org.apache.maven.archetype.Archetype"
  - *   required="true"
  - *   validator=""
  - *   expression="#component.org.apache.maven.archetype.Archetype"
  - *   description=""
  - *
  - * @parameter
  - *   name="localRepository"
  - *   type="org.apache.maven.artifact.ArtifactRepository"
  - *   required="true"
  - *   validator=""
  - *   expression="#localRepository"
  - *   description=""
  - *
  - * @parameter
  - *   name="archetypeGroupId"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#archetypeGroupId"
  - *   default="maven"
  - *   description=""
  - *
  - * @parameter
  - *   name="archetypeArtifactId"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#archetypeArtifactId"
  - *   default="maven"
  - *   description=""
  - *
  - * @parameter
  - *   name="archetypeVersion"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#archetypeVersion"
  - *   default="maven"
  - *   description=""
  - *
  - * @parameter
  - *   name="groupId"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#groupId"
  - *   default="maven"
  - *   description=""
  - *
  - * @parameter
  - *   name="artifactId"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#artifactId"
  - *   default="quickstart"
  - *   description=""
  - *
  - * @parameter
  - *   name="version"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#version"
  - *   default="1.0"
  - *   description=""
  - *
  - * @parameter
  - *   name="package"
  - *   type="String"
  - *   required="true"
  - *   validator=""
  - *   expression="#package"
  - *   default="org.apache.maven.quickstart"
  - *   description=""
  + * @parameter name="archetype"
  + * type="org.apache.maven.archetype.Archetype"
  + * required="true"
  + * validator=""
  + * expression="#component.org.apache.maven.archetype.Archetype"
  + * description=""
  + * @parameter name="localRepository"
  + * type="org.apache.maven.artifact.ArtifactRepository"
  + * required="true"
  + * validator=""
  + * expression="#localRepository"
  + * description=""
  + * @parameter name="archetypeGroupId"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#archetypeGroupId"
  + * default="org.apache.maven.archetypes"
  + * description=""
  + * @parameter name="archetypeArtifactId"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#archetypeArtifactId"
  + * default="maven-archetype-quickstart"
  + * description=""
  + * @parameter name="archetypeVersion"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#archetypeVersion"
  + * default="1.0-alpha-1-SNAPSHOT"
  + * description=""
  + * @parameter name="groupId"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#groupId"
  + * description=""
  + * @parameter name="artifactId"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#artifactId"
  + * description=""
  + * @parameter name="version"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#version"
  + * default="1.0-SNAPSHOT"
  + * description=""
  + * @parameter name="package"
  + * type="String"
  + * required="true"
  + * validator=""
  + * expression="#package"
  + * default="com.mycompany.app"
  + * description=""
  + * @parameter name="remoteRepositories"
  + * type="java.util.List"
  + * required="true"
  + * validator=""
  + * expression="#project.remoteArtifactRepositories"
  + * description=""
    */
   public class MavenArchetypePlugin
       extends AbstractPlugin
  @@ -115,6 +101,10 @@
       public void execute( PluginExecutionRequest request, PluginExecutionResponse response
)
           throws Exception
       {
  +        // TODO: prompt for missing values
  +        // TODO: use new plugin type
  +        // TODO: configurable license
  +
           // ----------------------------------------------------------------------
           // archetypeGroupId
           // archetypeArtifactId
  @@ -125,17 +115,10 @@
           // parameters
           // ----------------------------------------------------------------------
   
  -        // When there is no project how do we get the local repository and remote repos.
  -        // The local repository will always be present but the remote is in the POM except
  -        // for the super POM ...
  -
           ArtifactRepository localRepository = (ArtifactRepository) request.getParameter(
"localRepository" );
   
  -        List remoteRepositories = new ArrayList();
  -
  -        ArtifactRepository remoteRepository = new ArtifactRepository( "remote", "http://repo1.maven.org"
);
  -
  -        remoteRepositories.add( remoteRepository );
  +        // From the super POM
  +        List remoteRepositories = (List) request.getParameter( "remoteRepositories" );
   
           String archetypeGroupId = (String) request.getParameter( "archetypeGroupId" );
   
  @@ -145,9 +128,19 @@
   
           Archetype archetype = (Archetype) request.getParameter( "archetype" );
   
  -        request.getParameters().put( "outputDirectory", System.getProperty( "user.dir"
) );
  +        String basedir = System.getProperty( "user.dir" );
  +
  +        // TODO: allow this to be configured
  +        File outputDirectory = new File( basedir, (String) request.getParameter( "artifactId"
) );
  +        request.getParameters().put( "outputDirectory", outputDirectory.getAbsolutePath()
);
  +
  +        if ( outputDirectory.exists() )
  +        {
  +            throw new PluginExecutionException(
  +                outputDirectory.getName() + " already exists - please run from a clean
directory" );
  +        }
   
  -        archetype.createArchetype( archetypeGroupId, archetypeArtifactId, archetypeVersion,
  -                                   localRepository, remoteRepositories, request.getParameters()
);
  +        archetype.createArchetype( archetypeGroupId, archetypeArtifactId, archetypeVersion,
localRepository,
  +                                   remoteRepositories, request.getParameters() );
       }
   }
  
  
  
  1.5       +6 -0      maven-components/maven-archetype/maven-archetypes/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/pom.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pom.xml	23 Mar 2005 06:52:51 -0000	1.4
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.5
  @@ -5,7 +5,13 @@
       <version>1.0-alpha-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  +  <groupId>org.apache.maven.archetypes</groupId>
     <artifactId>maven-archetypes</artifactId>
     <packaging>pom</packaging>
     <version>1.0-alpha-1-SNAPSHOT</version>
  +  <modules>
  +    <module>maven-archetype-mojo</module>
  +    <module>maven-archetype-quickstart</module>
  +    <module>maven-archetype-webapp</module>
  +  </modules>
   </model>
  
  
  
  1.3       +1 -1      maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	23 Mar 2005 06:52:51 -0000	1.2
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.3
  @@ -1,7 +1,7 @@
   <model>
     <parent>
       <artifactId>maven-archetypes</artifactId>
  -    <groupId>org.apache.maven</groupId>
  +    <groupId>org.apache.maven.archetypes</groupId>
       <version>1.0-alpha-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
  
  
  1.2       +8 -3      maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/pom.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- pom.xml	18 Mar 2005 06:41:17 -0000	1.1
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.2
  @@ -2,15 +2,20 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
  -  <packaging>jar</packaging>
  +  <packaging>maven-plugin</packaging>
     <version>${version}</version>
     <dependencies>
       <dependency>
  +      <groupId>org.apache.maven</groupId>
  +      <artifactId>maven-plugin</artifactId>
  +      <version>2.0-SNAPSHOT</version>
  +    </dependency>
  +
  +    <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
  -      <type>jar</type>
  -      <scope>compile</scope>
  +      <scope>test</scope>
       </dependency>
     </dependencies>
   </model>
  
  
  
  1.2       +49 -43    maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java
  
  Index: MyMojo.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-mojo/src/main/resources/archetype-resources/src/main/java/MyMojo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MyMojo.java	18 Mar 2005 06:41:17 -0000	1.1
  +++ MyMojo.java	7 Apr 2005 15:42:46 -0000	1.2
  @@ -1,78 +1,84 @@
   package $package;
   
  +/*
  + * Copyright 2001-2005 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.
  + */
  +
   import org.apache.maven.plugin.AbstractPlugin;
  -import org.apache.maven.plugin.PluginExecutionRequest;
  -import org.apache.maven.plugin.PluginExecutionResponse;
  +import org.apache.maven.plugin.PluginExecutionException;
   
   import java.io.File;
   import java.io.FileWriter;
  +import java.io.IOException;
   
   /**
    * @goal touch
    * 
    * @phase process-sources
    *
  - * @description Goal which cleans the build
  + * @description Goal which touches a timestamp file
    *
    * @parameter
    *  name="outputDirectory"
  - *  type="String"
  - *  required="true"
  - *  validator=""
  - *  expression="#project.build.directory"
  - *  description=""
  - * 
  - * @parameter
  - *  name="basedirAlignmentDirectory"
    *  type="java.io.File"
    *  required="true"
    *  validator=""
  - *  expression="target/test-basedir-alignment"
  + *  expression="#project.build.directory"
    *  description=""
    */
   public class MyMojo
       extends AbstractPlugin
   {
  -    private static final int DELETE_RETRY_SLEEP_MILLIS = 10;
  +    private String outputDirectory;
   
  -    public void execute( PluginExecutionRequest request, PluginExecutionResponse response
)
  -        throws Exception
  +    public void execute()
  +        throws PluginExecutionException
       {
  -        String outputDirectory = (String) request.getParameter( "outputDirectory" );
  -
           File f = new File( outputDirectory );
  -        
  +
           if ( !f.exists() )
           {
               f.mkdirs();
           }
  -        
  +
           File touch = new File( f, "touch.txt" );
  -        
  -        FileWriter w = new FileWriter( touch );
  -        
  -        w.write( "touch.txt" );
  -        
  -        w.close();
  -        
  -        // This parameter should be aligned to the basedir as the parameter type is specified
  -        // as java.io.File
  -        
  -        String basedirAlignmentDirectory = (String) request.getParameter( "basedirAlignmentDirectory"
);
   
  -        f = new File( basedirAlignmentDirectory );
  -        
  -        if ( !f.exists() )
  +        FileWriter w = null;
  +        try
           {
  -            f.mkdirs();
  -        }         
  -        
  -        touch = new File( f, "touch.txt" );
  -        
  -        w = new FileWriter( touch );
  -        
  -        w.write( "touch.txt" );
  -        
  -        w.close();        
  +            w = new FileWriter( touch );
  +
  +            w.write( "touch.txt" );
  +        }
  +        catch ( IOException e )
  +        {
  +            throw new PluginExecutionException( "Error creating file " + touch );
  +        }
  +        finally
  +        {
  +            if ( w != null )
  +            {
  +                try
  +                {
  +                    w.close();
  +                }
  +                catch ( IOException e )
  +                {
  +                    // ignore
  +                }
  +            }
  +        }
       }
   }
  
  
  
  1.5       +1 -1      maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/pom.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pom.xml	23 Mar 2005 06:52:51 -0000	1.4
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.5
  @@ -1,7 +1,7 @@
   <model>
     <parent>
       <artifactId>maven-archetypes</artifactId>
  -    <groupId>org.apache.maven</groupId>
  +    <groupId>org.apache.maven.archetypes</groupId>
       <version>1.0-alpha-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
  
  
  1.3       +2 -3      maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	10 Mar 2005 01:35:18 -0000	1.2
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.3
  @@ -9,8 +9,7 @@
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
  -      <type>jar</type>
  -      <scope>compile</scope>
  +      <scope>test</scope>
       </dependency>
     </dependencies>
  -</model>
  \ No newline at end of file
  +</model>
  
  
  
  1.2       +0 -2      maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java
  
  Index: App.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- App.java	29 Dec 2004 06:20:52 -0000	1.1
  +++ App.java	7 Apr 2005 15:42:46 -0000	1.2
  @@ -3,8 +3,6 @@
   /**
    * Hello world!
    *
  - * @author <a href="jason@zenplex.com">Jason van Zyl</a>
  - *
    */
   public class App 
   {
  
  
  
  1.2       +2 -4      maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java
  
  Index: AppTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-quickstart/src/main/resources/archetype-resources/src/test/java/AppTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AppTest.java	29 Dec 2004 06:20:52 -0000	1.1
  +++ AppTest.java	7 Apr 2005 15:42:46 -0000	1.2
  @@ -6,11 +6,9 @@
   
   /**
    * Unit test for simple App.
  - *
  - * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
    */
   public class AppTest 
  -    extends AbstractTestCase
  +    extends TestCase
   {
       /**
        * Create the test case
  @@ -35,6 +33,6 @@
        */
       public void testApp()
       {
  -        assertEquals( "maven kicks ass", "maven kicks ass" );
  +        assertTrue( true );
       }
   }
  
  
  
  1.4       +1 -1      maven-components/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-webapp/pom.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- pom.xml	23 Mar 2005 06:52:51 -0000	1.3
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.4
  @@ -1,7 +1,7 @@
   <model>
     <parent>
       <artifactId>maven-archetypes</artifactId>
  -    <groupId>org.apache.maven</groupId>
  +    <groupId>org.apache.maven.archetypes</groupId>
       <version>1.0-alpha-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
  
  
  
  1.3       +12 -9     maven-components/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-archetype/maven-archetypes/maven-archetype-webapp/src/main/resources/archetype-resources/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	10 Mar 2005 01:35:18 -0000	1.2
  +++ pom.xml	7 Apr 2005 15:42:46 -0000	1.3
  @@ -2,22 +2,25 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
  -  <packaging>jar</packaging>
  +  <packaging>war</packaging>
     <version>${version}</version>
     <dependencies>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>
  -      <type>jar</type>
  -      <scope>compile</scope>
  +      <scope>test</scope>
       </dependency>
     </dependencies>
     <build>
  -    <resources>
  -      <resource>
  -        <directory>src/main/webapp</directory>
  -      </resource>
  -    </resources>
  +    <plugins>
  +      <plugin>
  +        <artifactId>maven-war-plugin</artifactId>
  +        <version>1.0-alpha-1</version>
  +        <configuration>
  +          <warName>${artifactId}</warName>
  +        </configuration>
  +      </plugin>
  +    </plugins>
     </build>
  -</model>
  \ No newline at end of file
  +</model>
  
  
  

Mime
View raw message