db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r106536 - in incubator/derby/site/trunk: build/site/binaries build/site/papers src/documentation/content/binaries src/documentation/content/xdocs src/documentation/content/xdocs/papers
Date Thu, 25 Nov 2004 03:21:58 GMT
Author: jta
Date: Wed Nov 24 19:21:55 2004
New Revision: 106536

URL: http://svn.apache.org/viewcvs?view=rev&rev=106536
Log:
Cleaned up papers tab and content, attempting to get better organization of the information.
Updated instructions in derby_web.html for making web site changes visible.
Added fortune_tut.html to provide an overview of derby tutorial.
Also updated the tutorial zip/tar files.

Added:
   incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-24Nov04.tar.gz   (contents, props changed)
   incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-24Nov04.zip   (contents, props changed)
   incubator/derby/site/trunk/build/site/papers/MiscPresentations.html
   incubator/derby/site/trunk/build/site/papers/fortune_tut.html
   incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-24Nov04.tar.gz   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-24Nov04.zip   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/MiscPresentations.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/fortune_tut.xml
Modified:
   incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html
   incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html
   incubator/derby/site/trunk/build/site/papers/derby_arch.html
   incubator/derby/site/trunk/build/site/papers/derby_web.html
   incubator/derby/site/trunk/build/site/papers/index.html
   incubator/derby/site/trunk/build/site/papers/misc.html
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml

Added: incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-24Nov04.tar.gz
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-24Nov04.tar.gz?view=auto&rev=106536
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-24Nov04.zip
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-24Nov04.zip?view=auto&rev=106536
==============================================================================
Binary file. No diff available.

Modified: incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html?view=diff&rev=106536&p1=incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html&r1=106535&p2=incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html&r2=106536
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html	Wed Nov 24 19:21:55 2004
@@ -158,7 +158,7 @@
 </li>
       
 <li>
-<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (Open Office)</a>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </li>
   
 </ul>
@@ -168,31 +168,21 @@
 <ul>
       
 <li>
-<span class="sel"><font color="#ffcc00">ApacheCon US 2004</font></span>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
 </li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
+<span class="sel"><font color="#ffcc00">ApacheCon US '04</font></span>
 </li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_intro.pdf">Introduction (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/reuben_derby_perf.pdf">Performance (PDF)</a>
+  
+</ul>
 </li>
-      
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
-</li>
+<font color="#CFDCED">How To's</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
 </li>
   
 </ul>
@@ -280,17 +270,11 @@
 <li> 
 <p>
         
-<em>Apache Derby: Embed This!</em> is a tutorial for novices that
-        shows how to embed Derby in other Apache technologies -- and 
-        other Apache technologies into Derby
-	[<a href="../binaries/DerbyFS-tut-12Nov04.tar.gz">tar.gz</a>]
-	[<a href="../binaries/DerbyFS-tut-12Nov04.zip">zip</a>].
-	Extract the distribution, then open <em>doc/index.html</em> with your
-	browser.
-	<em>The tutorial will be updated soon to incorporate ApacheCon
-	feedback.</em>
-	
-</p>
+<em>Apache Derby: Embed This!</em> used the
+	<a href="fortune_tut.html">Apache Derby Fortune Server Tutorial</a>
+        to show how to embed Derby in other Apache technologies -- and 
+        other Apache technologies into Derby.
+	</p>
    
 </li>
 
@@ -330,7 +314,7 @@
 </div>
 
 
-<a name="N1005B"></a><a name="Derby+Code+Contest"></a>
+<a name="N10051"></a><a name="Derby+Code+Contest"></a>
 <h3>Derby Code Contest</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -348,7 +332,7 @@
 <li> Result can be a tool, mini-application, or any other demonstration of Derby integration</li>
   
 </ul>
-<a name="N10073"></a><a name="First+Place"></a>
+<a name="N10069"></a><a name="First+Place"></a>
 <h4>First Place</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -376,7 +360,7 @@
   Derby mail lists.
   </p>
 </div>
-<a name="N10092"></a><a name="Second+Place"></a>
+<a name="N10088"></a><a name="Second+Place"></a>
 <h4>Second Place</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -394,7 +378,7 @@
   been interacting with in email during the last year(s).
   </p>
 </div>
-<a name="N100A6"></a><a name="Third+Place"></a>
+<a name="N1009C"></a><a name="Third+Place"></a>
 <h4>Third Place</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html?view=diff&rev=106536&p1=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r1=106535&p2=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r2=106536
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	Wed Nov 24 19:21:55 2004
@@ -158,7 +158,7 @@
 </li>
       
 <li>
-<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (Open Office)</a>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </li>
   
 </ul>
@@ -168,31 +168,21 @@
 <ul>
       
 <li>
-<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
 </li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
 </li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_intro.pdf">Introduction (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/reuben_derby_perf.pdf">Performance (PDF)</a>
+  
+</ul>
 </li>
-      
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
-</li>
+<font color="#CFDCED">How To's</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
 </li>
   
 </ul>

