mpoeschl    02/03/20 03:52:44

  Modified:    .        project.xml
               src/test/org/apache/maven/project ProjectMapperTest.java
  Log:
  -upgrade stratum-jar to current version
  -adjust ProjectMapperTest
  
  Revision  Changes    Path
  1.33      +28 -28    jakarta-turbine-maven/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- project.xml       19 Mar 2002 00:23:30 -0000      1.32
  +++ project.xml       20 Mar 2002 11:52:44 -0000      1.33
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <project>
  -  
  +
     <name>jakarta-turbine-maven</name>
     <id>maven</id>
     <currentVersion>1.0-b2-dev</currentVersion>
  @@ -9,44 +9,44 @@
     <package>org.apache.maven</package>
   
     <shortDescription>Project Management Tools</shortDescription>
  -  
  +
     <description>
     <![CDATA[
       <p>
  -      Maven strives to be a lot of things, but primarily Maven strives to be a 
  -      project management and comprehension tool. 
  +      Maven strives to be a lot of things, but primarily Maven strives to be a
  +      project management and comprehension tool.
       </p>
       <p>
         The entire concept of Maven is based around an object model for a project.
         Currently our only method of storage is an XML file
       </p>
  -    
  +
       <p>
         <li>
           build a project and all its dependencies from source
  -      </li>      
  +      </li>
         <li>
           build a project against all its dependencies in binary form
  -      </li>      
  +      </li>
         <li>
           create comprehensive sets of information for a project
  -      </li>      
  +      </li>
         <li>
           provides metrics for your Java project
  -      </li>      
  +      </li>
         <li>
           provides a standard build file for your project
  -      </li>      
  +      </li>
         <li>
           provides a recommended directory structure for your Java project
  -      </li>      
  +      </li>
         <li>
           provides continuous integration
  -      </li>      
  +      </li>
       </p>
     ]]>
     </description>
  -  
  +
     <url>http://jakarta.apache.org/turbine/maven/</url>
     <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</cvsWebUrl>
     <siteAddress>jakarta.apache.org</siteAddress>
  @@ -75,7 +75,7 @@
            should reside. For the Turbine projects maybe an overall
            repository of developer entries, but for other projects
            what do we do. A global repository of Java developer ids?
  -         
  +
            I am adding the login for each developer, so maybe this
            is really a per-project things like password and login
            may be different for each project but possibly the
  @@ -145,9 +145,9 @@
         <email>[EMAIL PROTECTED]</email>
         <organization>Zenplex</organization>
       </developer>
  -  
  +
     </developers>
  -  
  +
   
     <!-- Need to mark these as compile-time/run-time -->
   
  @@ -156,8 +156,8 @@
       <dependency>
         <name>jakarta-turbine-stratum</name>
         <type>required</type>
  -      <version>0.1</version>
  -      <jar>stratum-0.1-dev.jar</jar>
  +      <version>1.0-b2-dev</version>
  +      <jar>stratum-1.0-b2-dev.jar</jar>
       </dependency>
   
       <dependency>
  @@ -173,7 +173,7 @@
         <version>1.1.3</version>
         <jar>log4j-1.1.3.jar</jar>
       </dependency>
  -            
  +
       <dependency>
         <name>jakarta-velocity</name>
         <type>required</type>
  @@ -252,39 +252,39 @@
       </dependency>
   
     </dependencies>
  -  
  +
     <build>
  -    
  +
       <sourceDirectories>
         <sourceDirectory>src/java</sourceDirectory>
  -    </sourceDirectories>  
  +    </sourceDirectories>
   
       <testSourceDirectories>
         <testSourceDirectory>src/java</testSourceDirectory>
         <testSourceDirectory>src/test</testSourceDirectory>
  -    </testSourceDirectories>  
  +    </testSourceDirectories>
   
       <aspectSourceDirectories>
  -    </aspectSourceDirectories>  
  +    </aspectSourceDirectories>
   
       <!-- Unit test classes -->
       <unitTestClassEntries>
         <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
         <unitTestClassEntry>exclude = 
