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 06:44:37 UTC

svn commit: r106383 - in incubator/derby/site/trunk: build/site build/site/binaries build/site/papers src/documentation/content/binaries src/documentation/content/xdocs src/documentation/content/xdocs/manuals/tools src/documentation/content/xdocs/papers

Author: jta
Date: Tue Nov 23 21:44:29 2004
New Revision: 106383

Added:
   incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-12Nov04.tar.gz   (contents, props changed)
   incubator/derby/site/trunk/build/site/binaries/DerbyFS-tut-12Nov04.zip   (contents, props changed)
   incubator/derby/site/trunk/build/site/binaries/djd_derby_intro.pdf   (contents, props changed)
   incubator/derby/site/trunk/build/site/binaries/djd_derby_security.pdf
   incubator/derby/site/trunk/build/site/binaries/reuben_derby_perf.pdf   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-12Nov04.tar.gz   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/binaries/DerbyFS-tut-12Nov04.zip   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/binaries/djd_derby_intro.pdf   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/binaries/djd_derby_security.pdf   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/content/binaries/reuben_derby_perf.pdf   (contents, props changed)
Removed:
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/tools/tools.tar
Modified:
   incubator/derby/site/trunk/build/site/derby_downloads.html
   incubator/derby/site/trunk/build/site/derby_resources.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_downloads.xml
   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
Log:
(1) derby_downloads.html: now points to the BUILDING.txt file in the code tree and also to the test instructions, and includes Jakarta-ORO in the software section.
(2) The derby_resources.html page had already become obsolete; moved valid info
into papers/misc.html 
(3) Promoted the papers/misc.html "miscellaneous" page to be a master Summary for integration topics.
(4) Added the ApacheCon 2004 presentations.



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

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

Added: incubator/derby/site/trunk/build/site/binaries/djd_derby_intro.pdf
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/binaries/djd_derby_intro.pdf?view=auto&rev=106383
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/build/site/binaries/djd_derby_security.pdf
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/binaries/djd_derby_security.pdf?view=auto&rev=106383
==============================================================================
Binary files /tmp/tmpCRNGWg and /tmp/tmpvijWti differ

Added: incubator/derby/site/trunk/build/site/binaries/reuben_derby_perf.pdf
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/binaries/reuben_derby_perf.pdf?view=auto&rev=106383
==============================================================================
Binary file. No diff available.

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=106383&p1=incubator/derby/site/trunk/build/site/derby_downloads.html&r1=106382&p2=incubator/derby/site/trunk/build/site/derby_downloads.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_downloads.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_downloads.html	Tue Nov 23 21:44:29 2004
@@ -225,6 +225,9 @@
 <li>
 <a href="#How+to+build+Derby">How to build Derby</a>
 </li>
+<li>
+<a href="#How+to+test+Derby">How to test Derby</a>
+</li>
 </ul>
 
 
@@ -353,8 +356,8 @@
 </p>
 <p>
 The software required to build Derby is summarized in the table below.
-However, 
-doublecheck the <a href="BUILDING.html">BUILDING.txt</a> 
+However, doublecheck the 
+<a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/BUILDING.txt">BUILDING.txt</a>
 instructions for installation locations before downloading the software.
 As of this writing, and with the exception of JDK 1.4/1.3 and Ant,
 the Derby build procedure expects most software to be installed in
@@ -405,7 +408,7 @@
     
 <tr>
     
-<td colspan="1" rowspan="1"> Java Compiler Compiler (JCC) version 3.1</td>
+<td colspan="1" rowspan="1"> Java Compiler Compiler (JavaCC) version 3.1</td>
     <td colspan="1" rowspan="1">
           <a href="https://javacc.dev.java.net/">https://javacc.dev.java.net/ </a>
           </td>
@@ -423,6 +426,13 @@
 	</td>
     
 </tr>
