You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2006/06/21 02:24:20 UTC

svn commit: r415848 - in /jakarta/turbine/site: ./ xdocs/ xdocs/common/ xdocs/further-reading/

Author: seade
Date: Tue Jun 20 17:24:19 2006
New Revision: 415848

URL: http://svn.apache.org/viewvc?rev=415848&view=rev
Log:
I think we can safely stop promoting Apachecon '05 now.
Fixed/removed a tonne of broken links.

Added:
    jakarta/turbine/site/LICENSE.txt
Modified:
    jakarta/turbine/site/README.txt
    jakarta/turbine/site/project.xml
    jakarta/turbine/site/xdocs/common/developer-links.xml
    jakarta/turbine/site/xdocs/common/further-reading.xml
    jakarta/turbine/site/xdocs/common/powered.xml
    jakarta/turbine/site/xdocs/further-reading/index.xml
    jakarta/turbine/site/xdocs/navigation.xml
    jakarta/turbine/site/xdocs/news.xml
    jakarta/turbine/site/xdocs/turbine-concepts.xml

Added: jakarta/turbine/site/LICENSE.txt
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/LICENSE.txt?rev=415848&view=auto
==============================================================================
--- jakarta/turbine/site/LICENSE.txt (added)
+++ jakarta/turbine/site/LICENSE.txt Tue Jun 20 17:24:19 2006
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Modified: jakarta/turbine/site/README.txt
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/README.txt?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/README.txt (original)
+++ jakarta/turbine/site/README.txt Tue Jun 20 17:24:19 2006
@@ -6,7 +6,7 @@
 The Turbine web site is based on .xml files which are transformed
 into .html files using Maven.
 
-<http://jakarta.apache.org/turbine/maven>
+<http://maven.apache.org/>
 
 Once you have the site checked out locally, cd into your
 jakarta-Turbine-site directory and execute:
@@ -26,5 +26,5 @@
 
 maven site:deploy
 
-To do this you need an account on the jakarta.apache.org machine!!
+To do this you need an account on the people.apache.org machine!!
 

Modified: jakarta/turbine/site/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/project.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/project.xml (original)
+++ jakarta/turbine/site/project.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
   </description>
   <url>http://jakarta.apache.org/turbine/</url>
   <issueTrackingUrl>http://issues.apache.org/jira/browse/TRB</issueTrackingUrl>
-  <siteAddress>svn.apache.org</siteAddress>
+  <siteAddress>people.apache.org</siteAddress>
   <siteDirectory>/www/jakarta.apache.org/turbine/</siteDirectory>
 
   <repository>
@@ -121,9 +121,40 @@
       </roles>
       <timezone>2</timezone>
     </developer>
+    <developer>
+      <name>Scott Eade</name>
+      <id>seade</id>
+      <email>seade@backstagetech.com.au</email>
+      <organization>Backstage Technologies Pty. Ltd.</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>-10</timezone>
+    </developer>
   </developers>
 
-  <dependencies></dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>maven</groupId>
+      <artifactId>maven-changelog-plugin</artifactId>
+      <version>1.8.2</version>
+      <type>plugin</type>
+    </dependency>
+
+    <dependency>
+      <groupId>maven</groupId>
+      <artifactId>maven-site-plugin</artifactId>
+      <version>1.6.1</version>
+      <type>plugin</type>
+    </dependency>
+
+    <dependency>
+      <groupId>maven</groupId>
+      <artifactId>maven-xdoc-plugin</artifactId>
+      <version>1.9.2</version>
+      <type>plugin</type>
+    </dependency>
+  </dependencies>
 
   <build>
     <sourceDirectories></sourceDirectories>
@@ -133,8 +164,13 @@
     <jars></jars>
   </build>
   
-  <reports>
+  <!-- reports>
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>
+  </reports -->
+  <reports>
+    <report>maven-changelog-plugin</report>
+    <report>maven-license-plugin</report>
+    <report>maven-linkcheck-plugin</report>
   </reports>
 </project>

Modified: jakarta/turbine/site/xdocs/common/developer-links.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/common/developer-links.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/common/developer-links.xml (original)
+++ jakarta/turbine/site/xdocs/common/developer-links.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@
 
 <ul>
 <li>Servlet Specs: 
-  <a href="http://java.sun.com/cgi-bin/download3.cgi?config-file=servlet2_2-spec.config&amp;platform=pdf&amp;type=spec&amp;button=continue"><b>2.2</b></a>, 
-  <a href="http://java.sun.com/Download4?config-file=servlet-2_3-pfd2-spec.config&amp;platform=pdf&amp;type=spec&amp;button=Continue"><b>2.3</b></a>
+  <a href="http://java.sun.com/products/servlet/download.html"><b>2.2</b></a>, 
+  <a href="http://www.jcp.org/aboutJava/communityprocess/final/jsr053/"><b>2.3</b></a>
 </li>
 <li>Servlet API: 
   <a href="http://java.sun.com/products/servlet/2.2/javadoc/"><b>2.2</b></a>, 
