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

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

Author: jta
Date: Sun May 22 16:07:26 2005
New Revision: 171382

URL: http://svn.apache.org/viewcvs?rev=171382&view=rev
Log:
Added a link to the Sun DBTG test results on derby_downloads.html page; see
http://mail-archives.apache.org/mod_mbox/db-derby-dev/200505.mbox/%3c428DEB6D.8010707@Sun.COM%3e .
Added iBATIS JPetStore to integrate/misc.html; see
http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e .
Added a link to the Eclipse BIRT tutorial to papers/index.html#Instruction;
see
http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c20050518164824.38124.qmail@web81303.mail.yahoo.com%3e .
Added link back to logo_contest.html and updated it for the current round of activity.


Modified:
    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/integrate/misc.html
    incubator/derby/site/trunk/build/site/linkmap.html
    incubator/derby/site/trunk/build/site/logo_contest.html
    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/MiscPresentations.html
    incubator/derby/site/trunk/build/site/papers/derby_arch.html
    incubator/derby/site/trunk/build/site/papers/derby_htw.html
    incubator/derby/site/trunk/build/site/papers/derby_web.html
    incubator/derby/site/trunk/build/site/papers/fortune_tut.html
    incubator/derby/site/trunk/build/site/papers/index.html
    incubator/derby/site/trunk/build/site/papers/logformats.html
    incubator/derby/site/trunk/build/site/papers/optimizer.html
    incubator/derby/site/trunk/build/site/papers/pageformats.html
    incubator/derby/site/trunk/build/site/papers/recovery.html
    incubator/derby/site/trunk/build/site/papers/versionupgrade.html
    incubator/derby/site/trunk/build/site/releases/release-10.0.2.1.html
    incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml
    incubator/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
    incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
    incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
    incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml

Modified: incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html (original)
+++ incubator/derby/site/trunk/build/site/DerbyBugGuidelines.html Sun May 22 16:07:26 2005
@@ -122,6 +122,9 @@
 <div class="menuitem">
 <a title="" href="DerbyToDo.html">To-Do</a>
 </div>
+<div class="menuitem">
+<a title="" href="logo_contest.html">Logo Contest</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/DerbyToDo.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/DerbyToDo.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/DerbyToDo.html (original)
+++ incubator/derby/site/trunk/build/site/DerbyToDo.html Sun May 22 16:07:26 2005
@@ -122,6 +122,9 @@
 <div class="menupage">
 <div class="menupagetitle">To-Do</div>
 </div>
+<div class="menuitem">
+<a title="" href="logo_contest.html">Logo Contest</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_comm.html (original)
+++ incubator/derby/site/trunk/build/site/derby_comm.html Sun May 22 16:07:26 2005
@@ -122,6 +122,9 @@
 <div class="menuitem">
 <a title="" href="DerbyToDo.html">To-Do</a>
 </div>
+<div class="menuitem">
+<a title="" href="logo_contest.html">Logo Contest</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_downloads.html (original)
+++ incubator/derby/site/trunk/build/site/derby_downloads.html Sun May 22 16:07:26 2005
@@ -484,10 +484,15 @@
 <a href="#Branches">branch</a>
 or the <a href="#Development+trunk">development trunk</a>.
 </p>
+<p>
+Also, the Sun Database Technology Group (DBTG) regression 
+test results are available at
+<a class="external" href="http://www.multinet.no/~solberg/public/Apache/Derby/index.html">http://www.multinet.no/~solberg/public/Apache/Derby/index.html</a>.
+</p>
 </div>
 
 
-<a name="N101B4"></a><a name="How+to+submit+a+patch"></a>
+<a name="N101BB"></a><a name="How+to+submit+a+patch"></a>
 <h2 class="boxed">How to submit a patch</h2>
 <div class="section">
 <p>
@@ -501,7 +506,7 @@
 
 <p>
 
