You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by jt...@apache.org on 2005/11/05 02:30:09 UTC

svn commit: r330954 - in /db/derby/site/trunk: build/site/ build/site/integrate/ build/site/papers/ src/documentation/content/xdocs/ src/documentation/content/xdocs/integrate/ src/documentation/content/xdocs/papers/

Author: jta
Date: Fri Nov  4 17:30:03 2005
New Revision: 330954

URL: http://svn.apache.org/viewcvs?rev=330954&view=rev
Log:
Added a link to Dan Scott's Derby book to the Papers page. Also added link
to tab; thus, all pages in the Papers section show modification to the 
navigation.
Modified the Tomcat entry in the integration summary page to include links to
Stan Bradbury's Tomcat Demo and Oyvind's blog entry on life cycle management.
Updated the ApacheCon US 2005 blurb -- the Security presentation moved to
Wednesday.

Modified:
    db/derby/site/trunk/build/site/index.html
    db/derby/site/trunk/build/site/integrate/misc.html
    db/derby/site/trunk/build/site/linkmap.html
    db/derby/site/trunk/build/site/papers/ApacheConUs04.html
    db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
    db/derby/site/trunk/build/site/papers/Intersect-design.html
    db/derby/site/trunk/build/site/papers/JDBCImplementation.html
    db/derby/site/trunk/build/site/papers/MiscPresentations.html
    db/derby/site/trunk/build/site/papers/btree_package.html
    db/derby/site/trunk/build/site/papers/derby_arch.html
    db/derby/site/trunk/build/site/papers/derby_htw.html
    db/derby/site/trunk/build/site/papers/derby_web.html
    db/derby/site/trunk/build/site/papers/fortune_tut.html
    db/derby/site/trunk/build/site/papers/index.html
    db/derby/site/trunk/build/site/papers/logformats.html
    db/derby/site/trunk/build/site/papers/optimizer.html
    db/derby/site/trunk/build/site/papers/pageformats.html
    db/derby/site/trunk/build/site/papers/recovery.html
    db/derby/site/trunk/build/site/papers/versionupgrade.html
    db/derby/site/trunk/src/documentation/content/xdocs/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
    db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/site.xml

Modified: db/derby/site/trunk/build/site/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/index.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/index.html (original)
+++ db/derby/site/trunk/build/site/index.html Fri Nov  4 17:30:03 2005
@@ -166,7 +166,7 @@
        
 <li> Performance Analysis of Apache Derby (Tuesday)</li>
        
-<li> Apache Derby Security (Tuesday)</li>
+<li> Apache Derby Security (Wednesday)</li>
        
 <li> Building Highly Available Applications with Geronimo and Derby
             (Wednesday)</li>

Modified: db/derby/site/trunk/build/site/integrate/misc.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/integrate/misc.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/integrate/misc.html (original)
+++ db/derby/site/trunk/build/site/integrate/misc.html Fri Nov  4 17:30:03 2005
@@ -401,8 +401,11 @@
   
 <td colspan="1" rowspan="1"> <a class="external" href="http://ibatis.apache.org">iBATIS</a></td>
    <td colspan="1" rowspan="1"> Apache </td>
-   <td colspan="1" rowspan="1"> <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e">Stan Bradbury contributed an article</a>
-on how to <a href="http://db.apache.org/derby/integrate/JPetStoreDerby.html">get the iBATIS JPetStore application running with Derby and WebSphere</a>.
+   <td colspan="1" rowspan="1"> <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e">Stan Bradbury contributed articles</a>
+  on how to run the iBATIS JPetStore application with
+  <a href="JPetStoreGeronimo.html">Geronimo</a>,
+  <a href="DerbyTomcat5512JPetStor.html">Tomcat</a>, and
+  <a href="JPetStoreWebSphere.html">WebSphere</a>.
    </td>
 
 </tr>
@@ -585,12 +588,14 @@
 <td colspan="1" rowspan="1"> <a class="external" href="http://jakarta.apache.org/tomcat/">Tomcat</a></td>
    <td colspan="1" rowspan="1"> <a class="external" href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a> </td>
    <td colspan="1" rowspan="1"> Jakarta Tomcat is an open source servlet container.
