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 2004/11/24 19:03:23 UTC

svn commit: r106440 - in incubator/derby/site/trunk: build/site build/site/papers src/documentation/content/xdocs src/documentation/content/xdocs/papers

Author: jta
Date: Wed Nov 24 10:03:21 2004
New Revision: 106440

URL: http://svn.apache.org/viewcvs?view=rev&rev=106440
Log:
Added papers/ApacheConUs04.{xml,html} and removed the ApacheCon US 2004 announcement link from the home tab.


Added:
   incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml
Modified:
   incubator/derby/site/trunk/build/site/BUILDING.html
   incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html
   incubator/derby/site/trunk/build/site/DerbyToDo.html
   incubator/derby/site/trunk/build/site/derby_comm.html
   incubator/derby/site/trunk/build/site/derby_downloads.html
   incubator/derby/site/trunk/build/site/derby_mail.html
   incubator/derby/site/trunk/build/site/derby_proposal.html
   incubator/derby/site/trunk/build/site/faq.html
   incubator/derby/site/trunk/build/site/index.html
   incubator/derby/site/trunk/build/site/license.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/derby_resources.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml

Modified: incubator/derby/site/trunk/build/site/BUILDING.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/BUILDING.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/BUILDING.html&r1=106439&p2=incubator/derby/site/trunk/build/site/BUILDING.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/BUILDING.html	(original)
+++ incubator/derby/site/trunk/build/site/BUILDING.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html&r1=106439&p2=incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html	(original)
+++ incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/DerbyToDo.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/DerbyToDo.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/DerbyToDo.html&r1=106439&p2=incubator/derby/site/trunk/build/site/DerbyToDo.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/DerbyToDo.html	(original)
+++ incubator/derby/site/trunk/build/site/DerbyToDo.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/derby_comm.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/derby_comm.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/derby_comm.html&r1=106439&p2=incubator/derby/site/trunk/build/site/derby_comm.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_comm.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_comm.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <span class="sel"><font color="#ffcc00">Get Involved!</font></span>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/derby_downloads.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/derby_downloads.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/derby_downloads.html&r1=106439&p2=incubator/derby/site/trunk/build/site/derby_downloads.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_downloads.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_downloads.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/derby_mail.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/derby_mail.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/derby_mail.html&r1=106439&p2=incubator/derby/site/trunk/build/site/derby_mail.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_mail.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_mail.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/derby_proposal.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/derby_proposal.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/derby_proposal.html&r1=106439&p2=incubator/derby/site/trunk/build/site/derby_proposal.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_proposal.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_proposal.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/faq.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/faq.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/faq.html&r1=106439&p2=incubator/derby/site/trunk/build/site/faq.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/faq.html	(original)
+++ incubator/derby/site/trunk/build/site/faq.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/index.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/index.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/index.html&r1=106439&p2=incubator/derby/site/trunk/build/site/index.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/index.html	(original)
+++ incubator/derby/site/trunk/build/site/index.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Modified: incubator/derby/site/trunk/build/site/license.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/license.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/license.html&r1=106439&p2=incubator/derby/site/trunk/build/site/license.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/license.html	(original)
+++ incubator/derby/site/trunk/build/site/license.html	Wed Nov 24 10:03:21 2004
@@ -145,10 +145,6 @@
 <ul>
     
 <li>
-<a href="ApacheConUS04.html">ApacheCon US 2004</a>
-</li>
-    
-<li>
 <a href="derby_comm.html">Get Involved!</a>
 </li>
     