-<em>Last updated: May 11, 2005</em>
+<em>Last updated: May 22, 2005</em>
 
 </p>
 

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_mail.html (original)
+++ incubator/derby/site/trunk/build/site/derby_mail.html Sun May 22 16:07:26 2005
@@ -122,6 +122,9 @@
 <div class="menuitem">
 <a title="" href="DerbyToDo.html">To-Do</a>
 </div>
+<div class="menuitem">
+<a title="" href="logo_contest.html">Logo Contest</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/integrate/misc.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/integrate/misc.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/integrate/misc.html (original)
+++ incubator/derby/site/trunk/build/site/integrate/misc.html Sun May 22 16:07:26 2005
@@ -365,6 +365,17 @@
 
 <tr>
   
+<td colspan="1" rowspan="1"> <a href="http://incubator.apache.org/ibatis/site/index.html">iBATIS</a></td>
+   <td colspan="1" rowspan="1"> Apache </td>
+   <td colspan="1" rowspan="1"> <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e">Stan Bradbury contributed an article</a>
+on how to <a href="http://incubator.apache.org/derby/integrate/JPetStoreDerby.html">get the iBATIS JPetStore application running with Derby and WebSphere</a>.
+   </td>
+
+</tr>
+
+
+<tr>
+  
 <td colspan="1" rowspan="1"> <a class="external" href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM DB2 
         JDBC Universal Driver</a>
   </td>
@@ -544,7 +555,7 @@
 </div>
 
 
-<a name="N10333"></a><a name="Wish+List"></a>
+<a name="N10350"></a><a name="Wish+List"></a>
 <h2 class="boxed">Wish List</h2>
 <div class="section">
 <p>
@@ -565,7 +576,7 @@
 </div>
 
 
-<a name="N1034F"></a><a name="Products+by+Type"></a>
+<a name="N1036C"></a><a name="Products+by+Type"></a>
 <h2 class="boxed">Products by Type</h2>
 <div class="section">
 <p>
@@ -741,7 +752,7 @@
 
 
 <p>
-<em>Last Updated: May 6, 2005</em>
+<em>Last Updated: May 22, 2005</em>
 </p>
 
 </div>

Modified: incubator/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/linkmap.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/linkmap.html (original)
+++ incubator/derby/site/trunk/build/site/linkmap.html Sun May 22 16:07:26 2005
@@ -143,6 +143,9 @@
 <div class="menuitem">
 <a title="" href="DerbyToDo.html">To-Do</a>
 </div>
+<div class="menuitem">
+<a title="" href="logo_contest.html">Logo Contest</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">About</div>
 <div id="menu_1.3" class="menuitemgroup">
@@ -215,6 +218,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Integration</div>
 <div id="menu_1.8" class="menuitemgroup">
@@ -444,6 +450,10 @@
 <li>
 <a href="DerbyToDo.html">To-Do</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>derby_todo</em>
 </li>
+    
+<li>
+<a href="logo_contest.html">Logo Contest</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>logo</em>
+</li>
   
 </ul>
 
@@ -559,6 +569,10 @@
       
 <li>
 <a class="external" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>dw_detct</em>
+</li>
+      
+<li>
+<a class="external" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>birt</em>
 </li>
   
 </ul>

Modified: incubator/derby/site/trunk/build/site/logo_contest.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/logo_contest.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/logo_contest.html (original)
+++ incubator/derby/site/trunk/build/site/logo_contest.html Sun May 22 16:07:26 2005
@@ -164,14 +164,13 @@
 <h2 class="boxed">Contest Rules</h2>
 <div class="section">
 <p>
-Derby needs a logo!  This contest was opened to anyone who would like to submit
+Derby needs a logo!  
+This contest is open to anyone in the Derby community who would like to submit
 an image for the Apache Derby logo.
-The 
-<a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200503.mbox/%3c20050310174321.85130.qmail@web81304.mail.yahoo.com%3e">Derby
-community voted on the rules for choosing a logo</a>
-and the 
-<a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200503.mbox/%3c20050318034154.59094.qmail@web81302.mail.yahoo.com%3e">first round of voting was completed</a>.
-The runoff between the top three will commence on March 21.
+The contest was kicked off on
+<a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c20050503184855.71659.qmail@web81310.mail.yahoo.com%3e">May 3, 2005</a>.
+Please participate in the creation of rules on the
+<a href="derby_mail.html">derby-user@db.apache.org</a> mail list.
 </p>
 </div>
 