Added: incubator/derby/site/trunk/build/site/papers/MiscPresentations.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/MiscPresentations.html?view=auto&rev=106536
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/build/site/papers/MiscPresentations.html	Wed Nov 24 19:21:55 2004
@@ -0,0 +1,288 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Miscellaneous Derby Presentations</title>
+<link type="text/css" href="../skin/page.css" rel="stylesheet">
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<!--================= start Navigation Path ==================-->
+<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Navigation Path ==================-->
+<!--================= start Banner ==================-->
+<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<!--================= start Group Logo ==================-->
+<td bgcolor="#294563"><a href="http://incubator.apache.org"><img border="0" class="logoImage" alt="" src="../resources/images/apache-incubator.png" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Group Logo ==================-->
+<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://incubator.apache.org/derby/"><img border="0" class="logoImage" alt="Derby" src="../images/derby-logo.jpg" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Project Logo ==================-->
+<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563">
+<form target="_blank" action="http://www.google.com/search" method="get">
+<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
+<tr>
+<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="incubator.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit">
+<br>
+<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
+                      the Derby site
+                      
+                      
+                    </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td>
+</tr>
+</table>
+</form>
+</td>
+<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" bgcolor="#294563" colspan="2">
+<!--================= start Tabs ==================-->
+<div class="tab">
+<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../manuals/index.html">Manuals</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../papers/index.html">Papers</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+<!--================= end Tabs ==================-->
+</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Banner ==================-->
+<!--================= start Menu, NavBar, Content ==================-->
+<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top">
+<table summary="menu" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<!--================= start left top NavBar ==================-->
+<td rowspan="3" valign="top">
+<table summary="blue line" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif">&nbsp;</font></td>
+</tr>
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td>
+<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F">
+<!--================= start Menu items ==================-->
+<div class="menu">
+<ul>
+<li>
+<font color="#CFDCED">About</font>
+<ul>
+       
+<li>
+<a href="../papers/index.html">Index</a>
+</li>
+       
+<li>
+<a href="../papers/derby_web.html">Derby Web Site</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Derby Engine</font>
+<ul>
+      
+<li>
+<a href="../papers/derby_arch.html">Architecture</a>
+</li>
+      
+<li>
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
+      
+<li>
+<a href="../papers/misc.html">Summary</a>
+</li>
+      
+<li>
+<a href="../papers/../DOTS_Derby.html">DOTS</a>
+</li>
+      
+<li>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+</li>
+      
+<li>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Presentations</font>
+<ul>
+      
+<li>
+<span class="sel"><font color="#ffcc00">Colorado 2004</font></span>
+</li>
+      
+<li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">How To's</font>
+<ul>
+      
+<li>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
+</li>
+  
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Miscellaneous Derby Presentations</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#Colorado+Software+Summit+2004">Colorado Software Summit 2004</a>
+</li>
+</ul>
+
+
+<a name="N1000C"></a><a name="Colorado+Software+Summit+2004"></a>
+<h3>Colorado Software Summit 2004</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p> 
+Dan Debrunner
+<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&msgNo=903">spoke at the Colorado Software Summit</a>.
+His presentation,
+<em>Internals of Derby</em>,
+is available for download
+[<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+</p>
+</div>
+
+
+
+<p>
+
+<em>Last updated: 24-November-2004</em>
+
+</p>
+
+
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;Apache Software Foundation All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

Modified: incubator/derby/site/trunk/build/site/papers/derby_arch.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/derby_arch.html?view=diff&rev=106536&p1=incubator/derby/site/trunk/build/site/papers/derby_arch.html&r1=106535&p2=incubator/derby/site/trunk/build/site/papers/derby_arch.html&r2=106536
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_arch.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_arch.html	Wed Nov 24 19:21:55 2004
@@ -158,7 +158,7 @@
 </li>
       
 <li>
-<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (Open Office)</a>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </li>
   
 </ul>
@@ -168,31 +168,21 @@
 <ul>
       
 <li>
-<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
 </li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
 </li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_intro.pdf">Introduction (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/reuben_derby_perf.pdf">Performance (PDF)</a>
+  
+</ul>
 </li>
-      
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
-</li>
+<font color="#CFDCED">How To's</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
 </li>
   
 </ul>

Modified: incubator/derby/site/trunk/build/site/papers/derby_web.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/derby_web.html?view=diff&rev=106536&p1=incubator/derby/site/trunk/build/site/papers/derby_web.html&r1=106535&p2=incubator/derby/site/trunk/build/site/papers/derby_web.html&r2=106536
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_web.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_web.html	Wed Nov 24 19:21:55 2004
@@ -158,7 +158,7 @@
 </li>
       
 <li>
-<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (Open Office)</a>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </li>
   
 </ul>
@@ -168,31 +168,21 @@
 <ul>
       
 <li>
-<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
 </li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
 </li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_intro.pdf">Introduction (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/reuben_derby_perf.pdf">Performance (PDF)</a>
+  
+</ul>
 </li>
-      
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
-</li>
+<font color="#CFDCED">How To's</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
 </li>
   
 </ul>
@@ -276,7 +266,7 @@
 <a href="#6.+Commit+changes+to+the+src+and+build%2Fsite+directories">6. Commit changes to the src and build/site directories</a>
 </li>
 <li>
-<a href="#7.+Post+a+request+to+derby-dev+to+make+the+changes+visible">7. Post a request to derby-dev to make the changes visible</a>
+<a href="#7.+Make+web+site+changes+visible">7. Make web site changes visible</a>
 </li>
 <li>
 <a href="#8.+Considering+a+quick+fix+to+the+build+tree%3F">8. Considering a quick fix to the build tree?</a>
@@ -367,7 +357,7 @@
 </p>
 <ul>
    
-<li> Install Forrest 0.5.1.  </li>
+<li> Install Forrest.  </li>
    
 <li> After it is installed, cd into the directory of your choice
         and enter '<span class="codefrag">forrest seed</span>' to initialize a new project.
@@ -400,11 +390,12 @@
 	The <a href="JDBCImplementation.html">Derby JDBC Implementation
         Notes</a> paper is an example of an HTML document
         that is stored in the project source tree as an <span class="codefrag">ihtml</span> file.
-	Likewise, all of the Derby document files are stored as
+	Likewise, the Derby document files in the
+	<span class="codefrag">manuals</span> directory hierarchy are 
         <span class="codefrag">ihtml</span> files.
    </li>
    
-<li> You can also create an XML file for it that uses the Forrest DTD.
+<li> You can also create an XML file that uses the Forrest DTD.
 	The <a href="derby_arch.html">Derby Engine 
 	Architecture Overview</a> is an example.
         Also, the site you just seeded provides examples.
@@ -462,19 +453,26 @@
 </div>
 <p>
 When you're satisfied with how your new page looks on your seed site,
-then it is ready to be added to the Derby web site by a Derby committer.
+then it is ready to be added to the Derby web site.
+You can do a first pass by checking out a local copy of the web site:
+</p>
+<pre class="code">
+svn co http://svn.apache.org/repos/asf/incubator/derby/site/trunk
+</pre>
+<p>
+The physical structure of the web site is described in the next section.
 </p>
 </div>
 
 
-<a name="N100DA"></a><a name="Updating+the+Apache+Derby+web+site+"></a>
+<a name="N100E5"></a><a name="Updating+the+Apache+Derby+web+site+"></a>
 <h3>Updating the Apache Derby web site </h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
 The information in this section is intended for committers
 who need to add a page to the Derby web site or modify an existing page.
 </p>
-<a name="N100E3"></a><a name="1.+Install+Forrest+on+your+machine"></a>
+<a name="N100EE"></a><a name="1.+Install+Forrest+on+your+machine"></a>
 <h4>1. Install Forrest on your machine</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -486,7 +484,7 @@
 and play with it to get comfortable working with Forrest.
 </p>
 </div>
-<a name="N100F1"></a><a name="2.+Check+out+the+Derby+web+site+pages+"></a>
+<a name="N100FC"></a><a name="2.+Check+out+the+Derby+web+site+pages+"></a>
 <h4>2. Check out the Derby web site pages </h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -496,7 +494,7 @@
 svn co https://svn.apache.org/repos/asf/incubator/derby/site/trunk
 </pre>
 </div>
-<a name="N10100"></a><a name="3.+Modify+files+in+the+src+tree+"></a>
+<a name="N1010B"></a><a name="3.+Modify+files+in+the+src+tree+"></a>
 <h4>3. Modify files in the src tree </h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -543,10 +541,23 @@
 
 </tr>
 
+
+<tr>
+    
+<td colspan="1" rowspan="1"> <span class="codefrag">src/documentation/resources/images</span></td>
+    <td colspan="1" rowspan="1"> Images. </td>
+    <td colspan="1" rowspan="1"> Forrest copies these files without modifying them into 
+         <span class="codefrag">images</span> subdirectories to the files that reference them.
+    </td>
+
+</tr>
+
+
 </table>
 <p>
-What might be counter intuitive is 
-the directory structure is different for the src and build trees.
+The default directory structure 
+is markedly different for the src and build trees
+(and the Derby web site uses default locations).
 Links in source files
 need to point to the name and the location of the target file in the build tree.
 </p>
@@ -606,7 +617,7 @@
 
 </ul>
 </div>
-<a name="N10198"></a><a name="4.+Build+the+site+"></a>
+<a name="N101BA"></a><a name="4.+Build+the+site+"></a>
 <h4>4. Build the site </h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -625,7 +636,7 @@
 on the machine.
 </p>
 </div>
-<a name="N101B1"></a><a name="5.+Test+the+changes+"></a>
+<a name="N101D3"></a><a name="5.+Test+the+changes+"></a>
 <h4>5. Test the changes </h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -660,7 +671,7 @@
 
 </p>
 </div>
-<a name="N101E0"></a><a name="6.+Commit+changes+to+the+src+and+build%2Fsite+directories"></a>
+<a name="N10202"></a><a name="6.+Commit+changes+to+the+src+and+build%2Fsite+directories"></a>
 <h4>6. Commit changes to the src and build/site directories</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -671,13 +682,17 @@
 <span class="codefrag">build/webapp</span> and
 <span class="codefrag">build/tmp</span> directories,
 but they aren't checked into the Subversion repository.
+(Checking built pages into subversion is a side effect from 
+<a href="http://nagoya.apache.org/eyebrowse/BrowseList?listName=derby-dev@db.apache.org&by=subject&from=634682&to=634682&first=1&count=6">how 
+the project was originally set up</a>
+and is likely to change at some point.)
 </p>
 <p>
-If you add / delete a file, you must 'svn add' or 'svn delete' it in
-<span class="codefrag">src</span>,
-<span class="codefrag">build/site</span>, and
-<span class="codefrag">build/webapp</span>.
-Do this after 'forrest site' has been run but before committing changes into Subversion.
+If you add / delete a file, you must 'svn add' or 'svn delete' it in the
+<span class="codefrag">src</span> and
+<span class="codefrag">build/site</span> directory hierarchies.
+Do this after 'forrest site' has been run but 
+before committing changes into Subversion.
 </p>
 <p>
 When you're ready to commit,
@@ -690,30 +705,30 @@
 svn commit --message "here is my commit message" src build/site 
 </pre>
 </div>
-<a name="N10213"></a><a name="7.+Post+a+request+to+derby-dev+to+make+the+changes+visible"></a>
-<h4>7. Post a request to derby-dev to make the changes visible</h4>
+<a name="N10236"></a><a name="7.+Make+web+site+changes+visible"></a>
+<h4>7. Make web site changes visible</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-Derby committers don't have access to the filesystem hosting the actual web site, 
-so can't make web site changes visible
-(for details, see <a href="http://nagoya.apache.org/eyebrowse/BrowseList?listName=derby-dev@db.apache.org&by=subject&from=634682&to=634682&first=1&count=6">this email thread</a>).
-Post a request to 
-<a href="../derby_mail.html">derby-dev@db.apache.org</a>, 
-requesting an '<span class="codefrag">svn update</span>' for the web site.
+A Derby committer can make web site changes visible as follows:
 </p>
+<pre class="code">
+ssh -l <em>your_apache_login</em> www.apache.org
+cd /www/incubator.apache.org/derby
+svn update
+</pre>
 </div>
-<a name="N10228"></a><a name="8.+Considering+a+quick+fix+to+the+build+tree%3F"></a>
+<a name="N10248"></a><a name="8.+Considering+a+quick+fix+to+the+build+tree%3F"></a>
 <h4>8. Considering a quick fix to the build tree?</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
 If you modify a file in the <span class="codefrag">build/site</span> tree, 
 be sure to also change the source file in the <span class="codefrag">src</span> tree.
 Otherwise, the next '<span class="codefrag">forrest site</span>' / 'svn commit'
-will overwrite your changes to the build tree.
+might overwrite your changes to the build tree.
 </p>
 </div>
 <p>
-<em>Last updated November 11, 2004</em>
+<em>Last updated November 24, 2004</em>
 </p>
 </div>
 

Added: incubator/derby/site/trunk/build/site/papers/fortune_tut.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/fortune_tut.html?view=auto&rev=106536
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/build/site/papers/fortune_tut.html	Wed Nov 24 19:21:55 2004
@@ -0,0 +1,508 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Apache Derby Fortune Server Tutorial</title>
+<link type="text/css" href="../skin/page.css" rel="stylesheet">
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<!--================= start Navigation Path ==================-->
+<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Navigation Path ==================-->
+<!--================= start Banner ==================-->
+<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<!--================= start Group Logo ==================-->
+<td bgcolor="#294563"><a href="http://incubator.apache.org"><img border="0" class="logoImage" alt="" src="../resources/images/apache-incubator.png" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Group Logo ==================-->
+<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://incubator.apache.org/derby/"><img border="0" class="logoImage" alt="Derby" src="../images/derby-logo.jpg" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Project Logo ==================-->
+<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563">
+<form target="_blank" action="http://www.google.com/search" method="get">
+<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
+<tr>
+<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="incubator.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit">
+<br>
+<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
+                      the Derby site
+                      
+                      
+                    </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td>
+</tr>
+</table>
+</form>
+</td>
+<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" bgcolor="#294563" colspan="2">
+<!--================= start Tabs ==================-->
+<div class="tab">
+<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../manuals/index.html">Manuals</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../papers/index.html">Papers</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+<!--================= end Tabs ==================-->
+</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Banner ==================-->
+<!--================= start Menu, NavBar, Content ==================-->
+<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top">
+<table summary="menu" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<!--================= start left top NavBar ==================-->
+<td rowspan="3" valign="top">
+<table summary="blue line" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif">&nbsp;</font></td>
+</tr>
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td>
+<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F">
+<!--================= start Menu items ==================-->
+<div class="menu">
+<ul>
+<li>
+<font color="#CFDCED">About</font>
+<ul>
+       
+<li>
+<a href="../papers/index.html">Index</a>
+</li>
+       
+<li>
+<a href="../papers/derby_web.html">Derby Web Site</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Derby Engine</font>
+<ul>
+      
+<li>
+<a href="../papers/derby_arch.html">Architecture</a>
+</li>
+      
+<li>
+<a href="../papers/JDBCImplementation.html">JDBC</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
+      
+<li>
+<a href="../papers/misc.html">Summary</a>
+</li>
+      
+<li>
+<a href="../papers/../DOTS_Derby.html">DOTS</a>
+</li>
+      
+<li>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+</li>
+      
+<li>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Presentations</font>
+<ul>
+      
+<li>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
+</li>
+      
+<li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">How To's</font>
+<ul>
+      
+<li>
+<span class="sel"><font color="#ffcc00">Embedded Tutorial</font></span>
+</li>
+  
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Apache Derby Fortune Server Tutorial</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#Overview">Overview</a>
+</li>
+<li>
+<a href="#Intended+Audience">Intended Audience</a>
+</li>
+<li>
+<a href="#Tutorial+Topics">Tutorial Topics</a>
+</li>
+<li>
+<a href="#Download+Software">Download Software</a>
+</li>
+<li>
+<a href="#Credits+and+Acknowledgments">Credits and Acknowledgments</a>
+</li>
+<li>
+<a href="#Derby+Incubator+Project">Derby Incubator Project</a>
+</li>
+<li>
+<a href="#Revision+History">Revision History</a>
+</li>
+</ul> 
+
+
+<a name="N1000C"></a><a name="Overview"></a>
+<h3>Overview</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+
+<a href="http://incubator.apache.org/derby">Apache Derby</a>,
+an <a href="http://db.apache.org">Apache DB</a> 
+<a href="http://incubator.apache.org">incubator</a> project,
+is a relational database implemented in Java. 
+Its footprint is so small you can embed it in any Java-based solution -- 
+with no requirement for database installation and administration.
+This makes Derby easy to develop on, easy to run, and easy to deploy.
+</p>
+<p>
+The Apache Derby Fortune Server,
+referred to as simply "Fortune Server" throughout most of this tutorial, 
+stores fortunes in a Derby database and
+dispenses them like the UNIX <span class="codefrag">fortune</span> command does.
+But its real mission in cyber-life is to be a novice tutorial that
+teaches the basics of Derby and shows a couple ways to
+integrate it with other Apache products,
+all within Derby's easy-to-use embedded environment.
+</p>
+</div>
+
+
+<a name="N10028"></a><a name="Intended+Audience"></a>
+<h3>Intended Audience</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+This tutorial is intended for novices who have had at least light exposure to
+SQL, Java and Web applications, but are new to Derby.
+All source code used in the tutorial is either simple or "fill in the blank", 
+so lack of experience in any of these areas should not be a barrier.
+</p>
+</div>
+
+
+<a name="N10032"></a><a name="Tutorial+Topics"></a>
+<h3>Tutorial Topics</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+The tutorial is organized into the sections below:
+</p>
+<ul>
+  
+<li> The <em>Introduction</em> describes 
+       the functionality of the Apache Derby Fortune Server.
+  </li>
+  
+<li> The <em>Getting Started</em>
+       section introduces basic Derby concepts, then
+       walks through installing, configuring, and
+       running the Fortune Server.
+       If you just want to install and run the Fortune Server, 
+       and avoid implementation details entirely,
+       this section is for you.
+  </li>
+  
+<li> The <em>SQL</em> section
+        provides nitty gritty details about the Fortune Server database and
+        shows how to work with databases using <span class="codefrag">ij</span>,
+        the Derby SQL scripting tool.
+  </li>
+  
+<li> The <em>Java/JDBC</em> section
+       describes the Fortune Server components that are implemented in
+       Java and/or JDBC.
+       It covers a few basics, then shows how to implement JDBC code that 
+       fetches data from and inserts data into a Derby database. 
+       It also shows how to implement SQL functions in Java that execute code
+       in other software, including:
+    <ul>
+       
+<li>How to create a SQL function that generates a random number 
+           using the 
+	   <a href="http://jakarta.apache.org/commons/math/">Jakarta 
+	   Mathematics Library</a>.</li>
+       
+<li> How to create a SQL function that performs regular expression 
+           searches using 
+	   <a href="http://jakarta.apache.org/regexp/">Jakarta 
+	   Regexp</a>.
+       </li>
+    
+</ul>
+  
+</li>
+  
+<li> The <em>Tomcat</em>
+       section shows a way to embed Derby in 
+       <a href="http://jakarta.apache.org/tomcat/">Jakarta 
+       Tomcat</a> and provides a couple web applications that query the
+       Derby database.</li>
+
+</ul>
+</div>
+
+
+
+<a name="N10075"></a><a name="Download+Software"></a>
+<h3>Download Software</h3>
+<div style="margin-left: 0 ; border: 2px">
+<ul>
+ 
+<li> 
+<p>Download the Apache Derby Fortune Server distribution 
+      [<a href="../binaries/DerbyFS-tut-24Nov04.tar.gz">tar.gz</a>]
+      [<a href="../binaries/DerbyFS-tut-24Nov04.zip">zip</a>].
+      Extract it, 
+      then open <span class="codefrag">Fortune/doc/index.html</span> with your web browser.
+      That opens a local copy of this page.
+      A good place to start is the
+      <em>Introduction</em>,
+      which describes the functionality of the Fortune Server.
+      </p>
+ 
+</li>
+ 
+<li> 
+<p>Download and install Jakarta Tomcat 5.0.28 from
+      <a href="http://jakarta.apache.org/tomcat"><span class="codefrag">http://jakarta.apache.org/tomcat</span></a>.
+      </p>
+ 
+</li>
+
+</ul>
+</div>
+
+
+<a name="N1009E"></a><a name="Credits+and+Acknowledgments"></a>
+<h3>Credits and Acknowledgments</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+Jean Anderson (jta@bristowhill.com) developed this tutorial. 
+Email her any problems or post them to the Derby user mail list
+(<a href="http://incubator.apache.org/derby/derby_mail.html">http://incubator.apache.org/derby/derby_mail.html</a>).
+</p>
+<p>
+The Fortune Server embeds Derby in Tomcat by
+using the "casual" scenario from Lance Bader's IBM developerWorks 
+article titled
+"Integrating Cloudscape and Tomcat: A cookbook for adding the database manager 
+into the servlet container",
+which is available at 
+<a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0408bader">http://www.ibm.com/developerworks/db2/library/techarticle/dm-0408bader</a>.
+Bader's article was developed on Cloudscape 5.1. 
+Susan Cline (slc@MeepZor.Com) helped Jean update it to work with Derby. 
+Susan also contributed the 
+<span class="codefrag">FortuneServer</span> and
+<span class="codefrag">FortuneServer2</span> JavaServer Pages.
+</p>
+<p>
+
+<a href="http://forrest.apache.org">Apache Forrest</a>
+was used for generating the web-based materials.
+</p>
+</div>
+
+
+<a name="N100C0"></a><a name="Derby+Incubator+Project"></a>
+<h3>Derby Incubator Project</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+
+<em>
+Derby is an effort undergoing incubation at the Apache Software Foundation. 
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision-making 
+process have stabilized in a manner consistent with other successful ASF 
+projects. While incubation status is not necessarily a reflection of the 
+completeness or stability of the code, 
+it does indicate that the project has yet to be fully endorsed by the ASF.
+</em>
+
+</p>
+</div>
+
+
+<a name="N100CD"></a><a name="Revision+History"></a>
+<h3>Revision History</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+Changes to the Fortune Server Tutorial are summarized in the table below.
+</p>
+<table class="ForrestTable" cellspacing="1" cellpadding="4">
+
+<tr>
+   
+<td colspan="1" rowspan="1">24-Nov-2004</td>
+   <td colspan="1" rowspan="1">Incorporated feedback from ApacheCon
+   (improved Tomcat instructions and
+   incorporated Ed Korthof's improvements
+   for the LoadFortune data loading program).
+   </td>
+
+</tr>
+
+<tr>
+   
+<td colspan="1" rowspan="1">12-Nov-2004</td>
+   <td colspan="1" rowspan="1">Added Susan Cline's FortuneServer2 JSP, which invokes a servlet
+       to dynamically load categories from the Derby database.</td>
+
+</tr>
+
+<tr>
+   
+<td colspan="1" rowspan="1">10-Nov-2004</td>
+   <td colspan="1" rowspan="1">Corrected typos in the Getting Started sections.</td>
+
+</tr>
+
+<tr>
+   
+<td colspan="1" rowspan="1">7-Nov-2004</td>
+   <td colspan="1" rowspan="1">First document version, PDF generated for ApacheCon US 2004.</td>
+
+</tr>
+
+</table>
+</div>
+
+
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;Apache Software Foundation All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

Modified: incubator/derby/site/trunk/build/site/papers/index.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/index.html?view=diff&rev=106536&p1=incubator/derby/site/trunk/build/site/papers/index.html&r1=106535&p2=incubator/derby/site/trunk/build/site/papers/index.html&r2=106536
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/index.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/index.html	Wed Nov 24 19:21:55 2004
@@ -158,7 +158,7 @@
 </li>
       
 <li>
-<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (Open Office)</a>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </li>
   
 </ul>
@@ -168,31 +168,21 @@
 <ul>
       
 <li>
-<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
 </li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
 </li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_intro.pdf">Introduction (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/reuben_derby_perf.pdf">Performance (PDF)</a>
+  
+</ul>
 </li>
-      
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
-</li>
+<font color="#CFDCED">How To's</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
 </li>
   
 </ul>
@@ -241,7 +231,16 @@
 </table>
 <ul class="minitoc">
 <li>
-<a href="#Table+of+Contents">Table of Contents</a>
+<a href="#Derby+Engine">Derby Engine</a>
+</li>
+<li>
+<a href="#Integration">Integration</a>
+</li>
+<li>
+<a href="#Presentations">Presentations</a>
+</li>
+<li>
+<a href="#How+To%27s">How To's</a>
 </li>
 <li>
 <a href="#How+to+Contribute+Papers">How to Contribute Papers</a>
@@ -256,19 +255,9 @@
 </p>
 
 
-<a name="N10012"></a><a name="Table+of+Contents"></a>
-<h3>Table of Contents</h3>
+<a name="N10012"></a><a name="Derby+Engine"></a>
+<h3>Derby Engine</h3>
 <div style="margin-left: 0 ; border: 2px">
-<p>
-The names in the left-hand navigation bar are deliberately short to keep
-it from getting too wide.
-The actual titles are listed below:
-</p>
-<ul>
-
-<li> 
-<p>Derby Engine</p>
-     
 <ul>
 	
 <li> Architecture: <a href="derby_arch.html">Derby Engine Architecture
@@ -278,97 +267,104 @@
 <li>JDBC: <a href="JDBCImplementation.html">Derby JDBC Implementation
 		Notes</a>
 </li>
-     
-</ul>
-     
-<p></p>
 
-</li>
+</ul>
+</div>
 
 
-<li> 
-<p>Integration</p>
-      
+<a name="N10028"></a><a name="Integration"></a>
+<h3>Integration</h3>
+<div style="margin-left: 0 ; border: 2px">
 <p>  The <a href="misc.html">Summary</a> contains pointers
 	to other products that work (or might work) with Derby.
 	Detailed writeups so far include:
-	</p>
-
-	
+   </p>
 <ul>
         
-<li>DOTS: <a href="../DOTS_Derby.html"><em>Running DOTS (Database open Source
-Test Suite) with Derby</em></a>
+<li>DOTS: <a href="../DOTS_Derby.html"><em>Running DOTS 
+	    (Database open Source Test Suite) with Derby</em></a>
 </li>
         
 <li>C-JDBC: <em>HOWTO use C-JDBC with Apache Derby</em>
 	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">pdf</a>]
 	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">Open Office</a>].
 	</li>
-        
+    
 </ul>
-        
-<p></p>
-
-</li>
+</div>
 
 
-<li> 
-<p>Presentations</p>
-     
+<a name="N1004E"></a><a name="Presentations"></a>
+<h3>Presentations</h3>
+<div style="margin-left: 0 ; border: 2px">
 <ul>
         
-<li> 
-<a href="ApacheConUs04.html">ApacheCon US 2004</a> had
-	four Derby sessions and a Derby code contest.</li>
-        
-<li> Internals: <em>Internals of Derby</em> by Dan Debrunner,
-	<a href="http://www.softwaresummit.com">Colorado Software Summit</a>
-	2004
-	[<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+<li> Dan Debrunner spoke about Derby internals at the
+	     <a href="MiscPresentations.html">Colorado Software Summit 2004</a> .
 	</li>
-
-	
+        
 <li> 
-	Introduction: <em>Introducing Apache Derby</em> by Dan Debrunner,
-	<a href="http://www.apachecon.com">ApacheCon</a> 
-	US 2004 [<a href="../binaries/djd_derby_intro.pdf">PDF</a>].
-	</li>
-
-	
-<li> Security:
-	<em>Securing Data with Apache Derby</em> by Dan Debrunner,
-	<a href="http://www.apachecon.com">ApacheCon</a> US 2004 
-	[<a href="../binaries/djd_derby_security.pdf">PDF</a>].
-	</li>
-
-	
-<li> Performance:
-	<em>Perform with Apache Derby</em> by Ron Reuben,
-	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
-	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>].
-	</li>
-
-	
-<li> Tutorial:
-	<em>Apache Derby: Embed This!</em> by Jean Anderson,
-	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
-	[<a href="../binaries/DerbyFS-tut-12Nov04.tar.gz">tar.gz</a>]
-	[<a href="../binaries/DerbyFS-tut-12Nov04.zip">zip</a>].
-	Extract the distribution, then open <em>doc/index.html</em> with your
-	browser.
-	</li>
+<a href="ApacheConUs04.html">ApacheCon US 2004</a> had
+              a tutorial, three sessions, and a Derby code contest.
+        </li>
      
 </ul>
+<p>
+     Links to all presentations are summarized in the table below.
+     </p>
+<table class="ForrestTable" cellspacing="1" cellpadding="4"> 
+     
+<tr>
+       
+<td colspan="1" rowspan="1"> Internals of Derby
+            [<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+       </td>
+       <td colspan="1" rowspan="1"> Colorado Software Summit 2004 </td>
+     
+</tr>
+     
+<tr>
+       
+<td colspan="1" rowspan="1"> Introducing Apache Derby 
+	[<a href="../binaries/djd_derby_intro.pdf">PDF</a>]</td>
+       <td colspan="1" rowspan="1"> ApacheCon US 2004        </td>
+     
+</tr>
+     
+<tr>
+       
+<td colspan="1" rowspan="1"> Perform with Apache Derby
+	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>]</td>
+       <td colspan="1" rowspan="1"> ApacheCon US 2004        </td>
+     
+</tr>
+     
+<tr>
+       
+<td colspan="1" rowspan="1"> Securing Data with Apache Derby
+	[<a href="../binaries/djd_derby_security.pdf">PDF</a>]</td>
+       <td colspan="1" rowspan="1"> ApacheCon US 2004        </td>
+     
+</tr>
 
-</li>
+     
+</table>
+</div>
 
 
-</ul>
+<a name="N100B0"></a><a name="How+To%27s"></a>
+<h3>How To's</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+  The <a href="fortune_tut.html">Apache Derby Fortune Server Tutorial</a>
+  was taught at ApacheCon US 2004.
+  It highlights integrating Apache software with Derby in Derby's
+  embedded environment.
+  </p>
 </div>
 
 
-<a name="N100BA"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N100BE"></a><a name="How+to+Contribute+Papers"></a>
 <h3>How to Contribute Papers</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -404,8 +400,8 @@
    </li>
    
 <li> ASCII text embedded in XML 
-        (an example is the <a href="../BUILDING.html">BUILDING.txt</a>
-	file).
+        (an example is in the <a href="derby_web.html">derby_web.html</a>
+	page).
    </li>
 
 </ul>
@@ -433,14 +429,15 @@
    </li>
 
 </ul>
-<p> You can also link to a file in the Derby code tree; for example, to the
+<p> You can also link directly to a file in the Derby code tree; 
+for example, to the
    <a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/java/testing/README.htm">Derby Functional Tests</a> file.
 </p>
 </div>
 
 
 <p>
-<em>Last Updated: November 23, 2004</em>
+<em>Last Updated: November 24, 2004</em>
 </p>
 
 <div class="attribution"></div>

Modified: incubator/derby/site/trunk/build/site/papers/misc.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/misc.html?view=diff&rev=106536&p1=incubator/derby/site/trunk/build/site/papers/misc.html&r1=106535&p2=incubator/derby/site/trunk/build/site/papers/misc.html&r2=106536
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/misc.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/misc.html	Wed Nov 24 19:21:55 2004
@@ -158,7 +158,7 @@
 </li>
       
 <li>
-<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (Open Office)</a>
+<a href="../papers/../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
 </li>
   
 </ul>
@@ -168,31 +168,21 @@
 <ul>
       
 <li>
-<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+<a href="../papers/MiscPresentations.html">Colorado 2004</a>
 </li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
+<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
 </li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_intro.pdf">Introduction (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
-</li>
-      
-<li>
-<a href="../papers/../binaries/reuben_derby_perf.pdf">Performance (PDF)</a>
+  
+</ul>
 </li>
-      
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
-</li>
+<font color="#CFDCED">How To's</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
+<a href="../papers/fortune_tut.html">Embedded Tutorial</a>
 </li>
   
 </ul>

Added: incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-24Nov04.tar.gz
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-24Nov04.tar.gz?view=auto&rev=106536
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-24Nov04.zip
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-24Nov04.zip?view=auto&rev=106536
==============================================================================
Binary file. No diff available.

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml?view=diff&rev=106536&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml&r1=106535&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml&r2=106536
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml	Wed Nov 24 19:21:55 2004
@@ -23,15 +23,10 @@
 <ul>
 
    <li> <p>
-        <em>Apache Derby: Embed This!</em> is a tutorial for novices that
-        shows how to embed Derby in other Apache technologies -- and 
-        other Apache technologies into Derby
-	[<a href="../binaries/DerbyFS-tut-12Nov04.tar.gz">tar.gz</a>]
-	[<a href="../binaries/DerbyFS-tut-12Nov04.zip">zip</a>].
-	Extract the distribution, then open <em>doc/index.html</em> with your
-	browser.
-	<em>The tutorial will be updated soon to incorporate ApacheCon
-	feedback.</em>
+        <em>Apache Derby: Embed This!</em> used the
+	<a href="fortune_tut.html">Apache Derby Fortune Server Tutorial</a>
+        to show how to embed Derby in other Apache technologies -- and 
+        other Apache technologies into Derby.
 	</p>
    </li>
 

Added: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/MiscPresentations.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/MiscPresentations.xml?view=auto&rev=106536
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/MiscPresentations.xml	Wed Nov 24 19:21:55 2004
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document>
+ <header>
+  <title>Miscellaneous Derby Presentations</title>
+ </header>
+
+<body>
+
+<section>
+
+<title>Colorado Software Summit 2004</title>
+
+<p> 
+Dan Debrunner
+<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&amp;msgNo=903">spoke at the Colorado Software Summit</a>.
+His presentation,
+<em>Internals of Derby</em>,
+is available for download
+[<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+</p>
+
+</section>
+
+
+<p>
+<em>Last updated: 24-November-2004</em>
+</p>
+
+</body>
+</document>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml?view=diff&rev=106536&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml&r1=106535&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml&r2=106536
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml	Wed Nov 24 19:21:55 2004
@@ -87,7 +87,7 @@
 </p>
 
 <ul>
-   <li> Install Forrest 0.5.1.  </li>
+   <li> Install Forrest.  </li>
    <li> After it is installed, cd into the directory of your choice
         and enter '<code>forrest seed</code>' to initialize a new project.
    </li>
@@ -116,10 +116,11 @@
 	The <a href="JDBCImplementation.html">Derby JDBC Implementation
         Notes</a> paper is an example of an HTML document
         that is stored in the project source tree as an <code>ihtml</code> file.
-	Likewise, all of the Derby document files are stored as
+	Likewise, the Derby document files in the
+	<code>manuals</code> directory hierarchy are 
         <code>ihtml</code> files.
    </li>
-   <li> You can also create an XML file for it that uses the Forrest DTD.
+   <li> You can also create an XML file that uses the Forrest DTD.
 	The <a href="derby_arch.html">Derby Engine 
 	Architecture Overview</a> is an example.
         Also, the site you just seeded provides examples.
@@ -171,7 +172,16 @@
 
 <p>
 When you're satisfied with how your new page looks on your seed site,
-then it is ready to be added to the Derby web site by a Derby committer.
+then it is ready to be added to the Derby web site.
+You can do a first pass by checking out a local copy of the web site:
+</p>
+
+<source>
+svn co http://svn.apache.org/repos/asf/incubator/derby/site/trunk
+</source>
+
+<p>
+The physical structure of the web site is described in the next section.
 </p>
 
 </section>
@@ -245,11 +255,21 @@
          build/site/binaries.
     </td>
 </tr>
+
+<tr>
+    <td> <code>src/documentation/resources/images</code></td>
+    <td> Images. </td>
+    <td> Forrest copies these files without modifying them into 
+         <code>images</code> subdirectories to the files that reference them.
+    </td>
+</tr>
+
 </table>
 
 <p>
-What might be counter intuitive is 
-the directory structure is different for the src and build trees.
+The default directory structure 
+is markedly different for the src and build trees
+(and the Derby web site uses default locations).
 Links in source files
 need to point to the name and the location of the target file in the build tree.
 </p>
@@ -375,14 +395,18 @@
 <code>build/webapp</code> and
 <code>build/tmp</code> directories,
 but they aren't checked into the Subversion repository.
+(Checking built pages into subversion is a side effect from 
+<a href="http://nagoya.apache.org/eyebrowse/BrowseList?listName=derby-dev@db.apache.org&amp;by=subject&amp;from=634682&amp;to=634682&amp;first=1&amp;count=6">how 
+the project was originally set up</a>
+and is likely to change at some point.)
 </p>
 
 <p>
-If you add / delete a file, you must 'svn add' or 'svn delete' it in
-<code>src</code>,
-<code>build/site</code>, and
-<code>build/webapp</code>.
-Do this after 'forrest site' has been run but before committing changes into Subversion.
+If you add / delete a file, you must 'svn add' or 'svn delete' it in the
+<code>src</code> and
+<code>build/site</code> directory hierarchies.
+Do this after 'forrest site' has been run but 
+before committing changes into Subversion.
 </p>
 
 <p>
@@ -399,16 +423,18 @@
 </section>
 
 <section>
-<title>7. Post a request to derby-dev to make the changes visible</title>
+<title>7. Make web site changes visible</title>
 
 <p>
-Derby committers don't have access to the filesystem hosting the actual web site, 
-so can't make web site changes visible
-(for details, see <a href="http://nagoya.apache.org/eyebrowse/BrowseList?listName=derby-dev@db.apache.org&amp;by=subject&amp;from=634682&amp;to=634682&amp;first=1&amp;count=6">this email thread</a>).
-Post a request to 
-<a href="../derby_mail.html">derby-dev@db.apache.org</a>, 
-requesting an '<code>svn update</code>' for the web site.
+A Derby committer can make web site changes visible as follows:
 </p>
+
+<source>
+ssh -l <em>your_apache_login</em> www.apache.org
+cd /www/incubator.apache.org/derby
+svn update
+</source>
+
 </section>
 
 <section>
@@ -417,12 +443,12 @@
 If you modify a file in the <code>build/site</code> tree, 
 be sure to also change the source file in the <code>src</code> tree.
 Otherwise, the next '<code>forrest site</code>' / 'svn commit'
-will overwrite your changes to the build tree.
+might overwrite your changes to the build tree.
 </p>
 
 </section>
 
-<p><em>Last updated November 11, 2004</em></p>
+<p><em>Last updated November 24, 2004</em></p>
 </section>
 
 </body>

Added: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/fortune_tut.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/fortune_tut.xml?view=auto&rev=106536
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/fortune_tut.xml	Wed Nov 24 19:21:55 2004
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document> 
+
+<header> <title>Apache Derby Fortune Server Tutorial</title> </header> 
+
+<body> 
+
+<section>
+<title>Overview</title>
+<p>
+<a href="http://incubator.apache.org/derby">Apache Derby</a>,
+an <a href="http://db.apache.org">Apache DB</a> 
+<a href="http://incubator.apache.org">incubator</a> project,
+is a relational database implemented in Java. 
+Its footprint is so small you can embed it in any Java-based solution -- 
+with no requirement for database installation and administration.
+This makes Derby easy to develop on, easy to run, and easy to deploy.
+</p>
+
+<p>
+The Apache Derby Fortune Server,
+referred to as simply "Fortune Server" throughout most of this tutorial, 
+stores fortunes in a Derby database and
+dispenses them like the UNIX <code>fortune</code> command does.
+But its real mission in cyber-life is to be a novice tutorial that
+teaches the basics of Derby and shows a couple ways to
+integrate it with other Apache products,
+all within Derby's easy-to-use embedded environment.
+</p>
+</section>
+
+<section>
+<title>Intended Audience</title>
+
+<p>
+This tutorial is intended for novices who have had at least light exposure to
+SQL, Java and Web applications, but are new to Derby.
+All source code used in the tutorial is either simple or "fill in the blank", 
+so lack of experience in any of these areas should not be a barrier.
+</p>
+</section>
+
+<section>
+<title>Tutorial Topics</title>
+
+<p>
+The tutorial is organized into the sections below:
+</p>
+
+<ul>
+  <li> The <em>Introduction</em> describes 
+       the functionality of the Apache Derby Fortune Server.
+  </li>
+  <li> The <em>Getting Started</em>
+       section introduces basic Derby concepts, then
+       walks through installing, configuring, and
+       running the Fortune Server.
+       If you just want to install and run the Fortune Server, 
+       and avoid implementation details entirely,
+       this section is for you.
+  </li>
+  <li> The <em>SQL</em> section
+        provides nitty gritty details about the Fortune Server database and
+        shows how to work with databases using <code>ij</code>,
+        the Derby SQL scripting tool.
+  </li>
+  <li> The <em>Java/JDBC</em> section
+       describes the Fortune Server components that are implemented in
+       Java and/or JDBC.
+       It covers a few basics, then shows how to implement JDBC code that 
+       fetches data from and inserts data into a Derby database. 
+       It also shows how to implement SQL functions in Java that execute code
+       in other software, including:
+    <ul>
+       <li>How to create a SQL function that generates a random number 
+           using the 
+	   <a href="http://jakarta.apache.org/commons/math/">Jakarta 
+	   Mathematics Library</a>.</li>
+       <li> How to create a SQL function that performs regular expression 
+           searches using 
+	   <a href="http://jakarta.apache.org/regexp/">Jakarta 
+	   Regexp</a>.
+       </li>
+    </ul>
+  </li>
+  <li> The <em>Tomcat</em>
+       section shows a way to embed Derby in 
+       <a href="http://jakarta.apache.org/tomcat/">Jakarta 
+       Tomcat</a> and provides a couple web applications that query the
+       Derby database.</li>
+</ul>
+</section>
+
+
+<section>
+<title>Download Software</title>
+
+<ul>
+ <li> <p>Download the Apache Derby Fortune Server distribution 
+      [<a href="../binaries/DerbyFS-tut-24Nov04.tar.gz">tar.gz</a>]
+      [<a href="../binaries/DerbyFS-tut-24Nov04.zip">zip</a>].
+      Extract it, 
+      then open <code>Fortune/doc/index.html</code> with your web browser.
+      That opens a local copy of this page.
+      A good place to start is the
+      <em>Introduction</em>,
+      which describes the functionality of the Fortune Server.
+      </p>
+ </li>
+ <li> <p>Download and install Jakarta Tomcat 5.0.28 from
+      <a href="http://jakarta.apache.org/tomcat"><code>http://jakarta.apache.org/tomcat</code></a>.
+      </p>
+ </li>
+</ul>
+
+</section>
+
+<section>
+<title>Credits and Acknowledgments</title>
+<p>
+Jean Anderson (jta@bristowhill.com) developed this tutorial. 
+Email her any problems or post them to the Derby user mail list
+(<a href="http://incubator.apache.org/derby/derby_mail.html">http://incubator.apache.org/derby/derby_mail.html</a>).
+</p>
+
+<p>
+The Fortune Server embeds Derby in Tomcat by
+using the "casual" scenario from Lance Bader's IBM developerWorks 
+article titled
+"Integrating Cloudscape and Tomcat: A cookbook for adding the database manager 
+into the servlet container",
+which is available at 
+<a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0408bader">http://www.ibm.com/developerworks/db2/library/techarticle/dm-0408bader</a>.
+Bader's article was developed on Cloudscape 5.1. 
+Susan Cline (slc@MeepZor.Com) helped Jean update it to work with Derby. 
+Susan also contributed the 
+<code>FortuneServer</code> and
+<code>FortuneServer2</code> JavaServer Pages.
+</p>
+
+<p>
+<a href="http://forrest.apache.org">Apache Forrest</a>
+was used for generating the web-based materials.
+</p>
+
+</section>
+
+<section>
+<title>Derby Incubator Project</title>
+<p>
+<em>
+Derby is an effort undergoing incubation at the Apache Software Foundation. 
+Incubation is required of all newly accepted projects until a further review 
+indicates that the infrastructure, communications, and decision-making 
+process have stabilized in a manner consistent with other successful ASF 
+projects. While incubation status is not necessarily a reflection of the 
+completeness or stability of the code, 
+it does indicate that the project has yet to be fully endorsed by the ASF.
+</em>
+</p>
+
+</section>
+
+<section>
+<title>Revision History</title>
+
+<p>
+Changes to the Fortune Server Tutorial are summarized in the table below.
+</p>
+
+<table>
+<tr>
+   <td>24-Nov-2004</td>
+   <td>Incorporated feedback from ApacheCon
+   (improved Tomcat instructions and
+   incorporated Ed Korthof's improvements
+   for the LoadFortune data loading program).
+   </td>
+</tr>
+<tr>
+   <td>12-Nov-2004</td>
+   <td>Added Susan Cline's FortuneServer2 JSP, which invokes a servlet
+       to dynamically load categories from the Derby database.</td>
+</tr>
+<tr>
+   <td>10-Nov-2004</td>
+   <td>Corrected typos in the Getting Started sections.</td>
+</tr>
+<tr>
+   <td>7-Nov-2004</td>
+   <td>First document version, PDF generated for ApacheCon US 2004.</td>
+</tr>
+</table>
+
+</section>
+
+</body>
+</document>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml?view=diff&rev=106536&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml&r1=106535&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml&r2=106536
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml	Wed Nov 24 19:21:55 2004
@@ -13,82 +13,85 @@
 </p>
 
 <section>
-<title>Table of Contents</title>
-
-<p>
-The names in the left-hand navigation bar are deliberately short to keep
-it from getting too wide.
-The actual titles are listed below:
-</p>
+<title>Derby Engine</title>
 
 <ul>
-<li> <p>Derby Engine</p>
-     <ul>
 	<li> Architecture: <a href="derby_arch.html">Derby Engine Architecture
 	 Overview</a></li>
 	<li>JDBC: <a href="JDBCImplementation.html">Derby JDBC Implementation
 		Notes</a></li>
-     </ul>
-     <p></p>
-</li>
+</ul>
 
-<li> <p>Integration</p>
-      <p>  The <a href="misc.html">Summary</a> contains pointers
+</section>
+
+<section>
+<title>Integration</title>
+
+   <p>  The <a href="misc.html">Summary</a> contains pointers
 	to other products that work (or might work) with Derby.
 	Detailed writeups so far include:
-	</p>
+   </p>
 
-	<ul>
-        <li>DOTS: <a href="../DOTS_Derby.html"><em>Running DOTS (Database open Source
-Test Suite) with Derby</em></a></li>
+   <ul>
+        <li>DOTS: <a href="../DOTS_Derby.html"><em>Running DOTS 
+	    (Database open Source Test Suite) with Derby</em></a></li>
         <li>C-JDBC: <em>HOWTO use C-JDBC with Apache Derby</em>
 	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">pdf</a>]
 	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">Open Office</a>].
 	</li>
-        </ul>
-        <p></p>
-</li>
+    </ul>
+</section>
 
-<li> <p>Presentations</p>
+<section>
+<title>Presentations</title>
      <ul>
-        <li> <a href="ApacheConUs04.html">ApacheCon US 2004</a> had
-	four Derby sessions and a Derby code contest.</li>
-        <li> Internals: <em>Internals of Derby</em> by Dan Debrunner,
-	<a href="http://www.softwaresummit.com">Colorado Software Summit</a>
-	2004
-	[<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
-	</li>
-
-	<li> 
-	Introduction: <em>Introducing Apache Derby</em> by Dan Debrunner,
-	<a href="http://www.apachecon.com">ApacheCon</a> 
-	US 2004 [<a href="../binaries/djd_derby_intro.pdf">PDF</a>].
+        <li> Dan Debrunner spoke about Derby internals at the
+	     <a href="MiscPresentations.html">Colorado Software Summit 2004</a> .
 	</li>
+        <li> <a href="ApacheConUs04.html">ApacheCon US 2004</a> had
+              a tutorial, three sessions, and a Derby code contest.
+        </li>
+     </ul>
 
-	<li> Security:
-	<em>Securing Data with Apache Derby</em> by Dan Debrunner,
-	<a href="http://www.apachecon.com">ApacheCon</a> US 2004 
-	[<a href="../binaries/djd_derby_security.pdf">PDF</a>].
-	</li>
+     <p>
+     Links to all presentations are summarized in the table below.
+     </p>
+
+     <table> 
+     <tr>
+       <td> Internals of Derby
+            [<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+       </td>
+       <td> Colorado Software Summit 2004 </td>
+     </tr>
+     <tr>
+       <td> Introducing Apache Derby 
+	[<a href="../binaries/djd_derby_intro.pdf">PDF</a>]</td>
+       <td> ApacheCon US 2004        </td>
+     </tr>
+     <tr>
+       <td> Perform with Apache Derby
+	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>]</td>
+       <td> ApacheCon US 2004        </td>
+     </tr>
+     <tr>
+       <td> Securing Data with Apache Derby
+	[<a href="../binaries/djd_derby_security.pdf">PDF</a>]</td>
+       <td> ApacheCon US 2004        </td>
+     </tr>
 
-	<li> Performance:
-	<em>Perform with Apache Derby</em> by Ron Reuben,
-	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
-	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>].
-	</li>
+     </table> 
+</section>
 
-	<li> Tutorial:
-	<em>Apache Derby: Embed This!</em> by Jean Anderson,
-	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
-	[<a href="../binaries/DerbyFS-tut-12Nov04.tar.gz">tar.gz</a>]
-	[<a href="../binaries/DerbyFS-tut-12Nov04.zip">zip</a>].
-	Extract the distribution, then open <em>doc/index.html</em> with your
-	browser.
-	</li>
-     </ul>
-</li>
+<section>
+  <title>How To's</title>
 
-</ul>
+  <p>
+  The <a href="fortune_tut.html">Apache Derby Fortune Server Tutorial</a>
+  was taught at ApacheCon US 2004.
+  It highlights integrating Apache software with Derby in Derby's
+  embedded environment.
+  </p>
 
 </section>
 
@@ -127,8 +130,8 @@
 		Overview</a>).
    </li>
    <li> ASCII text embedded in XML 
-        (an example is the <a href="../BUILDING.html">BUILDING.txt</a>
-	file).
+        (an example is in the <a href="derby_web.html">derby_web.html</a>
+	page).
    </li>
 </ul>
 
@@ -154,12 +157,13 @@
    </li>
 </ul>
 
-<p> You can also link to a file in the Derby code tree; for example, to the
+<p> You can also link directly to a file in the Derby code tree; 
+for example, to the
    <a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/java/testing/README.htm">Derby Functional Tests</a> file.
 </p>
 
 </section>
 
-<p><em>Last Updated: November 23, 2004</em></p>
+<p><em>Last Updated: November 24, 2004</em></p>
 </body>
 </document>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml?view=diff&rev=106536&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml&r1=106535&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml&r2=106536
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml	Wed Nov 24 19:21:55 2004
@@ -33,18 +33,17 @@
       <misc label="Summary"  href="misc.html"/>
       <dots label="DOTS"  href="../DOTS_Derby.html"/>
       <cjdbc-pdf label="C-JDBC (PDF)"  href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf"/>
-      <cjdbc-oo label="C-JDBC (Open Office)"  href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw"/>
+      <cjdbc-oo label="C-JDBC (SXW)"  href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw"/>
   </how_to>
 
   <present label="Presentations" href="papers/" tab="papers">
-      <apacheCon label="ApacheCon US 2004"  href="ApacheConUs04.html"/>
-      <internals label="Internals (Open Office)" href="../binaries/ApacheDerbyInternals_1_1.sxi"/>
-      <derby_intro label="Introduction (PDF)" href="../binaries/djd_derby_intro.pdf" />
-      <derby_secure label="Security (PDF)" href="../binaries/djd_derby_security.pdf" />
-      <derby_perf label="Performance (PDF)" href="../binaries/reuben_derby_perf.pdf" />
-      <embed1 label="Tutorial(tar.gz)" href="../binaries/DerbyFS-tut-12Nov04.tar.gz" />
-      <embed2 label="Tutorial(zip)" href="../binaries/DerbyFS-tut-12Nov04.zip" />
+      <colorado label="Colorado 2004" href="MiscPresentations.html"/>
+      <apacheCon label="ApacheCon US '04"  href="ApacheConUs04.html"/>
   </present>
+
+  <howto label="How To's" href="papers/" tab="papers">
+      <tut label="Embedded Tutorial"  href="fortune_tut.html"/>
+  </howto>
 
   <manuals label="Manuals" href="manuals/" tab="manuals">
      <index label="About" href="index.html"/>

Mime
View raw message