You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/06 07:22:20 UTC

cvs commit: jakarta-turbine-maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

jvanzyl     2003/01/05 22:22:20

  Modified:    .        beta-8.txt project.xml
               src/messages messages_en.properties
               src/test/java/org/apache/maven/project
                        ProjectInheritanceTest.java
  Log:
  o check for groupid inheritance
  o message for checksum failure.
  
  Revision  Changes    Path
  1.4       +1 -1      jakarta-turbine-maven/beta-8.txt
  
  Index: beta-8.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/beta-8.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- beta-8.txt	1 Jan 2003 15:25:31 -0000	1.3
  +++ beta-8.txt	6 Jan 2003 06:22:20 -0000	1.4
  @@ -15,5 +15,5 @@
   
     <reactor:execute/> to <maven:reactor/>
     
  -o maven tag usage has change. you only need to specify the path to
  +o maven tag usage has changed. you only need to specify the path to
     the project.xml file. You no longer need to specify the basedir.
  
  
  
  1.230     +3 -2      jakarta-turbine-maven/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -r1.229 -r1.230
  --- project.xml	1 Jan 2003 15:25:31 -0000	1.229
  +++ project.xml	6 Jan 2003 06:22:20 -0000	1.230
  @@ -35,7 +35,8 @@
     <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
   
     <repository>
  -    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven</connection>
  +    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven:anoncvs</connection>
  +    <developerConnection>scm:cvs:ext:${maven.username}@cvs.apache.org:/home/cvs:jakarta-turbine-maven</developerConnection>
       <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</url>
     </repository>
   
  @@ -531,7 +532,7 @@
         <version>2.2</version>
         <url>http://www.clarkware.com/software/JDepend.html</url>
       </dependency>
  -
  +    
     </dependencies>
   
     <build>
  
  
  
  1.3       +1 -0      jakarta-turbine-maven/src/messages/messages_en.properties
  
  Index: messages_en.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/messages/messages_en.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- messages_en.properties	11 Dec 2002 22:40:03 -0000	1.2
  +++ messages_en.properties	6 Jan 2003 06:22:20 -0000	1.3
  @@ -14,3 +14,4 @@
   download.message=Attempting to download ${1}.
   plugin.loading.error=The plugin ${1} could not be loaded.
   empty.descriptor.error=The ${1} file you specified has zero length.
  +checksum.verification.error=The follow artifact is corrupt: ${1}.
  
  
  
  1.27      +4 -1      jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ProjectInheritanceTest.java	2 Jan 2003 01:33:30 -0000	1.26
  +++ ProjectInheritanceTest.java	6 Jan 2003 06:22:20 -0000	1.27
  @@ -97,7 +97,10 @@
       public void testProjectMapping() throws Exception
       {
           Project p = MavenUtils.getProject( new File( TEST_DOCUMENT ) );
  -
  +        
  +        // Make sure the groupId is inherited correctly.
  +        assertEquals( "maven", p.getGroupId() );
  +        
           assertEquals( "Super Extendo", p.getName() );
           assertEquals( "super-extendo", p.getId() );
           assertEquals( "Apache Software Foundation", p.getOrganization().getName() );