@@ -54,7 +54,7 @@
 <b><a href="http://www.w3.org/TR/html4/">4.0</a></b>
 </li>
 <li>Cookie Specs: 
-<a href="http://home.netscape.com/newsref/std/cookie_spec.html"><b>Netscape</b></a>, 
+<a href="http://wp.netscape.com/newsref/std/cookie_spec.html"><b>Netscape</b></a>, 
 <b><a href="http://www.servlets.com/rfcs/rfc2109.txt">2109</a></b>
 </li>
 </ul>

Modified: jakarta/turbine/site/xdocs/common/further-reading.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/common/further-reading.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/common/further-reading.xml (original)
+++ jakarta/turbine/site/xdocs/common/further-reading.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,18 +33,18 @@
 </p>
  
 <p>
-  <a href="http://jakarta.apache.org/jetspeed">Jetspeed</a> is an open source 
+  <a href="http://portals.apache.org/jetspeed-1/">Jetspeed</a> is an open source 
   portal engine built on top of the Turbine web application framework.  Use 
   Jetspeed to develop a ready-to-go portal solution with open technology.
 </p>
  
 <p>
-  Turbine uses <a href="http://jakarta.apache.org/log4j">Log4j</a> for a 
+  Turbine uses <a href="http://logging.apache.org/log4j/">Log4j</a> for a 
   logging framework.  No more commenting System.out.println()'s in your code!
 </p>
  
 <p>
-  <a href="http://jakarta.apache.org/turbine/maven">Maven</a> is a Java 
+  <a href="http://maven.apache.org/">Maven</a> is a Java 
   project management and project comprehension tool. Maven is based on the 
   concept of a project object model (POM) in that all the artifacts produced 
   by Maven are a result of consulting a well defined model for your project.
@@ -76,23 +76,13 @@
  
 </section>
  
-<section name="Related Links">
-<p>
-  The web application framework comparison project 
-  <a href="http://www.waferproject.org/index.html">WAFER</a> takes a look at
-  the many web application frameworks available and 
-  makes a comparison.
-</p>
-</section>
- 
 <section name="Viewpoints on JSP">
  
-<p>
+<!-- p>
   On the Velocity site, there is Jon Stevens'
   <a href="http://jakarta.apache.org/velocity/ymtd/ymtd.html">
   You Make The Decision</a>, which compares Velocity to JSP.
- .
-</p>
+</p -->
 
 <p>
   Then there is Jason Hunter's

Modified: jakarta/turbine/site/xdocs/common/powered.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/common/powered.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/common/powered.xml (original)
+++ jakarta/turbine/site/xdocs/common/powered.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -52,28 +52,6 @@
     <td>
      <a href="http://www.jrank.org/">www.jrank.org</a>
     </td>
-   </tr>   
-   <tr>
-    <td>
-     <a href="http://www.emocorp.com/">www.emocorp.com</a>
-    </td>
-    <td>
-     Instant and secure electronic payment processing.
-    </td>
-    <td>
-     <a href="http://www.emocorp.com/">EMOcorp</a>
-    </td>
-   </tr>
-   <tr>
-    <td>
-     <a href="http://tambora.zenplex.org/">tambora.zenplex.org</a>
-    </td>
-    <td>
-     Home of an OSS project.
-    </td>
-    <td>
-     <a href="http://www.zenplex.org/">Zenplex</a>
-    </td>
    </tr>
    <tr>
     <td>
@@ -101,30 +79,6 @@
    </tr>
    <tr>
     <td>
-     <a href="http://www.freeflats.co.uk/">www.freeflats.co.uk</a>
-    </td>
-    <td>
-     Free Property advertisment / search for accomodation
-    </td>
-    <td>
-     Chris Kimpton
-    </td>
-   </tr>
-   <tr>
-    <td>
-     <a href="http://www.one.ee/">www.one.ee</a><br/>
-     <a href="http://www.one.lv/">www.one.lv</a><br/>
-     <a href="http://www.one.lt/">www.one.lt</a>
-    </td>
-    <td>
-     Wireless messaging web application with PIM capabilities.
-    </td>
-    <td>
-     <a href="http://www.interakta.com/">interakta</a>
-    </td>
-   </tr>
-   <tr>
-    <td>
      <a href="http://www.pfm.pl/">www.pfm.pl</a>
     </td>
     <td>