-        View the Derby mail list topics:
-          <a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200411.mbox/%3c418BC923.4090602@rwmotloc.com%3e">DBCP</a>,
-          <a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200411.mbox/%3c20041110030758.566ec2f3.de-226@lafn.org%3e">Derby database location</a>, and
-          <a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200411.mbox/%3c20041111000049.52dab3f8.de-226@lafn.org%3e">shutting Derby down</a>.
-	  Also, the <a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-	  uses Tomcat.
+	  The <a href="../papers/fortune_tut.html">Embedded Tutorial</a>
+	  uses Tomcat 5.0,
+          the
+          <a href="DerbyTomcat5512JPetStor.html">Tomcat Demo</a> uses 
+          Tomcat 5.5, and
+          Oyvind Bakksjo's blog suggests a
+ <a class="external" href="http://weblogs.java.net/blog/bakksjo/archive/2005/09/embedding_the_a_1.html">"better way to do container-independent lifecycle management in the 
+          case that Derby is bundled with/used by only one web application"</a>.
     </td>
 
 </tr>
@@ -611,7 +616,7 @@
 </div>
 
 
-<a name="N1038F"></a><a name="Wish+List"></a>
+<a name="N10393"></a><a name="Wish+List"></a>
 <h2 class="boxed">Wish List</h2>
 <div class="section">
 <p>
@@ -632,7 +637,7 @@
 </div>
 
 
-<a name="N103AB"></a><a name="Products+by+Type"></a>
+<a name="N103AF"></a><a name="Products+by+Type"></a>
 <h2 class="boxed">Products by Type</h2>
 <div class="section">
 <p>
@@ -853,7 +858,7 @@
 
 
 <p>
-<em>Last updated: October 7, 2005</em>
+<em>Last updated: November 4, 2005</em>
 </p>
 
 </div>

Modified: db/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.html Fri Nov  4 17:30:03 2005
@@ -201,7 +201,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.8" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -216,7 +216,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.9', 'skin/')" id="menu_1.9Title" class="menutitle">Integration</div>
@@ -870,7 +873,7 @@
   
 <ul>
 <li>
-<a href="papers/">Articles</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>articles</em>
+<a href="papers/">Articles/Books</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>articles</em>
 </li>
 <ul>
     
@@ -900,7 +903,13 @@
     
 <ul>
 <li>
-<a class="external" href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dW</em>
+<a class="external" href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dW</em>
+</li>
+</ul>
+    
+<ul>
+<li>
+<a class="external" href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>racing</em>
 </li>
 </ul>
   

Modified: db/derby/site/trunk/build/site/papers/ApacheConUs04.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/ApacheConUs04.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/ApacheConUs04.html (original)
+++ db/derby/site/trunk/build/site/papers/ApacheConUs04.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyClientSpec.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyClientSpec.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyClientSpec.html Fri Nov  4 17:30:03 2005
@@ -162,7 +162,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -177,7 +177,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/Intersect-design.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/Intersect-design.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/Intersect-design.html (original)
+++ db/derby/site/trunk/build/site/papers/Intersect-design.html Fri Nov  4 17:30:03 2005
@@ -161,7 +161,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -176,7 +176,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/JDBCImplementation.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/JDBCImplementation.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/JDBCImplementation.html (original)
+++ db/derby/site/trunk/build/site/papers/JDBCImplementation.html Fri Nov  4 17:30:03 2005
@@ -166,7 +166,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -181,7 +181,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/MiscPresentations.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/MiscPresentations.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/MiscPresentations.html (original)
+++ db/derby/site/trunk/build/site/papers/MiscPresentations.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/btree_package.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/btree_package.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/btree_package.html (original)
+++ db/derby/site/trunk/build/site/papers/btree_package.html Fri Nov  4 17:30:03 2005
@@ -161,7 +161,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -176,7 +176,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/derby_arch.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_arch.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_arch.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_arch.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/derby_htw.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_htw.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_htw.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_htw.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/derby_web.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_web.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_web.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_web.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/fortune_tut.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/fortune_tut.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/fortune_tut.html (original)
+++ db/derby/site/trunk/build/site/papers/fortune_tut.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/index.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/index.html (original)
+++ db/derby/site/trunk/build/site/papers/index.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit">
@@ -208,7 +211,7 @@
 <a href="#Instruction">Instruction</a>
 </li>
 <li>