@@ -180,385 +179,18 @@
 <h2 class="boxed">Entries</h2>
 <div class="section">
 <p>
-Here are the logo submissions.
+Please attach logo entries to Jira issue
+<a class="external" href="http://issues.apache.org/jira/browse/DERBY-297">DERBY-297</a>.
+Anyone can upload a logo to this Jira issue.  
+You do need a Jira id, which you can sign up for at
+<a class="external" href="http://issues.apache.org/jira/">http://issues.apache.org/jira/</a>.
 </p>
-<table class="ForrestTable" cellspacing="1" cellpadding="4">
-
-<tr>
-  
-<th colspan="1" rowspan="1">Entry number</th>
-  <th colspan="1" rowspan="1">Logo</th>
-  <th colspan="1" rowspan="1">Author</th>
-  <th colspan="1" rowspan="1">Author's comments</th>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c01LI69NXNGM60039FC@rcum.uni-mb.si%3e">1</a></td>
-  <td colspan="1" rowspan="1"><img alt="entry_1" height="140" src="images/logo_entry_1.jpg" width="140"></td>
-  <td colspan="1" rowspan="1">Andrej Tibaut</td>
-  <td colspan="1" rowspan="1">lines are like tracks, letters are like horses<br>
-<br>
-      lines are coloured which means wide use <br>
-<br>
-     letters at different levels can also mean a melody <br>
-<br>
-     (although then lines should be horizontally)..because Derby indeed functions like a melody.<br>
-</td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41B86EB2.3010605@Golux.Com%3e">2</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_2" height="146" src="images/logo_entry_2.gif" width="233"></td>
-<td colspan="1" rowspan="1">Ken Coar</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41B88744.2080100@Golux.Com%3e">3</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_3" height="175" src="images/logo_entry_3.gif" width="247"></td>
-<td colspan="1" rowspan="1">Ken Coar</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41B88705.8060809@golux.com%3e">4</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_4" height="92" src="images/logo_entry_4.JPG" width="327"></td>
-<td colspan="1" rowspan="1">Army</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3cee260d450412082041dfeb7ea@mail.gmail.com%3e">5</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_5" height="154" src="images/logo_entry_5.jpg" width="231"></td>
-<td colspan="1" rowspan="1">Adam Blinkinsop</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c200412212005.iBLK5YGX021149@www2.email.si%3e">6</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_6" height="129" src="images/logo_entry_6.jpg" width="249"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">7</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_7" height="259" src="images/logo_entry_7.jpg" width="375"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">8</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_8" height="236" src="images/logo_entry_8.jpg" width="264"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">9</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_9" height="199" src="images/logo_entry_9.jpg" width="290"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">10</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_10" height="278" src="images/logo_entry_10.jpg" width="370"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">11</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_11" height="136" src="images/logo_entry_11.jpg" width="281"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">12</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_12" height="289" src="images/logo_entry_12.jpg" width="374"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">13</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_13" height="285" src="images/logo_entry_13.jpg" width="359"></td>
-<td colspan="1" rowspan="1">Denis Povh</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3cf47b842104122806275aa069ea@mail.gmail.com%3e">14</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_14" height="114" src="images/logo_entry_14.gif" width="167"></td>
-<td colspan="1" rowspan="1">Anand BN</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3cf47b842104122806275aa069ea@mail.gmail.com%3e">15</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_15" height="109" src="images/logo_entry_15.gif" width="143"></td>
-<td colspan="1" rowspan="1">Anand BN</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c1FBCD070-5A32-11D9-8288-000A959DF410@opxn.net%3e">16</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_16" src="images/logo_entry_16.gif"></td>
-<td colspan="1" rowspan="1">Rich Hall</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041230161947.30370.qmail@web60004.mail.yahoo.com%3e">17</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_17" src="images/logo_entry_17.png"></td>
-<td colspan="1" rowspan="1">Stefan Lecho</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41D434CF.2040000@verizon.net%3e">18</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_18" src="images/logo_entry_18.gif"></td>
-<td colspan="1" rowspan="1">Nat Gross</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41D434CF.2040000@verizon.net%3e">19</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_19" src="images/logo_entry_19.gif"></td>
-<td colspan="1" rowspan="1">Nat Gross</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41D4FBDF.2090207@verizon.net%3e">20</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_20" src="images/logo_entry_20.gif"></td>
-<td colspan="1" rowspan="1">Nat Gross</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c5085F057-5AC3-11D9-A64F-000A959DF410@richhall.com%3e">21</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_21" src="images/logo_entry_21.gif"></td>
-<td colspan="1" rowspan="1">Rich Hall</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3cBE10B6DE.1222%25andrew_kachalo@spymac.com%3e">22</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_22" src="images/logo_entry_22.jpg"></td>
-<td colspan="1" rowspan="1">Andrew Kachalo</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3cBE10B6DE.1222%25andrew_kachalo@spymac.com%3e">23</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_23" src="images/logo_entry_23.jpg"></td>
-<td colspan="1" rowspan="1">Andrew Kachalo</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050119140449.1dff7665.parallax@lafn.org%3e">24</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_24" src="images/logo_entry_24.gif"></td>
-<td colspan="1" rowspan="1">Andrew Kachalo, modification by SML</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050119141752.75311682.parallax@lafn.org%3e">25</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_25" src="images/logo_entry_25.gif"></td>
-<td colspan="1" rowspan="1">Andrew Kachalo, modification by SML</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050123201437.6954fa3c.parallax@lafn.org%3e">26</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_26" src="images/logo_entry_26.gif"></td>
-<td colspan="1" rowspan="1">Ken Coar, modification by SML</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050123201437.6954fa3c.parallax@lafn.org%3e">27</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_27" src="images/logo_entry_27.gif"></td>
-<td colspan="1" rowspan="1">SML</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">28</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_28" src="images/logo_entry_28.png"></td>
-<td colspan="1" rowspan="1">Alex Drahon</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">29</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_29" src="images/logo_entry_29.png"></td>
-<td colspan="1" rowspan="1">Alex Drahon</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">30</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_30" src="images/logo_entry_30.png"></td>
-<td colspan="1" rowspan="1">Alex Drahon</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">31</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_31" src="images/logo_entry_31.png"></td>
-<td colspan="1" rowspan="1">Alex Drahon</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c00c901c5054a$da2454a0$41e81129@HAL9000%3e">32</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_32" src="images/logo_entry_32.gif"></td>
-<td colspan="1" rowspan="1">Profetiko</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c00d301c5054a$f625ac30$41e81129@HAL9000%3e">33</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_33" src="images/logo_entry_33.gif"></td>
-<td colspan="1" rowspan="1">Profetiko</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c015601c50551$061338a0$41e81129@HAL9000%3e">34</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_34" src="images/logo_entry_34.gif"></td>
-<td colspan="1" rowspan="1">Profetiko</td>
-<td colspan="1" rowspan="1"></td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200503.mbox/%3cBE4CDBF0.154C%25andrew_kachalo@spymac.com%3e">35</a></td>
-<td colspan="1" rowspan="1"><img alt="entry_35" src="images/logo_entry_35.jpg"></td>
-<td colspan="1" rowspan="1">Andrew Kachalo</td>
-<td colspan="1" rowspan="1">... logo uses cog-wheels. The biggest one means the database inside
-information system.  Custom-made font makes this logo unique.
-</td>
-
-</tr>
-
-
-</table>
 </div>
 
 
 <p>
 