+    
+<tr>
+    
+<td colspan="1" rowspan="1"> Jakarta-ORO 2.0.8</td>
+    <td colspan="1" rowspan="1"> <a href="http://jakarta.apache.org/oro">http://jakarta.apache.org/oro</a></td>
+    
+</tr>
 
     
 <tr>
@@ -480,20 +490,29 @@
 </div>
 
 
-<a name="N101A0"></a><a name="How+to+build+Derby"></a>
+<a name="N101B0"></a><a name="How+to+build+Derby"></a>
 <h3>How to build Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-Instructions for building Derby are in a file named
-<a href="BUILDING.html">BUILDING.txt</a> 
-in the root of the Derby source code tree.
+Instructions for building Derby are in
+<a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/BUILDING.txt">derby/code/trunk/BUILDING.txt</a>.
+</p>
+</div>
+
+
+<a name="N101BE"></a><a name="How+to+test+Derby"></a>
+<h3>How to test Derby</h3>
+<div style="margin-left: 0 ; border: 2px">
+<p>
+Instructions for testing Derby are in
+<a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/java/testing/README.htm">derby/code/trunk/java/testing/README.htm</a>.
 </p>
 </div>
 
 
 <p>
 
-<em>Last updated: Nov 22, 2004</em>
+<em>Last updated: Nov 23, 2004</em>
 
 </p>
 

Modified: incubator/derby/site/trunk/build/site/derby_resources.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/derby_resources.html?view=diff&rev=106383&p1=incubator/derby/site/trunk/build/site/derby_resources.html&r1=106382&p2=incubator/derby/site/trunk/build/site/derby_resources.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_resources.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_resources.html	Tue Nov 23 21:44:29 2004
@@ -214,10 +214,6 @@
 </li>
       
 <li>
-<span class="sel"><font color="#ffcc00">Resources</font></span>
-</li>
-      
-<li>
 <a href="papers/misc.html">Miscellaneous</a>
 </li>
   
@@ -1126,7 +1122,15 @@
 </ul>
 
 
-<a name="N1000C"></a><a name="Introduction"></a>
+<div class="frame warning">
+<div class="label">Warning</div>
+<div class="content">
+This page is obsolete and most of the content has moved to
+<a href="papers/misc.xml">papers/misc.xml</a>.
+</div>
+</div>
+
+<a name="N10013"></a><a name="Introduction"></a>
 <h3>Introduction</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1138,7 +1142,7 @@
 </div>
 
 
-<a name="N1001A"></a><a name="ODBC+Drivers"></a>
+<a name="N10021"></a><a name="ODBC+Drivers"></a>
 <h3>ODBC Drivers</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -1152,7 +1156,7 @@
 </div>
 
 
-<a name="N10028"></a><a name="JDBC+Drivers"></a>
+<a name="N1002F"></a><a name="JDBC+Drivers"></a>
 <h3>JDBC Drivers</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html?view=diff&rev=106383&p1=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r1=106382&p2=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	Tue Nov 23 21:44:29 2004
@@ -138,27 +138,57 @@
 <li>
 <span class="sel"><font color="#ffcc00">JDBC</font></span>
 </li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals</a>
+<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">Integration</font>
+<font color="#CFDCED">Presentations</font>
 <ul>
       
 <li>
-<a href="../papers/../DOTS_Derby.html">DOTS + Derby</a>
+<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/../derby_resources.html">Resources</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
 </li>
       
 <li>
-<a href="../papers/misc.html">Miscellaneous</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
 </li>
   
 </ul>

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=106383&p1=incubator/derby/site/trunk/build/site/papers/derby_arch.html&r1=106382&p2=incubator/derby/site/trunk/build/site/papers/derby_arch.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_arch.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_arch.html	Tue Nov 23 21:44:29 2004
@@ -138,27 +138,57 @@
 <li>
 <a href="../papers/JDBCImplementation.html">JDBC</a>
 </li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals</a>
+<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">Integration</font>
+<font color="#CFDCED">Presentations</font>
 <ul>
       
 <li>
