vmassol     2004/05/08 13:07:27

  Modified:    .        build-common.xml default-project.xml
               documentation/docs/xdocs sitemap.xml changes.xml
               integration/maven project.xml
  Log:
  continue work for Cactus 1.7dev
  
  Revision  Changes    Path
  1.41      +4 -4      jakarta-cactus/build-common.xml
  
  Index: build-common.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- build-common.xml  8 May 2004 18:04:18 -0000       1.40
  +++ build-common.xml  8 May 2004 20:07:26 -0000       1.41
  @@ -26,8 +26,8 @@
           major.minor.patch -->
   
     <property name="project.version.major" value="1"/>
  -  <property name="project.version.minor" value="6"/>
  -  <property name="project.version.suffix" value=""/>
  +  <property name="project.version.minor" value="7"/>
  +  <property name="project.version.suffix" value="dev"/>
     <property name="project.version.suffix.timestamp" value=""/>
   
     <property name="project.version"
  @@ -39,7 +39,7 @@
           be displayed on the web site. -->
     <property name="project.doc.version" 
       
value="${project.version.major}.${project.version.minor}${project.version.suffix}"/>
  -  <property name="project.doc.version.previous" value="1.5"/>
  +  <property name="project.doc.version.previous" value="1.6"/>
   
     <!-- Prefix to add to all distributable files -->
     <property name="project.prefix" value="jakarta"/>
  
  
  
  1.13      +6 -1      jakarta-cactus/default-project.xml
  
  Index: default-project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/default-project.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- default-project.xml       8 May 2004 18:40:17 -0000       1.12
  +++ default-project.xml       8 May 2004 20:07:26 -0000       1.13
  @@ -4,7 +4,7 @@
     <name>Jakarta Cactus</name>
     <groupId>cactus</groupId>
     <id>jakarta-cactus</id>
  -  <currentVersion>1.6</currentVersion>
  +  <currentVersion>1.7dev</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://jakarta.apache.org/</url>
  @@ -62,6 +62,11 @@
         <id>1.6</id>
         <name>1.6</name>
         <tag>CACTUS_15_RELEASE</tag>
  +    </version>
  +    <version>
  +      <id>1.7</id>
  +      <name>1.7</name>
  +      <tag>HEAD</tag>
       </version>
     </versions>
   
  
  
  
  1.82      +3 -3      jakarta-cactus/documentation/docs/xdocs/sitemap.xml
  
  Index: sitemap.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/sitemap.xml,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- sitemap.xml       8 May 2004 19:52:04 -0000       1.81
  +++ sitemap.xml       8 May 2004 20:07:26 -0000       1.82
  @@ -488,9 +488,9 @@
     <external id="httpunit" url="http://httpunit.sourceforge.net/"/>
   
     <!-- ATM, the maven web site is generated separately. -->
  -  <external id="integration_maven" 
url="http://jakarta.apache.org/cactus/1.6/integration/maven/index.html"/>
  -  <external id="integration_maven_changes" 
url="http://jakarta.apache.org/cactus/1.6/integration/maven/changes-report.html"/>
  -  <external id="integration_maven_installing" 
url="http://jakarta.apache.org/cactus/1.6/integration/maven/installing.html"/>
  +  <external id="integration_maven" 
url="http://jakarta.apache.org/cactus/integration/maven/index.html"/>
  +  <external id="integration_maven_changes" 
url="http://jakarta.apache.org/cactus/integration/maven/changes-report.html"/>
  +  <external id="integration_maven_installing" 
url="http://jakarta.apache.org/cactus/integration/maven/installing.html"/>
   
     <external id="jakarta" url="http://jakarta.apache.org/"/>
     <external id="jakarta_roles" url="http://jakarta.apache.org/site/roles.html"/>
  
  
  
  1.187     +3 -0      jakarta-cactus/documentation/docs/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
  retrieving revision 1.186
  retrieving revision 1.187
  diff -u -r1.186 -r1.187
  --- changes.xml       8 May 2004 17:32:28 -0000       1.186
  +++ changes.xml       8 May 2004 20:07:26 -0000       1.187
  @@ -89,6 +89,9 @@
           <person name="Julien Ruaux" email="[EMAIL PROTECTED]" id="JRU"/>
         </devs>
   
  +      <release version="1.7dev" date="in CVS">
  +      </release>
  +
         <release version="1.6" date="08 May 2004">
           <action dev="VMA" type="update">
             The <code>ServletTestRunner</code> now looks for am optional 
  
  
  
  1.15      +2 -2      jakarta-cactus/integration/maven/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/integration/maven/project.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- project.xml       8 May 2004 19:48:26 -0000       1.14
  +++ project.xml       8 May 2004 20:07:26 -0000       1.15
  @@ -7,7 +7,7 @@
     <!-- Note: Although we inherit from default-project.xml, we still cannot 
           remove the <currentVersion> tag as this project.xml is parsed at 
           runtime whenever our plugin is called. -->
  -  <currentVersion>1.6</currentVersion>
  +  <currentVersion>1.7dev</currentVersion>
   
     <name>Maven Cactus plugin</name>
     <package>org.apache.cactus.integration.maven</package>
  @@ -15,7 +15,7 @@
     <shortDescription>Maven plugin for Cactus</shortDescription>
     <url>http://jakarta.apache.org/cactus/integration/maven/</url>
     <siteAddress>cvs.apache.org</siteAddress>
  -  
<siteDirectory>/www/jakarta.apache.org/cactus/1.6/integration/maven/</siteDirectory>
  +  <siteDirectory>/www/jakarta.apache.org/cactus/integration/maven/</siteDirectory>
     <repository>
       <connection>scm:cvs:pserver:[EMAIL 
PROTECTED]:/home/cvspublic:jakarta-cactus/integration/maven/</connection>
       <url>http://cvs.apache.org/viewcvs/jakarta-cactus/integration/maven</url>
  
  
  

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

Reply via email to