-<em>Last updated: March 18, 2005</em>
+<em>Last updated: May 22, 2005</em>
 
 </p>
 

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html (original)
+++ incubator/derby/site/trunk/build/site/papers/ApacheConUs04.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html (original)
+++ incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/papers/MiscPresentations.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/MiscPresentations.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/MiscPresentations.html (original)
+++ incubator/derby/site/trunk/build/site/papers/MiscPresentations.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_arch.html (original)
+++ incubator/derby/site/trunk/build/site/papers/derby_arch.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/papers/derby_htw.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/derby_htw.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_htw.html (original)
+++ incubator/derby/site/trunk/build/site/papers/derby_htw.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_web.html (original)
+++ incubator/derby/site/trunk/build/site/papers/derby_web.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: 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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/fortune_tut.html (original)
+++ incubator/derby/site/trunk/build/site/papers/fortune_tut.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/index.html (original)
+++ incubator/derby/site/trunk/build/site/papers/index.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">
@@ -413,11 +416,16 @@
   to relational database concepts using Derby.
   </li>
   
+<li> The
+  <a class="external" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+  tutorial includes the Derby engine+embedded driver and a sample Derby database.
+  </li>
+  
 </ul>
 </div>
 
 
-<a name="N10163"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N1016A"></a><a name="How+to+Contribute+Papers"></a>
 <h2 class="boxed">How to Contribute Papers</h2>
 <div class="section">
 <p>