@@ -136,17 +90,6 @@
    </tr>
    <tr>
     <td>
-     <a href="http://www.wbksa.pl/">www.wbksa.pl</a>
-    </td>
-    <td>
-     A website of a major Polish bank
-    </td>
-    <td>
-     <a href="http://www.e-point.pl/en/">e-point S.A.</a>
-    </td>
-   </tr>
-   <tr>
-    <td>
      <a href="http://www.xmladvantage.com/">www.xmladvantage.com</a>
     </td>
     <td>
@@ -180,17 +123,6 @@
    </tr>
    <tr>
     <td>
-     <a href="http://www.i-bio.gov.uk/">www.i-bio.gov.uk</a>
-    </td>
-    <td>
-     Site about biotechnology.
-    </td>
-    <td>
-     <a href="http://www.aniteps.com/">Anite Public Sector</a>
-    </td>
-   </tr>
-   <tr>
-    <td>
      <a href="http://www.raleighlist.org/">www.raleighlist.org</a>
     </td>
     <td>
@@ -202,17 +134,6 @@
    </tr>
    <tr>
     <td>
-     <a href="http://www.masterauto.com.mx/">Master Auto</a>
-    </td>
-    <td>
-    Vehicle Selling Site
-    </td>
-    <td>
-     <a href="http://www.itweb.com.mx/">Integrated Technology</a>
-    </td>
-   </tr>
-   <tr>
-    <td>
      <a href="http://www.ana.com.mx/">Ana Auto Club</a>
     </td>
     <td>
@@ -281,17 +202,6 @@
     <th>URL</th>
     <th>Type</th>
     <th>Created By</th>
-   </tr>
-   <tr>
-    <td>
-     <a href="http://www.idendev.com/">www.idendev.com</a>
-    </td>
-    <td>
-     Motorolla J2ME enabled mobile phone developer network.
-    </td>
-    <td>
-     <a href="http://www.collab.net/">CollabNet</a>
-    </td>
    </tr>
    <tr>
     <td>

Modified: jakarta/turbine/site/xdocs/further-reading/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/further-reading/index.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/further-reading/index.xml (original)
+++ jakarta/turbine/site/xdocs/further-reading/index.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,44 +30,40 @@
         <li>
           <a href="j2ee-integration.html">Turbine With J2EE</a>
           - A discussion of how Turbine can be used in a J2EE project.
-          <ul><!-- FOR SPACING --></ul>
         </li>
         <li>
           <a href="pullmodel.html">Pull Model Vs. Push Model</a>
           - How and why the view piece of an MVC framework should pull data
           rather than a controller pushing data to the view.
-          <ul><!-- FOR SPACING --></ul>
         </li>
         <li>
           <a href="model2+1.html">Model 2+1</a>
           - A discussion of how Turbine follows and extends the Model-View-Controller pattern.
-          <ul><!-- FOR SPACING --></ul>
         </li>
       </ul>
     </subsection>
 
     <subsection name="Articles On Turbine And Related Projects">
     <ul>
+      <!--  This is no longer available.
       <li>
         <a href="http://www.vsj.co.uk/articles/display.asp?id=122">High Velocity Web Application Design</a>
         - Cranking out your next scalable web application with Turbine, the new Web Services workhorse.
         By Sing Li.
         <em>Published in VSJ; January 15, 2003.</em>
-        <ul><!-- FOR SPACING --></ul>
       </li>
+      -->
       <li>
         <a href="http://www.javaworld.com/javaworld/jw-10-2002/jw-1011-maven.html">Maven Article</a>
         - Maven ties together tools for better code management.
         By Jeff Linwood.
         <em>Published in JavaWorld; October 11, 2002.</em>
-        <ul><!-- FOR SPACING --></ul>
       </li>
       <li>
         <a href="http://www.javaworld.com/javaworld/jw-12-2001/jw-1228-velocity.html">Velocity Introduction</a>
         - Start up the Velocity Template Engine.
         By Geir Magnusson, Jr.
         <em>Published in JavaWorld; December 28, 2001.</em>
-        <ul><!-- FOR SPACING --></ul>
       </li>
     </ul>
     </subsection>
@@ -79,19 +75,16 @@
         technology comparable to JSP) that Turbine officially supports. Many 
         Turbine developers feel Velocity is an excellent alternative
         to JSP for web application development.
-        <ul><!-- FOR SPACING --></ul>
       </li>
       <li>
         <a href="http://portals.apache.org/jetspeed-1/">Jetspeed 1</a> - An open source 
         portal engine built on top of the Turbine web application framework.  Use 
         Jetspeed to develop a ready-to-go portal solution with open technology.