-<a href="../papers/../DOTS_Derby.html">DOTS + Derby</a>
+<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/../derby_resources.html">Resources</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
 </li>
       
 <li>
-<a href="../papers/misc.html">Miscellaneous</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
 </li>
   
 </ul>

Modified: incubator/derby/site/trunk/build/site/papers/derby_web.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/derby_web.html?view=diff&rev=106383&p1=incubator/derby/site/trunk/build/site/papers/derby_web.html&r1=106382&p2=incubator/derby/site/trunk/build/site/papers/derby_web.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_web.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_web.html	Tue Nov 23 21:44:29 2004
@@ -138,27 +138,57 @@
 <li>
 <a href="../papers/JDBCImplementation.html">JDBC</a>
 </li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals</a>
+<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">Integration</font>
+<font color="#CFDCED">Presentations</font>
 <ul>
       
 <li>
-<a href="../papers/../DOTS_Derby.html">DOTS + Derby</a>
+<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/../derby_resources.html">Resources</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
 </li>
       
 <li>
-<a href="../papers/misc.html">Miscellaneous</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
 </li>
   
 </ul>

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=106383&p1=incubator/derby/site/trunk/build/site/papers/index.html&r1=106382&p2=incubator/derby/site/trunk/build/site/papers/index.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/index.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/index.html	Tue Nov 23 21:44:29 2004
@@ -138,27 +138,57 @@
 <li>
 <a href="../papers/JDBCImplementation.html">JDBC</a>
 </li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals</a>
+<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">Integration</font>
+<font color="#CFDCED">Presentations</font>
 <ul>
       
 <li>
-<a href="../papers/../DOTS_Derby.html">DOTS + Derby</a>
+<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/../derby_resources.html">Resources</a>
+<a href="../papers/../binaries/djd_derby_security.pdf">Security (PDF)</a>
 </li>
       
 <li>
-<a href="../papers/misc.html">Miscellaneous</a>
+<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>
@@ -232,25 +262,18 @@
 </p>
 <ul>
 
-<li> Derby Engine
-     <ul>
+<li> 
+<p>Derby Engine</p>
+     
+<ul>
 	
-<li>
-<a href="derby_arch.html">Derby Engine Architecture
+<li> Architecture: <a href="derby_arch.html">Derby Engine Architecture
 	 Overview</a>
 </li>
 	
-<li>
-<a href="JDBCImplementation.html">Derby JDBC Implementation
+<li>JDBC: <a href="JDBCImplementation.html">Derby JDBC Implementation
 		Notes</a>
 </li>
-        
-<li>
-<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&msgNo=903">Dan Debrunner's</a>
-	<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Derby
-	Internals Presentation</a> (Open Office format)
-	from the 2004 <a href="http://www.softwaresummit.com">Colorado Software Summit</a>.
-	</li>
      
 </ul>
      
@@ -258,33 +281,87 @@
 
 </li>
 
-<li> Integration
-     <ul>
+
+<li> 
+<p>Integration</p>
+      
+<p>  The <a href="misc.html">Summary</a> contains pointers
+	to other products that work (or might work) with Derby.
+	Detailed writeups so far include:
+	</p>
+
+	
+<ul>
         
-<li>
-<a href="../DOTS_Derby.html">Running DOTS (Database open Source
-Test Suite) with Derby</a>
+<li>DOTS: <a href="../DOTS_Derby.html"><em>Running DOTS (Database open Source
+Test Suite) with Derby</em></a>
 </li>
         
-<li>
-<a href="../derby_resources.html">Resources</a>
-</li>
+<li>C-JDBC: <em>HOWTO use C-JDBC with Apache Derby</em>
+	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">pdf</a>]
+	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">Open Office</a>].
+	</li>
         
-<li>
-<a href="misc.html">Miscellaneous Integration Topics</a>
+</ul>
+        
+<p></p>
+
 </li>
+
+
+<li> 
+<p>Presentations</p>
      