Added: 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=auto&rev=106440
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html	Wed Nov 24 10:03:21 2004
@@ -0,0 +1,456 @@
+<!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>ApacheCon US: November 13-17 2004</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 (Open Office)</a>
+</li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Presentations</font>
+<ul>
+      
+<li>
+<span class="sel"><font color="#ffcc00">ApacheCon US 2004</font></span>
+</li>
+      
+<li>
+<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</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>
+</li>
+      
+<li>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
+</li>
+      
+<li>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</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>ApacheCon US: November 13-17 2004</h1>
+</td>
+</tr>
+</table>
+<ul class="minitoc">
+<li>
+<a href="#Presentations">Presentations</a>
+</li>
+<li>
+<a href="#Derby+Code+Contest">Derby Code Contest</a>
+<ul class="minitoc">
+<li>
+<a href="#First+Place">First Place</a>
+</li>
+<li>
+<a href="#Second+Place">Second Place</a>
+</li>
+<li>
+<a href="#Third+Place">Third Place</a>
+</li>
+</ul>
+</li>
+</ul>
+
+
+
+<p>
+
+<a href="http://www.apachecon.com/2004/US">ApacheCon</a> was held
+in Las Vegas on November 13-17 2004. 
+</p>
+
+
+<a name="N10013"></a><a name="Presentations"></a>
+<h3>Presentations</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+Sessions that focused on Apache Derby included:
+</p>
+<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>
+	
+</p>
+   
+</li>
+
+   
+<li> 
+<p>
+<em>Introducing Apache Derby</em>
+        introduces Derby capabilities and architecture
+	[<a href="../binaries/djd_derby_intro.pdf">PDF</a>].
+	</p>
+   
+</li>
+
+   
+<li> 
+<p>
+<em>Perform with Apache Derby</em>
+        highlights performance tuning issues and provides tips and tricks that
+        avoid common pitfalls
+	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>].
+	</p>
+   
+</li>
+
+   
+<li> 
+<p>
+<em>Securing Data with Apache Derby</em>
+          focuses on Derby security features
+	[<a href="../binaries/djd_derby_security.pdf">PDF</a>].
+	</p>
+   
+</li>
+
+
+</ul>
+</div>
+
+
+<a name="N1005B"></a><a name="Derby+Code+Contest"></a>
+<h3>Derby Code Contest</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+  An on-site Derby code contest tooks place at ApacheCon with the
+  following rules:
+  </p>
+<ul>
+     
+<li> Must use Derby's functionality and capability</li>
+     
+<li> Must integrate Derby with one or more other Apache projects</li>
+     
+<li> Innovative solution</li>
+     
+<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>
+<h4>First Place</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+  The first place winner was 
+  <a href="mailto:Emmanuel.Cecchet@inria.fr">Emmanuel Cecchet</a>.
+  </p>
+<p>
+  Emmanuel's entry integrates Derby,  Jakarta Tomcat, and Jakarta Velocity.
+  </p>
+<p>
+  He ported the servlet version of xPetstore
+  (
+  <a href="http://xpetstore.sourceforge.net/">http://xpetstore.sourceforge.net/</a>) 
+  to Tomcat 5 and Derby. It uses a
+  generic Hibernate mapper and the DB2 Universal JDBC Driver to remotely
+  access Derby. For reliability, it starts up and accesses a cluster of
+  Derby databases (fully mirrored) using the C-JDBC clustering software
+  (<a href="http://c-jdbc.objectweb.org">http://c-jdbc.objectweb.org</a>).
+  </p>
+<p>
+  Incidentally, after demoing his application to the judges, Emmanuel
+  hooked C-JDBC up to Derby using the Derby embedded driver -- and it does
+  look like C-JDBC provides an open source alternative to the DB2
+  Universal JDBC Driver. Please try it out and post your experience to the
+  Derby mail lists.
+  </p>
+</div>
+<a name="N10092"></a><a name="Second+Place"></a>
+<h4>Second Place</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+  The second place winner was 
+  <a href="mailto:hps@intermeta.de>">Henning P. Schmiedehausen</a>.
+  </p>
+<p>
+  Henning's entry integrates Derby with  Jakarta Turbine,  Jakarta Tomcat,
+  and  DB Torque.
+  </p>
+<p>
+  His application matches names with faces ("Apache Faces"), which allows
+  users to upload a small image, name, and email address. So, the next
+  time you attend ApacheCon, you won't walk right by people you may have
+  been interacting with in email during the last year(s).
+  </p>
+</div>
+<a name="N100A6"></a><a name="Third+Place"></a>
+<h4>Third Place</h4>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+  The third place winner was 
+  <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>.
+  </p>
+<p>
+  Torsten's entry integrates Derby with Cocoon.
+  </p>
+<p>
+  His wiki page at 
+  <a href="http://wiki.apache.org/cocoon/Derby">http://wiki.apache.org/cocoon/Derby</a>
+  describes how to
+  get Derby running from within Cocoon. Here's a verbatim note from
+  Torsten's abstract: "A (very) small patch makes the ESQL component use
+  the right "driver" automagically. A XSP example page shows that even
+  scrollable resultsets are working with Derby. ...which is important in
+  the web area."
+  </p>
+</div>
+</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/JDBCImplementation.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html?view=diff&rev=106440&p1=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r1=106439&p2=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	Wed Nov 24 10:03:21 2004
@@ -168,6 +168,10 @@
 <ul>
       
 <li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+</li>
+      
+<li>
 <a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
 </li>
       

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=106440&p1=incubator/derby/site/trunk/build/site/papers/derby_arch.html&r1=106439&p2=incubator/derby/site/trunk/build/site/papers/derby_arch.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_arch.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_arch.html	Wed Nov 24 10:03:21 2004
@@ -168,6 +168,10 @@
 <ul>
       
 <li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+</li>
+      
+<li>
 <a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
 </li>
       

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=106440&p1=incubator/derby/site/trunk/build/site/papers/derby_web.html&r1=106439&p2=incubator/derby/site/trunk/build/site/papers/derby_web.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_web.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_web.html	Wed Nov 24 10:03:21 2004
@@ -168,6 +168,10 @@
 <ul>
       
 <li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+</li>
+      
+<li>
 <a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
 </li>
       

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=106440&p1=incubator/derby/site/trunk/build/site/papers/index.html&r1=106439&p2=incubator/derby/site/trunk/build/site/papers/index.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/index.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/index.html	Wed Nov 24 10:03:21 2004
@@ -168,6 +168,10 @@
 <ul>
       
 <li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+</li>
+      
+<li>
 <a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
 </li>
       
@@ -314,6 +318,10 @@
      
 <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
@@ -347,7 +355,6 @@
 	<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>].
-	This is a tutorial.
 	Extract the distribution, then open <em>doc/index.html</em> with your
 	browser.
 	</li>
@@ -361,7 +368,7 @@
 </div>
 
 
-<a name="N100B3"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N100BA"></a><a name="How+to+Contribute+Papers"></a>
 <h3>How to Contribute Papers</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

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=106440&p1=incubator/derby/site/trunk/build/site/papers/misc.html&r1=106439&p2=incubator/derby/site/trunk/build/site/papers/misc.html&r2=106440
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/misc.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/misc.html	Wed Nov 24 10:03:21 2004
@@ -168,6 +168,10 @@
 <ul>
       
 <li>
+<a href="../papers/ApacheConUs04.html">ApacheCon US 2004</a>
+</li>
+      
+<li>
 <a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals (Open Office)</a>
 </li>
       
@@ -237,14 +241,14 @@
 </table>
 <ul class="minitoc">
 <li>
-<a href="#Product+Type+List">Product Type List</a>
-</li>
-<li>
 <a href="#Product+List">Product List</a>
 </li>
 <li>
 <a href="#Wish+List">Wish List</a>
 </li>
+<li>
+<a href="#Products+by+Type">Products by Type</a>
+</li>
 </ul> 
 
 
@@ -256,103 +260,7 @@
 </p>
 
 
-<a name="N10013"></a><a name="Product+Type+List"></a>
-<h3>Product Type List</h3>
-<div style="margin-left: 0 ; border: 2px">
-<table class="ForrestTable" cellspacing="1" cellpadding="4">
-
-<tr>
-  
-<th colspan="1" rowspan="1">Product Type</th>
-  <th colspan="1" rowspan="1">Product</th>
-  <th colspan="1" rowspan="1">License</th>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="3">JDBC Drivers</td>
-  <td colspan="1" rowspan="1"> <a href="http://c-jdbc.objectweb.org">C-JDBC</a> </td>
-  <td colspan="1" rowspan="1"> Open Source: LGPL </td>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="1"> <a href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM DB2 
-        JDBC Universal Driver</a>
-  </td>
-  <td colspan="1" rowspan="1"> Commercial: freely available and redistributable </td>
-
-</tr>
-
-
-<tr>
-   
-<td colspan="1" rowspan="1"> <a href="http://oss.software.ibm.com/developerworks/projects/jt400">JTOpen</a></td> 
-   <td colspan="1" rowspan="1"> Open source: <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html?dwzone-opensource">IBM Public License</a></td>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="3">ODBC Drivers</td>
-  <td colspan="1" rowspan="1"> <a href="http://www.easysoft.com/products/2023/drivers.phtml">Easysoft
-      ODBC-JDBC Gateway</a></td>
-  <td colspan="1" rowspan="1">Commercial</td>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0409cline2/index.html">IBM DB2 Runtime Client</a></td>
-  <td colspan="1" rowspan="1"> Commercial: freely available and redistributable</td>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a href="http://opendrda.sourceforge.net/">OpenDRDA</a></td>
-  <td colspan="1" rowspan="1"> Open Source: BSD </td>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="3">GUI Tools</td>
-  <td colspan="1" rowspan="1"> <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=144">Eclipse</a></td>
-  <td colspan="1" rowspan="1"> </td>
-
-</tr>
-
-
-<tr>
-  
-<td colspan="1" rowspan="1"> <a href="http://isql.sourceforge.net/">iSQL-Viewer</a></td>
-  <td colspan="1" rowspan="1"> Open Source </td>
-
-</tr>
-
-
-<tr>
-   
-<td colspan="1" rowspan="1"> <a href="http://squirrel-sql.sourceforge.net/">SQuirreL SQL</a></td>
-  <td colspan="1" rowspan="1"> Open Source </td>
-
-</tr>
-
-
-</table>
-</div>
-
-
-<a name="N100D1"></a><a name="Product+List"></a>
+<a name="N10013"></a><a name="Product+List"></a>
 <h3>Product List</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -509,7 +417,7 @@
 </div>
 
 
-<a name="N1021E"></a><a name="Wish+List"></a>
+<a name="N10160"></a><a name="Wish+List"></a>
 <h3>Wish List</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -534,8 +442,104 @@
 </div>
 
 
+<a name="N10181"></a><a name="Products+by+Type"></a>
+<h3>Products by Type</h3>
+<div style="margin-left: 0 ; border: 2px">
+<table class="ForrestTable" cellspacing="1" cellpadding="4">
+
+<tr>
+  
+<th colspan="1" rowspan="1">Product Type</th>
+  <th colspan="1" rowspan="1">Product</th>
+  <th colspan="1" rowspan="1">License</th>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="3">JDBC Drivers</td>
+  <td colspan="1" rowspan="1"> <a href="http://c-jdbc.objectweb.org">C-JDBC</a> </td>
+  <td colspan="1" rowspan="1"> Open Source: LGPL </td>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="1"> <a href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM DB2 
+        JDBC Universal Driver</a>
+  </td>
+  <td colspan="1" rowspan="1"> Commercial: freely available and redistributable </td>
+
+</tr>
+
+
+<tr>
+   
+<td colspan="1" rowspan="1"> <a href="http://oss.software.ibm.com/developerworks/projects/jt400">JTOpen</a></td> 
+   <td colspan="1" rowspan="1"> Open source: <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html?dwzone-opensource">IBM Public License</a></td>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="3">ODBC Drivers</td>
+  <td colspan="1" rowspan="1"> <a href="http://www.easysoft.com/products/2023/drivers.phtml">Easysoft
+      ODBC-JDBC Gateway</a></td>
+  <td colspan="1" rowspan="1">Commercial</td>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="1"><a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0409cline2/index.html">IBM DB2 Runtime Client</a></td>
+  <td colspan="1" rowspan="1"> Commercial: freely available and redistributable</td>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="1"><a href="http://opendrda.sourceforge.net/">OpenDRDA</a></td>
+  <td colspan="1" rowspan="1"> Open Source: BSD </td>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="3">GUI Tools</td>
+  <td colspan="1" rowspan="1"> <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=144">Eclipse</a></td>
+  <td colspan="1" rowspan="1"> </td>
+
+</tr>
+
+
+<tr>
+  
+<td colspan="1" rowspan="1"> <a href="http://isql.sourceforge.net/">iSQL-Viewer</a></td>
+  <td colspan="1" rowspan="1"> Open Source </td>
+
+</tr>
+
+
+<tr>
+   
+<td colspan="1" rowspan="1"> <a href="http://squirrel-sql.sourceforge.net/">SQuirreL SQL</a></td>
+  <td colspan="1" rowspan="1"> Open Source </td>
+
+</tr>
+
+
+</table>
+</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/src/documentation/content/xdocs/derby_resources.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml?view=diff&rev=106440&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml&r1=106439&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml&r2=106440
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml	Wed Nov 24 10:03:21 2004
@@ -10,7 +10,7 @@
 
 <warning>
 This page is obsolete and most of the content has moved to
-<a href="papers/misc.xml">papers/misc.xml</a>.
+<a href="papers/misc.html">papers/misc.html</a>.
 </warning>
 <section>
 <title>Introduction</title>

Added: 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=auto&rev=106440
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml	Wed Nov 24 10:03:21 2004
@@ -0,0 +1,158 @@
+<?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>ApacheCon US: November 13-17 2004</title>
+ </header>
+
+<body>
+
+
+<p>
+<a href="http://www.apachecon.com/2004/US">ApacheCon</a> was held
+in Las Vegas on November 13-17 2004. 
+</p>
+
+<section>
+   <title>Presentations</title>
+<p>
+Sessions that focused on Apache Derby included:
+</p>
+
+<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>
+	</p>
+   </li>
+
+   <li> <p><em>Introducing Apache Derby</em>
+        introduces Derby capabilities and architecture
+	[<a href="../binaries/djd_derby_intro.pdf">PDF</a>].
+	</p>
+   </li>
+
+   <li> <p><em>Perform with Apache Derby</em>
+        highlights performance tuning issues and provides tips and tricks that
+        avoid common pitfalls
+	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>].
+	</p>
+   </li>
+
+   <li> <p><em>Securing Data with Apache Derby</em>
+          focuses on Derby security features
+	[<a href="../binaries/djd_derby_security.pdf">PDF</a>].
+	</p>
+   </li>
+
+</ul>
+
+</section>
+
+<section>
+  <title>Derby Code Contest</title>
+  <p>
+  An on-site Derby code contest tooks place at ApacheCon with the
+  following rules:
+  </p>
+  <ul>
+     <li> Must use Derby's functionality and capability</li>
+     <li> Must integrate Derby with one or more other Apache projects</li>
+     <li> Innovative solution</li>
+     <li> Result can be a tool, mini-application, or any other demonstration of Derby integration</li>
+  </ul>
+
+
+  <section>
+  <title>First Place</title>
+
+  <p>
+  The first place winner was 
+  <a href="mailto:Emmanuel.Cecchet@inria.fr">Emmanuel Cecchet</a>.
+  </p>
+
+  <p>
+  Emmanuel's entry integrates Derby,  Jakarta Tomcat, and Jakarta Velocity.
+  </p>
+
+  <p>
+  He ported the servlet version of xPetstore
+  (
+  <a href="http://xpetstore.sourceforge.net/">http://xpetstore.sourceforge.net/</a>) 
+  to Tomcat 5 and Derby. It uses a
+  generic Hibernate mapper and the DB2 Universal JDBC Driver to remotely
+  access Derby. For reliability, it starts up and accesses a cluster of
+  Derby databases (fully mirrored) using the C-JDBC clustering software
+  (<a href="http://c-jdbc.objectweb.org">http://c-jdbc.objectweb.org</a>).
+  </p>
+
+  <p>
+  Incidentally, after demoing his application to the judges, Emmanuel
+  hooked C-JDBC up to Derby using the Derby embedded driver -- and it does
+  look like C-JDBC provides an open source alternative to the DB2
+  Universal JDBC Driver. Please try it out and post your experience to the
+  Derby mail lists.
+  </p>
+  </section>
+
+
+  <section>
+  <title>Second Place</title>
+  <p>
+  The second place winner was 
+  <a href="mailto:hps@intermeta.de>">Henning P. Schmiedehausen</a>.
+  </p>
+
+  <p>
+  Henning's entry integrates Derby with  Jakarta Turbine,  Jakarta Tomcat,
+  and  DB Torque.
+  </p>
+
+  <p>
+  His application matches names with faces ("Apache Faces"), which allows
+  users to upload a small image, name, and email address. So, the next
+  time you attend ApacheCon, you won't walk right by people you may have
+  been interacting with in email during the last year(s).
+  </p>
+  </section>
+
+  <section>
+  <title>Third Place</title>
+  <p>
+  The third place winner was 
+  <a href="mailto:tcurdt@apache.org">Torsten Curdt</a>.
+  </p>
+
+  <p>
+  Torsten's entry integrates Derby with Cocoon.
+  </p>
+
+  <p>
+  His wiki page at 
+  <a href="http://wiki.apache.org/cocoon/Derby">http://wiki.apache.org/cocoon/Derby</a>
+  describes how to
+  get Derby running from within Cocoon. Here's a verbatim note from
+  Torsten's abstract: "A (very) small patch makes the ESQL component use
+  the right "driver" automagically. A XSP example page shows that even
+  scrollable resultsets are working with Derby. ...which is important in
+  the web area."
+  </p>
+  </section>
+</section>
+
+
+<p>
+<em>Last updated: 24-November-2004</em>
+</p>
+
+</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=106440&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml&r1=106439&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml&r2=106440
==============================================================================
--- 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 10:03:21 2004
@@ -51,6 +51,8 @@
 
 <li> <p>Presentations</p>
      <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
@@ -80,7 +82,6 @@
 	<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>].
-	This is a tutorial.
 	Extract the distribution, then open <em>doc/index.html</em> with your
 	browser.
 	</li>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml?view=diff&rev=106440&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml&r1=106439&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml&r2=106440
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml	Wed Nov 24 10:03:21 2004
@@ -14,71 +14,6 @@
 </p>
 
 <section>
-<title>Product Type List</title>
-
-<table>
-<tr>
-  <th>Product Type</th>
-  <th>Product</th>
-  <th>License</th>
-</tr>
-
-<tr>
-  <td rowspan="3">JDBC Drivers</td>
-  <td> <a href="http://c-jdbc.objectweb.org">C-JDBC</a> </td>
-  <td> Open Source: LGPL </td>
-</tr>
-
-<tr>
-  <td> <a href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM DB2 
-        JDBC Universal Driver</a>
-  </td>
-  <td> Commercial: freely available and redistributable </td>
-</tr>
-
-<tr>
-   <td> <a href="http://oss.software.ibm.com/developerworks/projects/jt400">JTOpen</a></td> 
-   <td> Open source: <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html?dwzone-opensource">IBM Public License</a></td>
-</tr>
-
-<tr>
-  <td rowspan="3">ODBC Drivers</td>
-  <td> <a href="http://www.easysoft.com/products/2023/drivers.phtml">Easysoft
-      ODBC-JDBC Gateway</a></td>
-  <td>Commercial</td>
-</tr>
-
-<tr>
-  <td><a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0409cline2/index.html">IBM DB2 Runtime Client</a></td>
-  <td> Commercial: freely available and redistributable</td>
-</tr>
-
-<tr>
-  <td><a href="http://opendrda.sourceforge.net/">OpenDRDA</a></td>
-  <td> Open Source: BSD </td>
-</tr>
-
-<tr>
-  <td rowspan="3">GUI Tools</td>
-  <td> <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=144">Eclipse</a></td>
-  <td> </td>
-</tr>
-
-<tr>
-  <td> <a href="http://isql.sourceforge.net/">iSQL-Viewer</a></td>
-  <td> Open Source </td>
-</tr>
-
-<tr>
-   <td> <a href="http://squirrel-sql.sourceforge.net/">SQuirreL SQL</a></td>
-  <td> Open Source </td>
-</tr>
-
-</table>
-
-</section>
-
-<section>
 <title>Product List</title>
 
 <p>
@@ -211,6 +146,71 @@
 
 </section>
 
-<p><em>Last Updated: November 23, 2004</em></p>
+<section>
+<title>Products by Type</title>
+
+<table>
+<tr>
+  <th>Product Type</th>
+  <th>Product</th>
+  <th>License</th>
+</tr>
+
+<tr>
+  <td rowspan="3">JDBC Drivers</td>
+  <td> <a href="http://c-jdbc.objectweb.org">C-JDBC</a> </td>
+  <td> Open Source: LGPL </td>
+</tr>
+
+<tr>
+  <td> <a href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM DB2 
+        JDBC Universal Driver</a>
+  </td>
+  <td> Commercial: freely available and redistributable </td>
+</tr>
+
+<tr>
+   <td> <a href="http://oss.software.ibm.com/developerworks/projects/jt400">JTOpen</a></td> 
+   <td> Open source: <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html?dwzone-opensource">IBM Public License</a></td>
+</tr>
+
+<tr>
+  <td rowspan="3">ODBC Drivers</td>
+  <td> <a href="http://www.easysoft.com/products/2023/drivers.phtml">Easysoft
+      ODBC-JDBC Gateway</a></td>
+  <td>Commercial</td>
+</tr>
+
+<tr>
+  <td><a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0409cline2/index.html">IBM DB2 Runtime Client</a></td>
+  <td> Commercial: freely available and redistributable</td>
+</tr>
+
+<tr>
+  <td><a href="http://opendrda.sourceforge.net/">OpenDRDA</a></td>
+  <td> Open Source: BSD </td>
+</tr>
+
+<tr>
+  <td rowspan="3">GUI Tools</td>
+  <td> <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=144">Eclipse</a></td>
+  <td> </td>
+</tr>
+
+<tr>
+  <td> <a href="http://isql.sourceforge.net/">iSQL-Viewer</a></td>
+  <td> Open Source </td>
+</tr>
+
+<tr>
+   <td> <a href="http://squirrel-sql.sourceforge.net/">SQuirreL SQL</a></td>
+  <td> Open Source </td>
+</tr>
+
+</table>
+
+</section>
+
+<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=106440&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml&r1=106439&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml&r2=106440
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml	Wed Nov 24 10:03:21 2004
@@ -12,7 +12,6 @@
   </about>
 
   <community label="Community" tab="home">
-    <apacheCon  label="ApacheCon US 2004" href="ApacheConUS04.html"/>
     <derby_comm  label="Get Involved!" href="derby_comm.html"/>
     <derby_mail  label="Mailing Lists" href="derby_mail.html"/>
     <derby_bugs  label="BUGS" href="DerbyBugGuidelines.html"/>
@@ -38,6 +37,7 @@
   </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" />