-<a href="#Articles">Articles</a>
+<a href="#Articles+and+Books">Articles and Books</a>
 </li>
 <li>
 <a href="#How+to+Contribute+Papers">How to Contribute Papers</a>
@@ -476,8 +479,8 @@
 </div>
 
 
-<a name="N101CA"></a><a name="Articles"></a>
-<h2 class="boxed">Articles</h2>
+<a name="N101CA"></a><a name="Articles+and+Books"></a>
+<h2 class="boxed">Articles and Books</h2>
 <div class="section"></div>
 
 
@@ -537,17 +540,28 @@
 <tr>
   
 <td colspan="1" rowspan="1">developerWorks</td>
-  <td colspan="1" rowspan="1"><a class="external" href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks Cloudscape Zone</a></td>
+  <td colspan="1" rowspan="1"><a class="external" href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a></td>
    <td colspan="1" rowspan="1">Various</td>
    <td colspan="1" rowspan="1">Web site hosts technical articles about Derby.
   </td>
 
 </tr>
 
+<tr>
+  
+<td colspan="1" rowspan="1">Off to Races</td>
+  <td colspan="1" rowspan="1">
+   <em><a class="external" href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Apache Derby -- Off to the Races</a></em> 
+   </td>
+   <td colspan="1" rowspan="1">Paul C. Zikopoulos, George Baklarz, Dan Scott</td>
+   <td colspan="1" rowspan="1">IBM Press (2006)</td>
+
+</tr>
+
 </table>
 
 
-<a name="N10270"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N1028C"></a><a name="How+to+Contribute+Papers"></a>
 <h2 class="boxed">How to Contribute Papers</h2>
 <div class="section">
 <p>

Modified: db/derby/site/trunk/build/site/papers/logformats.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/logformats.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/logformats.html (original)
+++ db/derby/site/trunk/build/site/papers/logformats.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/optimizer.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/optimizer.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/optimizer.html (original)
+++ db/derby/site/trunk/build/site/papers/optimizer.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/pageformats.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/pageformats.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/pageformats.html (original)
+++ db/derby/site/trunk/build/site/papers/pageformats.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/recovery.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/recovery.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/recovery.html (original)
+++ db/derby/site/trunk/build/site/papers/recovery.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/build/site/papers/versionupgrade.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/versionupgrade.html?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/versionupgrade.html (original)
+++ db/derby/site/trunk/build/site/papers/versionupgrade.html Fri Nov  4 17:30:03 2005
@@ -159,7 +159,7 @@
 <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Articles/Books</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456">Double Take</a>
@@ -174,7 +174,10 @@
 <a href="http://www.devx.com/IBMCloudscape/Article/28526/1763">Versus MySQL</a>
 </div>
 <div class="menuitem">
-<a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks</a>
+<a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a>
+</div>
+<div class="menuitem">
+<a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&rl=1">Off to Races</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/index.xml?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/index.xml Fri Nov  4 17:30:03 2005
@@ -15,7 +15,7 @@
      <ul>
        <li> Apache Derby: Hands On Tutorial (Saturday) </li>
        <li> Performance Analysis of Apache Derby (Tuesday)</li>
-       <li> Apache Derby Security (Tuesday)</li>
+       <li> Apache Derby Security (Wednesday)</li>
        <li> Building Highly Available Applications with Geronimo and Derby
             (Wednesday)</li>
      </ul>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml Fri Nov  4 17:30:03 2005
@@ -164,8 +164,11 @@
 <tr>
   <td> <a href="http://ibatis.apache.org">iBATIS</a></td>
    <td> Apache </td>
-   <td> <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e">Stan Bradbury contributed an article</a>
-on how to <a href="http://db.apache.org/derby/integrate/JPetStoreDerby.html">get the iBATIS JPetStore application running with Derby and WebSphere</a>.
+   <td> <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e">Stan Bradbury contributed articles</a>
+  on how to run the iBATIS JPetStore application with
+  <a href="JPetStoreGeronimo.html">Geronimo</a>,
+  <a href="DerbyTomcat5512JPetStor.html">Tomcat</a>, and
+  <a href="JPetStoreWebSphere.html">WebSphere</a>.
    </td>
 </tr>
 