**/WorkspaceMapperTest.class</unitTestClassEntry>
  -    </unitTestClassEntries>  
  +    </unitTestClassEntries>
   
       <!-- Runtime unit test classes -->
       <runtimeTestClassEntries>
  -    </runtimeTestClassEntries>  
  +    </runtimeTestClassEntries>
   
       <!-- J A R  R E S O U R C E S -->
       <!-- Resources that are packaged up inside the JAR file -->
  -    
  +
       <jarResources>
       </jarResources>
   
       <jars>
  -    </jars>  
  +    </jars>
     </build>
   </project>
   
  
  
  
  1.3       +15 -15    
jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
  
  Index: ProjectMapperTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProjectMapperTest.java    19 Mar 2002 00:39:32 -0000      1.2
  +++ ProjectMapperTest.java    20 Mar 2002 11:52:44 -0000      1.3
  @@ -7,23 +7,23 @@
   import org.apache.stratum.xo.Mapper;
   
   public class ProjectMapperTest
  -    extends TestCase 
  +    extends TestCase
   {
  -    private String TEST_DOCUMENT = null;    
  +    private String TEST_DOCUMENT = null;
       private static String TEST_CLASS =
               "org.apache.maven.project.Project";
   
  -    public ProjectMapperTest(String testName) 
  +    public ProjectMapperTest(String testName)
       {
           super(testName);
       }
   
  -    public static Test suite() 
  +    public static Test suite()
       {
           return new TestSuite(ProjectMapperTest.class);
       }
   
  -    protected void setUp() throws Exception 
  +    protected void setUp() throws Exception
       {
           super.setUp();
           String baseDir = System.getProperty("basedir");
  @@ -40,14 +40,14 @@
               Mapper m = new Mapper();
               m.setDebug(true);
               Project p = (Project) m.map(TEST_DOCUMENT, TEST_CLASS);
  -            
  +
               assertEquals("jakarta-turbine-maven",p.getName());
               assertEquals("maven", p.getId());
               assertEquals("Apache Software Foundation", p.getOrganization());
               assertEquals("http://jakarta.apache.org/turbine/maven/",p.getUrl());
               
assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-maven/",p.getCvsWebUrl());
               assertEquals("1.0-b2-dev", p.getCurrentVersion());
  -            
  +
               // Test Mailing List info
               assertEquals("Turbine User List",
                   ((MailingList)p.getMailingLists().get(0)).getName());
  @@ -61,26 +61,26 @@
                   ((Developer)p.getDevelopers().get(0)).getName());
               assertEquals("[EMAIL PROTECTED]",
                   ((Developer)p.getDevelopers().get(0)).getEmail());
  -        
  +
               // Test Dependencies
               assertEquals("jakarta-turbine-stratum",
                   ((Dependency)p.getDependencies().get(0)).getName());
               assertEquals("required",
                   ((Dependency)p.getDependencies().get(0)).getType());
  -            assertEquals("0.1",
  +            assertEquals("1.0-b2-dev",
                   ((Dependency)p.getDependencies().get(0)).getVersion());
  -            assertEquals("stratum-0.1-dev.jar",
  +            assertEquals("stratum-1.0-b2-dev.jar",
                   ((Dependency)p.getDependencies().get(0)).getJar());
  -            
  +
              // Test Source Directories
              
assertEquals("src/java",(String)p.getBuild().getSourceDirectories().get(0));
  -           
  +
              // Test Test Source Directories ;-)
              
assertEquals("src/java",(String)p.getBuild().getTestSourceDirectories().get(0));
   
              // Test Jar Resources
              //assertEquals("include = 
conf/*pipeline.xml",(String)p.getBuild().getJarResources().get(0));
  -        
  +
              // Test Unit Test Classes
              //assertEquals("include = **/*Test.class",
                //  (String)p.getBuild().getUnitTestClassEntries().get(0));
  @@ -89,11 +89,11 @@
              //assertEquals("include = **/*Test.class",
                //  (String)p.getBuild().getRuntimeTestClassEntries().get(0));
   
  -           
  +
              // Aspect Source Directories
              
//assertEquals("src/java/org",(String)p.getBuild().getAspectSourceDirectories().get(0));
   
  -        }       
  +        }
           catch (Exception e)
           {
               e.printStackTrace();
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to