@@ -490,7 +498,7 @@
 
 
 <p>
-<em>Last Updated: April 11, 2005</em>
+<em>Last Updated: May 22, 2005</em>
 </p>
 
 </div>

Modified: incubator/derby/site/trunk/build/site/papers/logformats.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/logformats.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/logformats.html (original)
+++ incubator/derby/site/trunk/build/site/papers/logformats.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/papers/optimizer.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/optimizer.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/optimizer.html (original)
+++ incubator/derby/site/trunk/build/site/papers/optimizer.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/papers/pageformats.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/pageformats.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/pageformats.html (original)
+++ incubator/derby/site/trunk/build/site/papers/pageformats.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/papers/recovery.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/recovery.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/recovery.html (original)
+++ incubator/derby/site/trunk/build/site/papers/recovery.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/papers/versionupgrade.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/versionupgrade.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/versionupgrade.html (original)
+++ incubator/derby/site/trunk/build/site/papers/versionupgrade.html Sun May 22 16:07:26 2005
@@ -179,6 +179,9 @@
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
 </div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+</div>
 </div>
 <div id="credit"></div>
 <div id="roundbottom">

Modified: incubator/derby/site/trunk/build/site/releases/release-10.0.2.1.html
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/releases/release-10.0.2.1.html?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/build/site/releases/release-10.0.2.1.html (original)
+++ incubator/derby/site/trunk/build/site/releases/release-10.0.2.1.html Sun May 22 16:07:26 2005
@@ -143,6 +143,9 @@
 <div class="menuitem">
 <a title="" href="../DerbyToDo.html">To-Do</a>
 </div>
+<div class="menuitem">
+<a title="" href="../logo_contest.html">Logo Contest</a>
+</div>
 </div>
 <div onclick="SwitchMenu('menu_1.3', '../skin/')" id="menu_1.3Title" class="menutitle">About</div>
 <div id="menu_1.3" class="menuitemgroup">
@@ -214,6 +217,9 @@
 </div>
 <div class="menuitem">
 <a title="" href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&S_CMP=LIB">Cloudscape Detective</a>