@@ -303,12 +306,14 @@
    <td> <a href="http://jakarta.apache.org/tomcat/">Tomcat</a></td>
    <td> <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a> </td>
    <td> Jakarta Tomcat is an open source servlet container.
-        View the Derby mail list topics:
-          <a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200411.mbox/%3c418BC923.4090602@rwmotloc.com%3e">DBCP</a>,
-          <a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200411.mbox/%3c20041110030758.566ec2f3.de-226@lafn.org%3e">Derby database location</a>, and
-          <a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200411.mbox/%3c20041111000049.52dab3f8.de-226@lafn.org%3e">shutting Derby down</a>.
-	  Also, the <a href="../papers/fortune_tut.html">Embedded Tutorial</a>
-	  uses Tomcat.
+	  The <a href="../papers/fortune_tut.html">Embedded Tutorial</a>
+	  uses Tomcat 5.0,
+          the
+          <a href="DerbyTomcat5512JPetStor.html">Tomcat Demo</a> uses 
+          Tomcat 5.5, and
+          Oyvind Bakksjo's blog suggests a
+ <a href="http://weblogs.java.net/blog/bakksjo/archive/2005/09/embedding_the_a_1.html">"better way to do container-independent lifecycle management in the 
+          case that Derby is bundled with/used by only one web application"</a>.
     </td>
 </tr>
 <tr>
@@ -477,6 +482,6 @@
 
 </section>
 
-<p><em>Last updated: October 7, 2005</em></p>
+<p><em>Last updated: November 4, 2005</em></p>
 </body>
 </document>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml Fri Nov  4 17:30:03 2005
@@ -183,7 +183,7 @@
 </section>
 
 <section>
-<title>Articles</title>
+<title>Articles and Books</title>
 </section>
 
 <table>
@@ -225,10 +225,18 @@
 </tr>
 <tr>
   <td>developerWorks</td>
-  <td><a href="http://www.ibm.com/developerworks/db2/zones/cloudscape/">developerWorks Cloudscape Zone</a></td>
+  <td><a href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html">developerWorks</a></td>
    <td>Various</td>
    <td>Web site hosts technical articles about Derby.
   </td>
+</tr>
+<tr>
+  <td>Off to Races</td>
+  <td>
+   <em><a href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&amp;rl=1">Apache Derby -- Off to the Races</a></em> 
+   </td>
+   <td>Paul C. Zikopoulos, George Baklarz, Dan Scott</td>
+   <td>IBM Press (2006)</td>
 </tr>
 </table>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/site.xml?rev=330954&r1=330953&r2=330954&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Fri Nov  4 17:30:03 2005
@@ -63,12 +63,13 @@
       <birt     label="Eclipse BIRT"  href="http://www.eclipse.org/birt/tutorial/basic/"/>
   </howto>
 
-  <articles label="Articles" href="papers/" tab="papers">
+  <articles label="Articles/Books" href="papers/" tab="papers">
     <dbltake label="Double Take" href="http://www.db2mag.com/story/showArticle.jhtml?articleID=51000456"/>
     <vsg label="Flying" href="http://www.vsj.co.uk/databases/display.asp?id=466"/>
     <javardb label="Java RDBMS" href="http://www.linux-mag.com/content/view/2134/"/>
     <mysql label="Versus MySQL" href="http://www.devx.com/IBMCloudscape/Article/28526/1763"/>
-    <dW label="developerWorks" href="http://www.ibm.com/developerworks/db2/zones/cloudscape/"/>
+    <dW label="developerWorks" href="http://www.ibm.com/developerworks/opensource/top-projects/derby.html"/>
+    <racing label="Off to Races" href="http://www.ibmpressbooks.com/bookstore/product.asp?isbn=0131855255&amp;rl=1"/>
   </articles>
 
   <integrate label="Integration" href="integrate/" tab="integrate">