geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: incubator-geronimo/etc maven.xml project.xml
Date Tue, 25 Nov 2003 04:19:29 GMT
adc         2003/11/24 20:19:29

  Modified:    etc      maven.xml project.xml
  Log:
  When we're running clover, we should run the tests over again, even
  though they may have been run earlier.
  
  Revision  Changes    Path
  1.22      +21 -16    incubator-geronimo/etc/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- maven.xml	1 Sep 2003 22:06:55 -0000	1.21
  +++ maven.xml	25 Nov 2003 04:19:29 -0000	1.22
  @@ -38,7 +38,7 @@
       <attainGoal name="clean"/>
       <attainGoal name="build"/>
     </goal>
  -  
  +
     <!-- For testing -->
     <goal name="hello">
       <ant:echo>
  @@ -148,23 +148,28 @@
       
     </goal>
     
  +  <preGoal name="clover:test">
  +    <j:set var="cloveroverride" value="true"/>
  +  </preGoal>
  +
     <!-- Check if the tests need to run -->
     <preGoal name="test:test">
       <j:if test="${context.getVariable('maven.test.force') == null}">
  -      <j:set var="uptodatePropName" value="tests.uptodate"/>
  -      <j:remove var="${uptodatePropName}"/>
  -      <ant:mkdir dir="${basedir}/target/test-reports/"/>
  -      <j:set var="uptodateFile" value="${basedir}/target/test-reports/tstamp"/>
  -      
  -      <ant:uptodate property="${uptodatePropName}"
  -                targetfile="${uptodateFile}">
  -        <ant:srcfiles dir="${basedir}/src/" includes="**/*"/>
  -      </ant:uptodate>
  -      
  -      <j:if test="${context.getVariable(uptodatePropName) == 'true'}">
  -        <ant:echo>NOTICE: Skipping tests; they seem to have passed already</ant:echo>
  -        <j:set var="maven.test.skip" value="true"/>
  -        <j:set var="unitTestSourcesPresent" value="false"/>
  +      <j:if test="${cloveroverride != 'true'}">
  +        <j:set var="uptodatePropName" value="tests.uptodate"/>
  +        <j:remove var="${uptodatePropName}"/>
  +        <ant:mkdir dir="${basedir}/target/test-reports/"/>
  +        <j:set var="uptodateFile" value="${basedir}/target/test-reports/tstamp"/>
  +      
  +        <ant:uptodate property="${uptodatePropName}" targetfile="${uptodateFile}">
  +          <ant:srcfiles dir="${basedir}/src/" includes="**/*"/>
  +        </ant:uptodate>
  +      
  +        <j:if test="${context.getVariable(uptodatePropName) == 'true'}">
  +          <ant:echo>NOTICE: Skipping tests; they seem to have passed already</ant:echo>
  +          <j:set var="maven.test.skip" value="true"/>
  +          <j:set var="unitTestSourcesPresent" value="false"/>
  +        </j:if>
         </j:if>
       </j:if>
     </preGoal>
  
  
  
  1.17      +5 -13     incubator-geronimo/etc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- project.xml	23 Nov 2003 02:24:47 -0000	1.16
  +++ project.xml	25 Nov 2003 04:19:29 -0000	1.17
  @@ -18,27 +18,19 @@
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://incubator.apache.org/</url>
  -    <logo>/images/apache-incubator.png</logo>
  +    <logo>http://incubator.apache.org/geronimo/images/apache-incubator.png</logo>
     </organization>
   
     <inceptionYear>2003</inceptionYear>
  -  <logo>/images/geronimo.gif</logo>
  +  <logo>http://incubator.apache.org/geronimo/images/geronimo.gif</logo>
     <description>Geronimo J2EE Application Server</description>
     <shortDescription>Geronimo J2EE Application Server</shortDescription>
     <url>http://incubator.apache.org/projects/geronimo/</url>
     <issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10220</issueTrackingUrl>
   
     <siteAddress>incubator.apache.org</siteAddress>
  -
  -  <!-- 
  -  	hopefully we can deploy directly here one day...
  -  	
  -  <siteDirectory>/www/incubator.apache.org/projects/geronimo</siteDirectory>

  -  
  -  	until then lets put it in James's home directory for now
  -  -->
  -  <siteDirectory>/home/jstrachan/public_html/geronimo</siteDirectory>
  -  <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds</distributionDirectory>
  +  <siteDirectory>/www/incubator.apache.org/geronimo</siteDirectory> 
  +  <distributionDirectory>/www/incubator.apache.org/geronimo/builds</distributionDirectory>
   
     <repository>
       <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:incubator-geronimo</connection>
  
  
  

Mime
View raw message