-</ul>
+<ul>
+        
+<li> Internals: <em>Internals of Derby</em> by Dan Debrunner,
+	<a href="http://www.softwaresummit.com">Colorado Software Summit</a>
+	2004
+	[<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+	</li>
+
+	
+<li> 
+	Introduction: <em>Introducing Apache Derby</em> by Dan Debrunner,
+	<a href="http://www.apachecon.com">ApacheCon</a> 
+	US 2004 [<a href="../binaries/djd_derby_intro.pdf">PDF</a>].
+	</li>
+
+	
+<li> Security:
+	<em>Securing Data with Apache Derby</em> by Dan Debrunner,
+	<a href="http://www.apachecon.com">ApacheCon</a> US 2004 
+	[<a href="../binaries/djd_derby_security.pdf">PDF</a>].
+	</li>
+
+	
+<li> Performance:
+	<em>Perform with Apache Derby</em> by Ron Reuben,
+	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
+	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>].
+	</li>
+
+	
+<li> Tutorial:
+	<em>Apache Derby: Embed This!</em> by Jean Anderson,
+	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
+	[<a href="../binaries/DerbyFS-tut-12Nov04.tar.gz">tar.gz</a>]
+	[<a href="../binaries/DerbyFS-tut-12Nov04.zip">zip</a>].
+	This is a tutorial.
+	Extract the distribution, then open <em>doc/index.html</em> with your
+	browser.
+	</li>
      
-<p></p>
+</ul>
 
 </li>
 
+
 </ul>
 </div>
 
 
-<a name="N10056"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N100B3"></a><a name="How+to+Contribute+Papers"></a>
 <h3>How to Contribute Papers</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -303,8 +380,9 @@
 <a href="../derby_mail.html">derby-dev@db.apache.org</a>.
 </p>
 <p>
-It is easiest to incorporate files that are already in one of the
-formats listed below:
+If you want the paper integrated with the Derby web site, with the
+forrest-generated navigation,
+it is easiest to incorporate these types of files:
 </p>
 <ul>
    
@@ -330,17 +408,32 @@
 and do something visually pleasing with it.
 If forrest can't consume your document, 
 or you don't like what forrest did with it, 
-it can be included in its native HTML on the site -- it just
+or you want to provide your document in a binary format
+it can be included in its native format on the site -- it just
 won't have the forrest-generated left hand navigation and top banner.
-An example is 
+Example are:
+</p>
+<ul>
+   
+<li> 
 <a href="../DOTS_Derby.html">Running DOTS (Database open Source
-Test Suite) with Derby</a>.
+          Test Suite) with Derby</a>.</li>
+   
+<li> The C-JDBC
+	    <a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">PDF</a> and
+	    <a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">Open Office</a>
+	    files.
+   </li>
+
+</ul>
+<p> You can also link to a file in the Derby code tree; for example, to the
+   <a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/java/testing/README.htm">Derby Functional Tests</a> file.
 </p>
 </div>
 
 
 <p>
-<em>Last Updated: November 11, 2004</em>
+<em>Last Updated: November 23, 2004</em>
 </p>
 
 <div class="attribution"></div>

Modified: incubator/derby/site/trunk/build/site/papers/misc.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/misc.html?view=diff&rev=106383&p1=incubator/derby/site/trunk/build/site/papers/misc.html&r1=106382&p2=incubator/derby/site/trunk/build/site/papers/misc.html&r2=106383
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/misc.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/misc.html	Tue Nov 23 21:44:29 2004
@@ -2,7 +2,7 @@
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Miscellaneous Integration Topics</title>
+<title>Integration Topics: Summary</title>
 <link type="text/css" href="../skin/page.css" rel="stylesheet">
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -138,27 +138,57 @@
 <li>
 <a href="../papers/JDBCImplementation.html">JDBC</a>
 </li>
+  
+</ul>
+</li>
+<li>
+<font color="#CFDCED">Integration</font>
+<ul>
+      
+<li>
+<span class="sel"><font color="#ffcc00">Summary</font></span>
+</li>
+      
+<li>
+<a href="../papers/../DOTS_Derby.html">DOTS</a>
+</li>
       
 <li>
