quintonm    2003/03/28 08:02:08

  Modified:    xdocs    index.xml navigation.xml
  Log:
  worked on some text, replaced all torque stuff with a reference to db.apache.org, 
and tried to clear up downloading the 2.2 version.
  
  Scarab issue: TRQD19
  Patch supplied by Chris Chew [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.15      +20 -72    jakarta-turbine-site/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-site/xdocs/index.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- index.xml 25 Mar 2003 19:32:43 -0000      1.14
  +++ index.xml 28 Mar 2003 16:02:08 -0000      1.15
  @@ -5,6 +5,7 @@
       <author email="[EMAIL PROTECTED]">Martin Poeschl</author>
       <author email="[EMAIL PROTECTED]">Quinton McCombs</author>
       <author email="[EMAIL PROTECTED]">Jeff Linwood</author>
  +    <author email="[EMAIL PROTECTED]">Chris Chew</author>
       <title>Jakarta Turbine</title>
     </properties>
   
  @@ -23,9 +24,10 @@
     <p>
       Turbine is an excellent choice for developing applications that can use a 
       services-oriented architecture. Some of the functionality
  -    provided with Turbine includes a user and security management system, a 
  -    scheduling service, and an XML-RPC service for web services.  It is a 
  -    straightforward task to create a new service yourself.
  +    provided with Turbine includes a security management system, a 
  +    scheduling service, XML-defined form validation server,
  +    and an XML-RPC service for web services.  It is a 
  +    simple task to create new services particular to your application.
     </p>
     
     <p>
  @@ -36,7 +38,7 @@
       existing JSP tag libraries, Turbine offers support for the Sun standard. 
       Velocity is the favorite view technology of most users of the Turbine 
       framework; try it out and see if Velocity can help you develop your 
  -    web applications quicker.  
  +    web applications quicker and work more easily with non-programming designers.
     </p>
   
     <p>
  @@ -50,91 +52,37 @@
   
   <subsection name="Downloads and Versions">
     <p>
  -    There are several versions of Turbine currently available for download.
  -  </p>
  -
  -  <p>
  -    <strong>Turbine 2.2.0</strong>.
  -    <a href="http://jakarta.apache.org/turbine/turbine-2.2.0/";>Turbine 2.2.0</a> is
  +    <a 
href="http://jakarta.apache.org/builds/jakarta-turbine/turbine-2/release/2.2/";><strong>Turbine
 2.2.0</strong></a> is
       the current production quality release.
     </p>
  -
  -  <p>
  -    <strong>Turbine 2.2.1</strong>.
  -    <a href="http://jakarta.apache.org/turbine/turbine-2.2.1/";>Turbine 2.2.1</a>
  -    will be a bugfix release. It has not been scheduled for release yet.
  -  </p>
  -
     <p>
  -    <strong>Turbine 2.3</strong>.
  -    <a href="http://jakarta.apache.org/turbine/turbine-2.3/";>Turbine 2.3</a> 
  -    will be the next feature enhanced release. Starting with Turbine 2.3 we 
  +    <a href="http://jakarta.apache.org/turbine/turbine-2.3/";><strong>Turbine 
2.3</strong></a> 
  +    will be the next feature enhanced release and is currently available from CVS.
  +    Starting with Turbine 2.3 we 
       no longer support freemarker, webmacro and castor. So if you use one of 
  -    these legacy services you should switch to the supported services now, 
  -    such as Velocity, JSP, or Torque.
  +    these legacy services you should switch to the supported Velocity, JSP, or 
Torque.
     </p>
  -
     <p>
  -    <strong>Turbine 3.0</strong>.  
  -    <a href="http://jakarta.apache.org/turbine/turbine-3/";>Turbine 3.0</a> 
  -    is the development tree, has <strong>not been scheduled for release</strong>, 
  -    and is not (yet) recommended for use in a production environment.
  +    <a href="http://jakarta.apache.org/turbine/turbine-3/";><strong>Turbine 
3.0</strong></a> 
  +    is an experimental development tree currently unscheduled for release.
  +    It is not yet recommended for use in a production environment, but we encourage
  +    serious users take part in its development.
     </p>
   </subsection>
   
   </section>
   
  -<section name="Jakarta Turbine Torque">
  -
  -  <p>
  -    Torque is a persistence layer that will generate all of your value object 
  -    classes and O-R mapping classes from a single XML definition file.  
  -    Torque can eliminate many of the problems developers have with keeping 
  -    database and value object code in sync, and it doesn't require developers 
  -    to write Data Access Object (DAO) code. Torque helps the developer meet 
  -    their project goals quicker, by providing an infrastructure framework.
  -    Torque also includes a runtime environment to run the
  -    generated classes.
  -  </p>
  -
  +<section name="Torque">
     <p>
  -    Torque was developed as part of Turbine and is now decoupled.
  -    <a href="http://db.apache.org/torque/";>Torque</a> is a subproject of
  -    <a href="http://db.apache.org/";>db.apache.org</a>
  +    <a href="http://db.apache.org/torque/";>Torque</a> is a persistence layer 
originally developed as part of Turbine.
  +    Torque is now decoupled and a subproject of <a 
href="http://db.apache.org/";>db.apache.org</a>.
     </p>
  -
  -<subsection name="Downloads and Versions">
  -  <p>
  -    There are several versions of Torque currently available for download.
  -  </p>
  -
  -  <!-- FIXME: Move the content pointed to by these version URLs to -->
  -  <!-- db.apache.org.  Afterwards, change version URLs. -->
  -
  -  <p>
  -    <strong>Torque 3.0</strong>.
  -    <a href="http://jakarta.apache.org/turbine/torque-3.0.0/";>Torque 3.0</a> is
  -    the current production quality release.
  -  </p>
  -
  -  <p>
  -    <strong>Torque 3.0.1</strong>.
  -    <a href="http://jakarta.apache.org/turbine/torque-3.0.1/";>Torque 3.0.1</a>
  -    will be a bugfix release. It has not been scheduled for release yet.
  -  </p>
  -
  -  <p>
  -    <strong>Torque 3.1</strong>.
  -    <a href="http://db.apache.org/torque/";>Torque 3.1</a> will
  -    be the next feature enhanced release.
  -  </p>
  -</subsection>
  -
   </section>
   
   <section name="Maven">
     <p>
  -    Maven has moved to <a href="http://maven.apache.org";>maven.apache.org</a>
  +    <a href="http://maven.apache.org";>Maven</a> is an advanced Java Project 
Management tool originally developed with turbine.
  +    Maven has moved to <a href="http://maven.apache.org";>maven.apache.org</a>.
     </p>
   </section>
   
  
  
  
  1.12      +5 -11     jakarta-turbine-site/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-site/xdocs/navigation.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- navigation.xml    25 Mar 2003 20:40:30 -0000      1.11
  +++ navigation.xml    28 Mar 2003 16:02:08 -0000      1.12
  @@ -7,9 +7,6 @@
       <body>
       <links>
         <item name="Turbine"                 href="/"/>
  -      <item name="Turbine-2"               href="/turbine-2.2.1/"/>
  -      <item name="Turbine-3"               href="/turbine-3/"/>
  -      <item name="Torque"                  href="http://db.apache.org/torque/"/>
         <item name="Fulcrum"                 href="/fulcrum/"/>
         <item name="TDK"                     href="/tdk/"/>
         <item name="JCS"                     href="/jcs/"/>
  @@ -19,16 +16,13 @@
       <menu name="Turbine">
           <item name="Front Page"            href="/index.html"/>
           <item name="News and Status"       href="/news.html"/>
  -        <item name="Download"                   
href="http://jakarta.apache.org/builds/jakarta-turbine/"/>
  +        <item name="Download"                       
href="http://jakarta.apache.org/builds/jakarta-turbine/"/>
       </menu>
   
       <menu name="Documentation">
           <item name="Turbine 2.2"           href="/turbine-2.2.1/index.html"/>
  -        <item name="Turbine 2.3"           href="/turbine-2.3/index.html"/>
  -        <item name="Turbine 3"             href="/turbine-3/index.html"/>
  -        <item name="Torque 3.0.0"          href="/torque-3.0.0/index.html"/>
  -        <item name="Torque 3.0.1"          href="/torque-3.0.1/index.html"/>
  -        <item name="Torque 3.1"            href="http://db.apache.org/torque/"/>
  +        <item name="Turbine 2.3 Development Info"     
href="/turbine-2.3/index.html"/>
  +        <item name="Turbine 3 Development Info"       href="/turbine-3/index.html"/>
           <item name="Fulcrum"               href="/fulcrum/index.html"/>
           <item name="TDK"                   href="/tdk/index.html"/>
           <item name="JCS"                   href="/jcs/index.html"/>
  @@ -39,13 +33,13 @@
           <item name="Powered by Turbine"    href="/common/powered.html"/>
           <item name="License"               href="/common/license.html"/>
       </menu>
  -
  +    
       <menu name="Development">
           <item name="Coding Specification"  href="/common/code-standards.html"/>
           <item name="Developer Links"       href="/common/developer-links.html"/>
           <item name="Documentation"         href="/common/documentation.html"/>
           <item name="Further Reading"       href="/common/further-reading.html"/>
       </menu>
  -
  +    
       </body>
   </project>
  
  
  

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

Reply via email to