+</div>
+<div class="menuitem">
+<a title="" href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
 </div>
 </div>
 <div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Integration</div>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml (original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml Sun May 22 16:07:26 2005
@@ -269,6 +269,13 @@
 or the <a href="#Development+trunk">development trunk</a>.
 </p>
 
+<p>
+Also, the Sun Database Technology Group (DBTG) regression 
+test results are available at
+<a href="http://www.multinet.no/~solberg/public/Apache/Derby/index.html">http://www.multinet.no/~solberg/public/Apache/Derby/index.html</a>.
+</p>
+
+
 </section>
 
 <section>
@@ -282,7 +289,7 @@
 </section>
 
 <p>
-<em>Last updated: May 11, 2005</em>
+<em>Last updated: May 22, 2005</em>
 </p>
 
 </body>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml (original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml Sun May 22 16:07:26 2005
@@ -155,6 +155,14 @@
 </tr>
 
 <tr>
+  <td> <a href="http://incubator.apache.org/ibatis/site/index.html">iBATIS</a></td>
+   <td> Apache </td>
+   <td> <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c42892FE2.8050807@gmail.com%3e">Stan Bradbury contributed an article</a>
+on how to <a href="http://incubator.apache.org/derby/integrate/JPetStoreDerby.html">get the iBATIS JPetStore application running with Derby and WebSphere</a>.
+   </td>
+</tr>
+
+<tr>
   <td> <a href="http://www.ibm.com/developerworks/db2/downloads/jcc/">IBM DB2 
         JDBC Universal Driver</a>
   </td>
@@ -419,6 +427,6 @@
 
 </section>
 
-<p><em>Last Updated: May 6, 2005</em></p>
+<p><em>Last Updated: May 22, 2005</em></p>
 </body>
 </document>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml (original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml Sun May 22 16:07:26 2005
@@ -11,14 +11,13 @@
 <section>
 <title>Contest Rules</title>
 <p>
-Derby needs a logo!  This contest was opened to anyone who would like to submit
+Derby needs a logo!  
+This contest is open to anyone in the Derby community who would like to submit
 an image for the Apache Derby logo.
-The 
-<a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200503.mbox/%3c20050310174321.85130.qmail@web81304.mail.yahoo.com%3e">Derby
-community voted on the rules for choosing a logo</a>
-and the 
-<a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200503.mbox/%3c20050318034154.59094.qmail@web81302.mail.yahoo.com%3e">first round of voting was completed</a>.
-The runoff between the top three will commence on March 21.
+The contest was kicked off on
+<a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200505.mbox/%3c20050503184855.71659.qmail@web81310.mail.yahoo.com%3e">May 3, 2005</a>.
+Please participate in the creation of rules on the
+<a href="derby_mail.html">derby-user@db.apache.org</a> mail list.
 </p>
 
 </section>
@@ -27,270 +26,16 @@
 
 <title>Entries</title>
 <p>
-Here are the logo submissions.
+Please attach logo entries to Jira issue
+<a href="http://issues.apache.org/jira/browse/DERBY-297">DERBY-297</a>.
+Anyone can upload a logo to this Jira issue.  
+You do need a Jira id, which you can sign up for at
+<a href="http://issues.apache.org/jira/">http://issues.apache.org/jira/</a>.
 </p>
-<table>
-<tr>
-  <th>Entry number</th>
-  <th>Logo</th>
-  <th>Author</th>
-  <th>Author's comments</th>
-</tr>
-<tr>
-  <td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c01LI69NXNGM60039FC@rcum.uni-mb.si%3e">1</a></td>
-  <td><img src="images/logo_entry_1.jpg" alt="entry_1" width="140" height="140"></img></td>
-  <td>Andrej Tibaut</td>
-  <td>lines are like tracks, letters are like horses<br/><br/>
-      lines are coloured which means wide use <br/><br/>
-     letters at different levels can also mean a melody <br/><br/>
-     (although then lines should be horizontally)..because Derby indeed functions like a melody.<br/></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41B86EB2.3010605@Golux.Com%3e">2</a></td>
-<td><img src="images/logo_entry_2.gif" alt="entry_2" width="233" height="146"></img></td>
-<td>Ken Coar</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41B88744.2080100@Golux.Com%3e">3</a></td>
-<td><img src="images/logo_entry_3.gif" alt="entry_3" width="247" height="175"></img></td>
-<td>Ken Coar</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41B88705.8060809@golux.com%3e">4</a></td>
-<td><img src="images/logo_entry_4.JPG" alt="entry_4" width="327" height="92"></img></td>
-<td>Army</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3cee260d450412082041dfeb7ea@mail.gmail.com%3e">5</a></td>
-<td><img src="images/logo_entry_5.jpg" alt="entry_5" width="231" height="154"></img></td>
-<td>Adam Blinkinsop</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c200412212005.iBLK5YGX021149@www2.email.si%3e">6</a></td>
-<td><img src="images/logo_entry_6.jpg" alt="entry_6" width="249" height="129"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">7</a></td>
-<td><img src="images/logo_entry_7.jpg" alt="entry_7" width="375" height="259"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">8</a></td>
-<td><img src="images/logo_entry_8.jpg" alt="entry_8" width="264" height="236"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">9</a></td>
-<td><img src="images/logo_entry_9.jpg" alt="entry_9" width="290" height="199"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">10</a></td>
-<td><img src="images/logo_entry_10.jpg" alt="entry_10" width="370" height="278"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">11</a></td>
-<td><img src="images/logo_entry_11.jpg" alt="entry_11" width="281" height="136"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">12</a></td>
-<td><img src="images/logo_entry_12.jpg" alt="entry_12" width="374" height="289"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041221200442.CA3AF8BC3E@www1.email.si%3e">13</a></td>
-<td><img src="images/logo_entry_13.jpg" alt="entry_13" width="359" height="285"></img></td>
-<td>Denis Povh</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3cf47b842104122806275aa069ea@mail.gmail.com%3e">14</a></td>
-<td><img src="images/logo_entry_14.gif" alt="entry_14" width="167" height="114"></img></td>
-<td>Anand BN</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3cf47b842104122806275aa069ea@mail.gmail.com%3e">15</a></td>
-<td><img src="images/logo_entry_15.gif" alt="entry_15" width="143" height="109"></img></td>
-<td>Anand BN</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c1FBCD070-5A32-11D9-8288-000A959DF410@opxn.net%3e">16</a></td>
-<td><img src="images/logo_entry_16.gif" alt="entry_16"></img></td>
-<td>Rich Hall</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c20041230161947.30370.qmail@web60004.mail.yahoo.com%3e">17</a></td>
-<td><img src="images/logo_entry_17.png" alt="entry_17"></img></td>
-<td>Stefan Lecho</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41D434CF.2040000@verizon.net%3e">18</a></td>
-<td><img src="images/logo_entry_18.gif" alt="entry_18"></img></td>
-<td>Nat Gross</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41D434CF.2040000@verizon.net%3e">19</a></td>
-<td><img src="images/logo_entry_19.gif" alt="entry_19"></img></td>
-<td>Nat Gross</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200412.mbox/%3c41D4FBDF.2090207@verizon.net%3e">20</a></td>
-<td><img src="images/logo_entry_20.gif" alt="entry_20"></img></td>
-<td>Nat Gross</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c5085F057-5AC3-11D9-A64F-000A959DF410@richhall.com%3e">21</a></td>
-<td><img src="images/logo_entry_21.gif" alt="entry_21"></img></td>
-<td>Rich Hall</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3cBE10B6DE.1222%25andrew_kachalo@spymac.com%3e">22</a></td>
-<td><img src="images/logo_entry_22.jpg" alt="entry_22"></img></td>
-<td>Andrew Kachalo</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3cBE10B6DE.1222%25andrew_kachalo@spymac.com%3e">23</a></td>
-<td><img src="images/logo_entry_23.jpg" alt="entry_23"></img></td>
-<td>Andrew Kachalo</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050119140449.1dff7665.parallax@lafn.org%3e">24</a></td>
-<td><img src="images/logo_entry_24.gif" alt="entry_24"></img></td>
-<td>Andrew Kachalo, modification by SML</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050119141752.75311682.parallax@lafn.org%3e">25</a></td>
-<td><img src="images/logo_entry_25.gif" alt="entry_25"></img></td>
-<td>Andrew Kachalo, modification by SML</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050123201437.6954fa3c.parallax@lafn.org%3e">26</a></td>
-<td><img src="images/logo_entry_26.gif" alt="entry_26"></img></td>
-<td>Ken Coar, modification by SML</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c20050123201437.6954fa3c.parallax@lafn.org%3e">27</a></td>
-<td><img src="images/logo_entry_27.gif" alt="entry_27"></img></td>
-<td>SML</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">28</a></td>
-<td><img src="images/logo_entry_28.png" alt="entry_28"></img></td>
-<td>Alex Drahon</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">29</a></td>
-<td><img src="images/logo_entry_29.png" alt="entry_29"></img></td>
-<td>Alex Drahon</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">30</a></td>
-<td><img src="images/logo_entry_30.png" alt="entry_30"></img></td>
-<td>Alex Drahon</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c1106566141.10619.5.camel@localhost.localdomain%3e">31</a></td>
-<td><img src="images/logo_entry_31.png" alt="entry_31"></img></td>
-<td>Alex Drahon</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c00c901c5054a$da2454a0$41e81129@HAL9000%3e">32</a></td>
-<td><img src="images/logo_entry_32.gif" alt="entry_32"></img></td>
-<td>Profetiko</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c00d301c5054a$f625ac30$41e81129@HAL9000%3e">33</a></td>
-<td><img src="images/logo_entry_33.gif" alt="entry_33"></img></td>
-<td>Profetiko</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200501.mbox/%3c015601c50551$061338a0$41e81129@HAL9000%3e">34</a></td>
-<td><img src="images/logo_entry_34.gif" alt="entry_34"></img></td>
-<td>Profetiko</td>
-<td></td>
-</tr>
-
-<tr>
-<td><a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-user/200503.mbox/%3cBE4CDBF0.154C%25andrew_kachalo@spymac.com%3e">35</a></td>
-<td><img src="images/logo_entry_35.jpg" alt="entry_35"></img></td>
-<td>Andrew Kachalo</td>
-<td>... logo uses cog-wheels. The biggest one means the database inside
-information system.  Custom-made font makes this logo unique.
-</td>
-</tr>
-
-</table>
 </section>
 
 <p>
-<em>Last updated: March 18, 2005</em>
+<em>Last updated: May 22, 2005</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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml (original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml Sun May 22 16:07:26 2005
@@ -136,6 +136,10 @@
   <a href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&amp;S_CMP=LIB">Cloudscape Detective</a> introduces users
   to relational database concepts using Derby.
   </li>
+  <li> The
+  <a href="http://www.eclipse.org/birt/tutorial/basic/">Eclipse BIRT</a>
+  tutorial includes the Derby engine+embedded driver and a sample Derby database.
+  </li>
   </ul>
 
 </section>
@@ -209,6 +213,6 @@
 
 </section>
 
-<p><em>Last Updated: April 11, 2005</em></p>
+<p><em>Last Updated: May 22, 2005</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?rev=171382&r1=171381&r2=171382&view=diff
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml Sun May 22 16:07:26 2005
@@ -16,6 +16,7 @@
     <derby_mail  label="Mailing Lists" href="derby_mail.html"/>
     <derby_bugs  label="BUGS"          href="DerbyBugGuidelines.html"/>
     <derby_todo  label="To-Do"         href="DerbyToDo.html"/>
+    <logo        label="Logo Contest"  href="logo_contest.html"/>
   </community>
 
   <papers label="About" href="papers/" tab="papers">
@@ -50,6 +51,7 @@
       <tut     label="Embedded Tutorial"                href="fortune_tut.html"/>
       <jdbc_oi label="Object Innovations JDBC Course"   href="http://objectinnovations.com/CourseOutlines/168.html"/>
       <dw_detct label="Cloudscape Detective"         href="http://www.ibm.com/developerworks/edu/dm-dw-dm-0412kubasta-i.html?S_TACT=104AHW11&amp;S_CMP=LIB"/>
+      <birt     label="Eclipse BIRT"  href="http://www.eclipse.org/birt/tutorial/basic/"/>
   </howto>
 
   <integrate label="Integration" href="integrate/" tab="integrate">