-<a href="../papers/../binaries/ApacheDerbyInternals_1_1.sxi">Internals</a>
+<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">Integration</font>
+<font color="#CFDCED">Presentations</font>
 <ul>
       
 <li>
-<a href="../papers/../DOTS_Derby.html">DOTS + Derby</a>
+<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/../derby_resources.html">Resources</a>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.tar.gz">Tutorial(tar.gz)</a>
 </li>
       
 <li>
-<span class="sel"><font color="#ffcc00">Miscellaneous</font></span>
+<a href="../papers/../binaries/DerbyFS-tut-12Nov04.zip">Tutorial(zip)</a>
 </li>
   
 </ul>
@@ -201,13 +231,16 @@
 <table class="title" summary="">
 <tr>
 <td valign="middle">
-<h1>Miscellaneous Integration Topics</h1>
+<h1>Integration Topics: Summary</h1>
 </td>
 </tr>
 </table>
 <ul class="minitoc">
 <li>
-<a href="#Working+List">Working List</a>
+<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>
@@ -216,20 +249,115 @@
 
 
 <p>
-This page captures pointers to mail list traffic regarding integration of
-Derby with other software.
+This page captures pointers regarding integration of Derby with other software.
 If you have information about how to use Derby with another piece of software
 or if you want to know how to use Derby with something else, please post
 to the <a href="../derby_mail.html">Derby mail lists</a>.
 </p>
 
 
-<a name="N10013"></a><a name="Working+List"></a>
-<h3>Working List</h3>
+<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>
+<h3>Product List</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
 Based on mail list activity
-the entries summarized in the table below seem to at least partially work, 
+the software summarized in the table below seem to at least partially work, 
 or are being worked on, 
 or are talked about (maybe) being worked on.
 </p>
@@ -237,8 +365,8 @@
 
 <tr>
   
-<th colspan="1" rowspan="1">Project</th>
-  <th colspan="1" rowspan="1">Derby Mail List Pointers</th>
+<th colspan="1" rowspan="1">Product</th>
+  <th colspan="1" rowspan="1">Pointers to Information</th>
 
 </tr>
 
@@ -263,7 +391,7 @@
 
 <tr>
    
-<td colspan="1" rowspan="1"> <a href="http://http://c-jdbc.objectweb.org">C-JDBC</a> </td>
+<td colspan="1" rowspan="1"> <a href="http://c-jdbc.objectweb.org">C-JDBC</a> </td>
    <td colspan="1" rowspan="1"> <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=205">Emmanuel Cecchet</a> 
    provided instructions for Derby
    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">pdf</a>]
@@ -381,7 +509,7 @@
 </div>
 
 
-<a name="N10160"></a><a name="Wish+List"></a>
+<a name="N1021E"></a><a name="Wish+List"></a>
 <h3>Wish List</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -392,7 +520,7 @@
    
 <li>
 <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=15">JDBC SQL browsing tools</a>