-        <ul><!-- FOR SPACING --></ul>
       </li>
       <li>
         <a href="http://logging.apache.org/log4j/docs/index.html">Log4j</a> - A standard logging
         framework used by Turbine and many other projects.
         No more commenting System.out.println()'s in your code!
-        <ul><!-- FOR SPACING --></ul>
       </li>
     </ul>
     </subsection>
@@ -103,22 +96,22 @@
         project management and project comprehension tool. Maven is based on the 
         concept of a project object model (POM) in that all the artifacts produced 
         by Maven are a result of consulting a well defined model for your project.
-        <ul><!-- FOR SPACING --></ul>
       </li>
       <li>
         <a href="http://db.apache.org/torque/">Torque</a> - A persistence layer. 
         Torque includes a generator to generate all the database resources required 
         by your application and includes a runtime environment to run the generated 
         classes.
-        <ul><!-- FOR SPACING --></ul>
       </li>
     </ul>
     </subsection>
      
     <subsection name="Viewpoints on JSP">
     <ul>
+      <!--  This is no longer available.
       <li><a href="http://wiki.apache.org/jakarta-velocity/YouMakeTheDecision">You Make The Decision</a>
        - John Stevens' article comparing Velocity to JSP.</li>
+      -->
       <li><a href="http://www.servlets.com/soapbox/problems-jsp.html">Problems with JSP</a>
        - Jason Hunters' article discussing common issues with JSP.</li>
     </ul>

Modified: jakarta/turbine/site/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/navigation.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/navigation.xml (original)
+++ jakarta/turbine/site/xdocs/navigation.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,10 +27,10 @@
       <item name="META"                    href="/meta/"/>
     </links>
 
-    <menu name="Events">  
+    <!-- menu name="Events">  
        <item name="ApacheCon US 2005"  href="http://apachecon.com/2005/US/" alt="ApacheCon US 2005"
              img="http://apache.org/images/ac2005us_blue_184x90.jpg" width="184" height="90"  />
-     </menu>
+     </menu -->
 
     <menu name="General Information">
         <item name="Overview"              href="/index.html"/>

Modified: jakarta/turbine/site/xdocs/news.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/news.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/news.xml (original)
+++ jakarta/turbine/site/xdocs/news.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 through the Apache mirror system at <a
 href="http://jakarta.apache.org/site/downloads/downloads_turbine.cgi">the
 turbine download site</a> or the <a
-href="http://www.ibiblio.org/maven/turbine//">central maven
+href="http://www.ibiblio.org/maven/turbine/">central maven
 repository</a>.
 </p>
 

Modified: jakarta/turbine/site/xdocs/turbine-concepts.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/turbine-concepts.xml?rev=415848&r1=415847&r2=415848&view=diff
==============================================================================
--- jakarta/turbine/site/xdocs/turbine-concepts.xml (original)
+++ jakarta/turbine/site/xdocs/turbine-concepts.xml Tue Jun 20 17:24:19 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2001-2004 The Apache Software Foundation
+Copyright 2001-2006 The Apache Software Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@
  <li>Presentation layer - <a href="http://jakarta.apache.org/velocity/">Velocity</a> or JSP</li>
  <li>Database layer - Turbine uses <a
      href="http://db.apache.org/torque">Torque</a>, but different OM
-     layers like <a href="http://db.apache.org/obj/">OJB</a> or <a
+     layers like <a href="http://db.apache.org/ojb/">OJB</a> or <a
      href="http://www.hibernate.org/">Hibernate</a> are also
      supported.</li>
  <li>HTML Form Validation using the Turbine provided &quot;Intake&quot;-Service.</li>
@@ -296,7 +296,7 @@
 <p>
 A very good tutorial on using Torque is also on the Turbine web site,
 here <a
-href="http://db.apache.org/torque/tutorial.html">http://db.apache.org/torque/tutorial.html</a>.
+href="http://db.apache.org/torque/releases/torque-3.2/tutorial/">http://db.apache.org/torque/releases/torque-3.2/tutorial/</a>.
 </p>
 
 <p>Velocity is available from <a
@@ -313,7 +313,7 @@
 The original version of this page has been written by Jeff Linwood. He
 has been using Turbine to build a web services infrastructure
 application. He is a co-author of <a
-href="http://www.amazon.com/exec/obidos/ASIN/1861007817/ref=pd_ecc_rvi_1/002-4687840-3104031">Professional
+href="http://www.amazon.com/gp/product/1861007817/">Professional
 Struts Applications</a>, which covers Velocity. He'd like to thank
 Jason van Zyl, Troy Mutter, Skip Walker, David Minter, Jason Pettiss,
 and his brother Rob Linwood for reviewing this article.



---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org