vmassol     2003/07/14 13:30:13

  Modified:    .        build-common.xml
               documentation/docs/xdocs changes.xml news.rdf
  Log:
  - Merge changes from 1.5 branch
  - Prepare for 1.6dev
  - Fixed error on news page about 1.5-beta1 release date
  
  Revision  Changes    Path
  1.31      +3 -3      jakarta-cactus/build-common.xml
  
  Index: build-common.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build-common.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build-common.xml  14 Jul 2003 19:05:31 -0000      1.30
  +++ build-common.xml  14 Jul 2003 20:30:12 -0000      1.31
  @@ -20,7 +20,7 @@
           major.minor.patch -->
   
     <property name="project.version.major" value="1"/>
  -  <property name="project.version.minor" value="5"/>
  +  <property name="project.version.minor" value="6"/>
     <property name="project.version.suffix" value="dev"/>
   
     <property name="project.version"
  @@ -32,7 +32,7 @@
           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.4.1"/>
  +  <property name="project.doc.version.previous" value="1.5-beta1"/>
   
     <!-- Prefix to add to all distributable files -->
     <property name="project.prefix" value="jakarta"/>
  
  
  
  1.121     +4 -2      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.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- changes.xml       14 Jul 2003 10:16:59 -0000      1.120
  +++ changes.xml       14 Jul 2003 20:30:12 -0000      1.121
  @@ -76,8 +76,10 @@
             documentation</link> for more information.
           </action>
   -->
  -     
  -      <release version="1.5" date="- in CVS">
  +      <release version="1.6" date="in CVS">
  +      </release>
  +             
  +      <release version="1.5" date="14 July 2003">
           <action dev="VMA" type="update">
             Support for WebLogic 7.x has not been tested with Cactus 1.5 and
             may not work.
  
  
  
  1.8       +15 -0     jakarta-cactus/documentation/docs/xdocs/news.rdf
  
  Index: news.rdf
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/news.rdf,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- news.rdf  12 Jul 2003 20:57:06 -0000      1.7
  +++ news.rdf  14 Jul 2003 20:30:12 -0000      1.8
  @@ -22,6 +22,7 @@
   
       <items>
         <rdf:Seq>
  +        <rdf:li rdf:resource="http://jakarta.apache.org/cactus/news.html#news12"/>
           <rdf:li rdf:resource="http://jakarta.apache.org/cactus/news.html#news11"/>
           <rdf:li rdf:resource="http://jakarta.apache.org/cactus/news.html#news10"/>
           <rdf:li rdf:resource="http://jakarta.apache.org/cactus/news.html#news9"/>
  @@ -37,6 +38,20 @@
       </items>
   
     </channel>
  +
  +  <item rdf:about="http://jakarta.apache.org/cactus/news.html#news12";>
  +    <title>Cactus 1.5-beta1 released</title>
  +    <link>http://jakarta.apache.org/cactus/news.html#news12</link>
  +    <description>
  +<![CDATA[Cactus 1.5-beta1 has been released. Full details can be found
  +in the <a href="http://jakarta.apache.org/cactus/1.5-beta1/ANNOUNCEMENT.txt";>
  +release announcement</a>.
  +]]>
  +    </description>
  +    <dc:subject></dc:subject>
  +    <dc:creator>vmassol</dc:creator>
  +    <dc:date>2003-07-14T00:00:00+00:00</dc:date>
  +  </item>
   
     <item rdf:about="http://jakarta.apache.org/cactus/news.html#news11";>
       <title>Unit Test Java Web Apps with Cactus</title>
  
  
  

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

Reply via email to