-   (<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=204">Squirrel and iSQL work</a>).</li>
+   (<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=204">Squirrel and iSQL reportedly work</a>).</li>
    
 <li>
 <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&msgNo=180">DRDA ODBC and JDBC clients</a>

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

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

Added: incubator/derby/site/trunk/src/documentation/content/binaries/djd_derby_intro.pdf
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/binaries/djd_derby_intro.pdf?view=auto&rev=106383
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/src/documentation/content/binaries/djd_derby_security.pdf
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/binaries/djd_derby_security.pdf?view=auto&rev=106383
==============================================================================
Binary files /tmp/tmpGqDNzR and /tmp/tmppaVCZM differ

Added: incubator/derby/site/trunk/src/documentation/content/binaries/reuben_derby_perf.pdf
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/binaries/reuben_derby_perf.pdf?view=auto&rev=106383
==============================================================================
Binary file. No diff available.

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?view=diff&rev=106383&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml&r1=106382&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml&r2=106383
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml	Tue Nov 23 21:44:29 2004
@@ -115,8 +115,8 @@
 
 <p>
 The software required to build Derby is summarized in the table below.
-However, 
-doublecheck the <a href="BUILDING.html">BUILDING.txt</a> 
+However, doublecheck the 
+<a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/BUILDING.txt">BUILDING.txt</a>
 instructions for installation locations before downloading the software.
 As of this writing, and with the exception of JDK 1.4/1.3 and Ant,
 the Derby build procedure expects most software to be installed in
@@ -154,7 +154,7 @@
 
 
     <tr>
-    <td> Java Compiler Compiler (JCC) version 3.1</td>
+    <td> Java Compiler Compiler (JavaCC) version 3.1</td>
     <td>
           <a href="https://javacc.dev.java.net/">https://javacc.dev.java.net/ </a>
           </td>
@@ -168,6 +168,10 @@
        <a href="http://nagoya.apache.org/eyebrowse/BrowseList?listName=derby-dev@db.apache.org&amp;by=subject&amp;from=658425&amp;to=658425&amp;first=1&amp;count=2">mail list thread regarding this file</a>.
 	</td>
     </tr>
+    <tr>
+    <td> Jakarta-ORO 2.0.8</td>
+    <td> <a href="http://jakarta.apache.org/oro">http://jakarta.apache.org/oro</a></td>
+    </tr>
 
     <tr>
     <td> OSGi Service Platform Release 3 (osgi.jar) (optional) </td>
@@ -212,14 +216,22 @@
 <title>How to build Derby</title>
 
 <p>
-Instructions for building Derby are in a file named
-<a href="BUILDING.html">BUILDING.txt</a> 
-in the root of the Derby source code tree.
+Instructions for building Derby are in
+<a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/BUILDING.txt">derby/code/trunk/BUILDING.txt</a>.
+</p>
+</section>
+
+<section>
+<title>How to test Derby</title>
+
+<p>
+Instructions for testing Derby are in
+<a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/java/testing/README.htm">derby/code/trunk/java/testing/README.htm</a>.
 </p>
 </section>
 
 <p>
-<em>Last updated: Nov 22, 2004</em>
+<em>Last updated: Nov 23, 2004</em>
 </p>
 
 </body>

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=106383&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml&r1=106382&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml&r2=106383
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/derby_resources.xml	Tue Nov 23 21:44:29 2004
@@ -8,6 +8,10 @@
 
 <body>
 
+<warning>
+This page is obsolete and most of the content has moved to
+<a href="papers/misc.xml">papers/misc.xml</a>.
+</warning>
 <section>
 <title>Introduction</title>
 <p>

Deleted: /incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/tools/tools.tar
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/tools/tools.tar?view=auto&rev=106382
==============================================================================

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=106383&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml&r1=106382&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml&r2=106383
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml	Tue Nov 23 21:44:29 2004
@@ -22,29 +22,71 @@
 </p>
 
 <ul>
-<li> Derby Engine
+<li> <p>Derby Engine</p>
      <ul>
-	<li><a href="derby_arch.html">Derby Engine Architecture
+	<li> Architecture: <a href="derby_arch.html">Derby Engine Architecture
 	 Overview</a></li>
-	<li><a href="JDBCImplementation.html">Derby JDBC Implementation
+	<li>JDBC: <a href="JDBCImplementation.html">Derby JDBC Implementation
 		Notes</a></li>
-        <li><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&amp;msgNo=903">Dan Debrunner's</a>
-	<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Derby
-	Internals Presentation</a> (Open Office format)
-	from the 2004 <a href="http://www.softwaresummit.com">Colorado Software Summit</a>.
-	</li>
      </ul>
      <p></p>
 </li>
-<li> Integration
+
+<li> <p>Integration</p>
+      <p>  The <a href="misc.html">Summary</a> contains pointers
+	to other products that work (or might work) with Derby.
+	Detailed writeups so far include:
+	</p>
+
+	<ul>
+        <li>DOTS: <a href="../DOTS_Derby.html"><em>Running DOTS (Database open Source
+Test Suite) with Derby</em></a></li>
+        <li>C-JDBC: <em>HOWTO use C-JDBC with Apache Derby</em>
+	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">pdf</a>]
+	    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">Open Office</a>].
+	</li>
+        </ul>
+        <p></p>
+</li>
+
+<li> <p>Presentations</p>
      <ul>
-        <li><a href="../DOTS_Derby.html">Running DOTS (Database open Source
-Test Suite) with Derby</a></li>
-        <li><a href="../derby_resources.html">Resources</a></li>
-        <li><a href="misc.html">Miscellaneous Integration Topics</a></li>
+        <li> Internals: <em>Internals of Derby</em> by Dan Debrunner,
+	<a href="http://www.softwaresummit.com">Colorado Software Summit</a>
+	2004
+	[<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>].
+	</li>
+
+	<li> 
+	Introduction: <em>Introducing Apache Derby</em> by Dan Debrunner,
+	<a href="http://www.apachecon.com">ApacheCon</a> 
+	US 2004 [<a href="../binaries/djd_derby_intro.pdf">PDF</a>].
+	</li>
+
+	<li> Security:
+	<em>Securing Data with Apache Derby</em> by Dan Debrunner,
+	<a href="http://www.apachecon.com">ApacheCon</a> US 2004 
+	[<a href="../binaries/djd_derby_security.pdf">PDF</a>].
+	</li>
+
+	<li> Performance:
+	<em>Perform with Apache Derby</em> by Ron Reuben,
+	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
+	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>].
+	</li>
+
+	<li> Tutorial:
+	<em>Apache Derby: Embed This!</em> by Jean Anderson,
+	<a href="http://www.apachecon.com">ApacheCon</a> US 2004
+	[<a href="../binaries/DerbyFS-tut-12Nov04.tar.gz">tar.gz</a>]
+	[<a href="../binaries/DerbyFS-tut-12Nov04.zip">zip</a>].
+	This is a tutorial.
+	Extract the distribution, then open <em>doc/index.html</em> with your
+	browser.
+	</li>
      </ul>
-     <p></p>
 </li>
+
 </ul>
 
 </section>
@@ -69,8 +111,9 @@
 </p>
 
 <p>
-It is easiest to incorporate files that are already in one of the
-formats listed below:
+If you want the paper integrated with the Derby web site, with the
+forrest-generated navigation,
+it is easiest to incorporate these types of files:
 </p>
 
 <ul>
@@ -94,15 +137,28 @@
 and do something visually pleasing with it.
 If forrest can't consume your document, 
 or you don't like what forrest did with it, 
-it can be included in its native HTML on the site -- it just
+or you want to provide your document in a binary format
+it can be included in its native format on the site -- it just
 won't have the forrest-generated left hand navigation and top banner.
-An example is 
-<a href="../DOTS_Derby.html">Running DOTS (Database open Source
-Test Suite) with Derby</a>.
+Example are:
+</p>
+
+<ul>
+   <li> <a href="../DOTS_Derby.html">Running DOTS (Database open Source
+          Test Suite) with Derby</a>.</li>
+   <li> The C-JDBC
+	    <a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">PDF</a> and
+	    <a href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw">Open Office</a>
+	    files.
+   </li>
+</ul>
+
+<p> You can also link to a file in the Derby code tree; for example, to the
+   <a href="https://svn.apache.org/viewcvs.cgi/*checkout*/incubator/derby/code/trunk/java/testing/README.htm">Derby Functional Tests</a> file.
 </p>
 
 </section>
 
-<p><em>Last Updated: November 11, 2004</em></p>
+<p><em>Last Updated: November 23, 2004</em></p>
 </body>
 </document>

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=106383&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml&r1=106382&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml&r2=106383
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/misc.xml	Tue Nov 23 21:44:29 2004
@@ -2,32 +2,96 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>Miscellaneous Integration Topics</title> 
+    <title>Integration Topics: Summary</title> 
   </header> 
   <body> 
 
 <p>
-This page captures pointers to mail list traffic regarding integration of
-Derby with other software.
+This page captures pointers regarding integration of Derby with other software.
 If you have information about how to use Derby with another piece of software
 or if you want to know how to use Derby with something else, please post
 to the <a href="../derby_mail.html">Derby mail lists</a>.
 </p>
 
 <section>
-<title>Working List</title>
+<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>
 Based on mail list activity
-the entries summarized in the table below seem to at least partially work, 
+the software summarized in the table below seem to at least partially work, 
 or are being worked on, 
 or are talked about (maybe) being worked on.
 </p>
 
 <table>
 <tr>
-  <th>Project</th>
-  <th>Derby Mail List Pointers</th>
+  <th>Product</th>
+  <th>Pointers to Information</th>
 </tr>
 <tr>
    <td> <a href="http://activemq.codehaus.org/">ActiveMQ</a></td>
@@ -43,7 +107,7 @@
 </tr>
 
 <tr>
-   <td> <a href="http://http://c-jdbc.objectweb.org">C-JDBC</a> </td>
+   <td> <a href="http://c-jdbc.objectweb.org">C-JDBC</a> </td>
    <td> <a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=205">Emmanuel Cecchet</a> 
    provided instructions for Derby
    [<a href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf">pdf</a>]
@@ -140,7 +204,7 @@
 
 <ul>
    <li><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=15">JDBC SQL browsing tools</a>
-   (<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=204">Squirrel and iSQL work</a>).</li>
+   (<a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=204">Squirrel and iSQL reportedly work</a>).</li>
    <li><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-dev@db.apache.org&amp;msgNo=180">DRDA ODBC and JDBC clients</a></li>
    <li><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=3">JDO</a></li>
 </ul>

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=106383&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml&r1=106382&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml&r2=106383
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/site.xml	Tue Nov 23 21:44:29 2004
@@ -28,14 +28,23 @@
   <engine label="Derby Engine" href="papers/" tab="papers">
       <index label="Architecture"  href="derby_arch.html"/>
       <jdbc label="JDBC"  href="JDBCImplementation.html"/>
-      <internals label="Internals" href="../binaries/ApacheDerbyInternals_1_1.sxi"/>
   </engine>
 
   <how_to label="Integration" href="papers/" tab="papers">
-      <dots label="DOTS + Derby"  href="../DOTS_Derby.html"/>
-      <derby_resources  label="Resources" href="../derby_resources.html"/>
-      <misc label="Miscellaneous"  href="misc.html"/>
+      <misc label="Summary"  href="misc.html"/>
+      <dots label="DOTS"  href="../DOTS_Derby.html"/>
+      <cjdbc-pdf label="C-JDBC (PDF)"  href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf"/>
+      <cjdbc-oo label="C-JDBC (Open Office)"  href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw"/>
   </how_to>
+
+  <present label="Presentations" href="papers/" tab="papers">
+      <internals label="Internals (Open Office)" href="../binaries/ApacheDerbyInternals_1_1.sxi"/>
+      <derby_intro label="Introduction (PDF)" href="../binaries/djd_derby_intro.pdf" />
+      <derby_secure label="Security (PDF)" href="../binaries/djd_derby_security.pdf" />
+      <derby_perf label="Performance (PDF)" href="../binaries/reuben_derby_perf.pdf" />
+      <embed1 label="Tutorial(tar.gz)" href="../binaries/DerbyFS-tut-12Nov04.tar.gz" />
+      <embed2 label="Tutorial(zip)" href="../binaries/DerbyFS-tut-12Nov04.zip" />
+  </present>
 
   <manuals label="Manuals" href="manuals/" tab="manuals">
      <index label="About" href="index.html"/>