db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r358035 - in /db/derby/site/trunk: build/site/ build/site/papers/ build/site/papers/DerbyTut/ src/documentation/content/xdocs/ src/documentation/content/xdocs/papers/
Date Tue, 20 Dec 2005 16:53:53 GMT
Author: jta
Date: Tue Dec 20 08:53:43 2005
New Revision: 358035

URL: http://svn.apache.org/viewcvs?rev=358035&view=rev
Log:
papers/ApacheConUs04.{xml,html}: 
Changed file name from ApacheConUs2004 to more general ApacheCon.
Updated site menu so that the blue navigation bar says "ApacheCon" instead 
of "ApacheCon US '04". 
Added link to Emmanuel Cecchet's ApacheCon US 2005 presentation. 
Note that updating the site menu causes all pages on the Papers tab to change. 

Added:
    db/derby/site/trunk/build/site/papers/ApacheCon.html
      - copied, changed from r357855, db/derby/site/trunk/build/site/papers/ApacheConUs04.html
    db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheCon.xml
      - copied, changed from r357855, db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml
Removed:
    db/derby/site/trunk/build/site/papers/ApacheConUs04.html
    db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml
Modified:
    db/derby/site/trunk/build/site/linkmap.html
    db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
    db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html
    db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html
    db/derby/site/trunk/build/site/papers/DerbyTut/index.html
    db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html
    db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html
    db/derby/site/trunk/build/site/papers/Intersect-design.html
    db/derby/site/trunk/build/site/papers/JDBCImplementation.html
    db/derby/site/trunk/build/site/papers/MiscPresentations.html
    db/derby/site/trunk/build/site/papers/btree_package.html
    db/derby/site/trunk/build/site/papers/derby_arch.html
    db/derby/site/trunk/build/site/papers/derby_htw.html
    db/derby/site/trunk/build/site/papers/derby_web.html
    db/derby/site/trunk/build/site/papers/fortune_tut.html
    db/derby/site/trunk/build/site/papers/index.html
    db/derby/site/trunk/build/site/papers/logformats.html
    db/derby/site/trunk/build/site/papers/optimizer.html
    db/derby/site/trunk/build/site/papers/pageformats.html
    db/derby/site/trunk/build/site/papers/recovery.html
    db/derby/site/trunk/build/site/papers/versionupgrade.html
    db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
    db/derby/site/trunk/src/documentation/content/xdocs/site.xml

Modified: db/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.html Tue Dec 20 08:53:43 2005
@@ -198,10 +198,10 @@
 <div onclick="SwitchMenu('menu_1.6', 'skin/')" id="menu_1.6Title" class="menutitle">Presentations</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
-<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
@@ -847,13 +847,13 @@
       
 <ul>
 <li>
-<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>oscon05</em>
+<a href="papers/ApacheCon.html">ApacheCon</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apacheCon</em>
 </li>
 </ul>
       
 <ul>
 <li>
-<a href="papers/ApacheConUs04.html">ApacheCon US '04</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apacheCon</em>
+<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>oscon05</em>
 </li>
 </ul>
       

Copied: db/derby/site/trunk/build/site/papers/ApacheCon.html (from r357855, db/derby/site/trunk/build/site/papers/ApacheConUs04.html)
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/ApacheCon.html?p2=db/derby/site/trunk/build/site/papers/ApacheCon.html&p1=db/derby/site/trunk/build/site/papers/ApacheConUs04.html&r1=357855&r2=358035&rev=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/ApacheConUs04.html (original)
+++ db/derby/site/trunk/build/site/papers/ApacheCon.html Tue Dec 20 08:53:43 2005
@@ -155,12 +155,12 @@
 </div>
 <div onclick="SwitchMenu('menu_selected_1.4', '../skin/')" id="menu_selected_1.4Title"
class="menutitle" style="background-image: url('../skin/images/chapter_open.gif');">Presentations</div>
 <div id="menu_selected_1.4" class="selectedmenuitemgroup" style="display: block;">
+<div class="menupage">
+<div class="menupagetitle">ApacheCon</div>
+</div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
-<div class="menupage">
-<div class="menupagetitle">ApacheCon US '04</div>
-</div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
 </div>
@@ -192,7 +192,7 @@
 <a href="#ApacheCon+US%3A+November+13-17%2C+2004">ApacheCon US: November 13-17, 2004</a>
 <ul class="minitoc">
 <li>
-<a href="#Presentations-N10041">Presentations</a>
+<a href="#Presentations-N10045">Presentations</a>
 </li>
 <li>
 <a href="#Derby+Code+Contest">Derby Code Contest</a>
@@ -229,7 +229,8 @@
 </p>
 <ul>
   
-<li>Building Highly Available Applications with Geronimo and Derby</li>
+<li>Building Highly Available Applications with Geronimo and Derby
+      [<a class="external" href="http://sequoia.continuent.org/Resources">Download</a>]</li>
   
 <li>Performance Analysis of Apache Derby </li>
   
@@ -239,7 +240,7 @@
 </div>
 
 
-<a name="N10034"></a><a name="ApacheCon+US%3A+November+13-17%2C+2004"></a>
+<a name="N10038"></a><a name="ApacheCon+US%3A+November+13-17%2C+2004"></a>
 <h2 class="boxed">ApacheCon US: November 13-17, 2004</h2>
 <div class="section">
 <p>
@@ -247,7 +248,7 @@
 <a class="external" href="http://www.apachecon.com/2004/US">ApacheCon US 2004</a>
was held
 in Las Vegas on November 13-17 2004. 
 </p>
-<a name="N10041"></a><a name="Presentations-N10041"></a>
+<a name="N10045"></a><a name="Presentations-N10045"></a>
 <h3 class="boxed">Presentations</h3>
 <p>
 Sessions that focused on Apache Derby included:
@@ -299,7 +300,7 @@
 
 
 </ul>
-<a name="N1007F"></a><a name="Derby+Code+Contest"></a>
+<a name="N10083"></a><a name="Derby+Code+Contest"></a>
 <h3 class="boxed">Derby Code Contest</h3>
 <p>
   An on-site Derby code contest tooks place at ApacheCon with the
@@ -316,7 +317,7 @@
 <li> Result can be a tool, mini-application, or any other demonstration of Derby integration</li>
   
 </ul>
-<a name="N10097"></a><a name="First+Place"></a>
+<a name="N1009B"></a><a name="First+Place"></a>
 <h4>First Place</h4>
 <p>
   The first place winner was 
@@ -342,7 +343,7 @@
   Universal JDBC Driver. Please try it out and post your experience to the
   Derby mail lists.
   </p>
-<a name="N100B6"></a><a name="Second+Place"></a>
+<a name="N100BA"></a><a name="Second+Place"></a>
 <h4>Second Place</h4>
 <p>
   The second place winner was 
@@ -358,7 +359,7 @@
   time you attend ApacheCon, you won't walk right by people you may have
   been interacting with in email during the last year(s).
   </p>
-<a name="N100CA"></a><a name="Third+Place"></a>
+<a name="N100CE"></a><a name="Third+Place"></a>
 <h4>Third Place</h4>
 <p>
   The third place winner was 
@@ -382,7 +383,7 @@
 
 <p>
 
-<em>Last updated: December 19, 2005</em>
+<em>Last updated: December 20, 2005</em>
 
 </p>
 
@@ -401,7 +402,7 @@
          2004-2005 Apache Software Foundation</div>
 <div id="feedback">
     Send feedback about the website to:
-  <a id="feedbackto" href="mailto:derby-dev@db.apache.org?subject=Feedback%C2%A0papers/ApacheConUs04.html">derby-dev@db.apache.org</a>
+  <a id="feedbackto" href="mailto:derby-dev@db.apache.org?subject=Feedback%C2%A0papers/ApacheCon.html">derby-dev@db.apache.org</a>
 </div>
 </div>
 </body>

Modified: db/derby/site/trunk/build/site/papers/DerbyClientSpec.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyClientSpec.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyClientSpec.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyClientSpec.html Tue Dec 20 08:53:43 2005
@@ -159,10 +159,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/embedded_intro.html Tue Dec 20 08:53:43
2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado
2004</a>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/ij_intro.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado
2004</a>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyTut/index.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/index.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/index.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado
2004</a>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/install_software.html Tue Dec 20 08:53:43
2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado
2004</a>

Modified: db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html (original)
+++ db/derby/site/trunk/build/site/papers/DerbyTut/ns_intro.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado
2004</a>

Modified: db/derby/site/trunk/build/site/papers/Intersect-design.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/Intersect-design.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/Intersect-design.html (original)
+++ db/derby/site/trunk/build/site/papers/Intersect-design.html Tue Dec 20 08:53:43 2005
@@ -158,10 +158,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/JDBCImplementation.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/JDBCImplementation.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/JDBCImplementation.html (original)
+++ db/derby/site/trunk/build/site/papers/JDBCImplementation.html Tue Dec 20 08:53:43 2005
@@ -163,10 +163,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/MiscPresentations.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/MiscPresentations.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/MiscPresentations.html (original)
+++ db/derby/site/trunk/build/site/papers/MiscPresentations.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/btree_package.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/btree_package.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/btree_package.html (original)
+++ db/derby/site/trunk/build/site/papers/btree_package.html Tue Dec 20 08:53:43 2005
@@ -158,10 +158,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/derby_arch.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_arch.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_arch.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_arch.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/derby_htw.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_htw.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_htw.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_htw.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/derby_web.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/derby_web.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/derby_web.html (original)
+++ db/derby/site/trunk/build/site/papers/derby_web.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/fortune_tut.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/fortune_tut.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/fortune_tut.html (original)
+++ db/derby/site/trunk/build/site/papers/fortune_tut.html Tue Dec 20 08:53:43 2005
@@ -198,10 +198,10 @@
 <div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Presentations</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/index.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/index.html (original)
+++ db/derby/site/trunk/build/site/papers/index.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
@@ -353,6 +353,10 @@
 <h2 class="boxed">Presentations</h2>
 <div class="section">
 <ul>
+        
+<li> 
+<a href="ApacheCon.html">ApacheCon</a> Derby sessions.
+        </li>
 	
 <li>
 <a href="MiscPresentations.html">OSCON 2005</a>
@@ -363,67 +367,12 @@
 <a href="MiscPresentations.html">Colorado Software Summit 2004</a> 
              had a Derby internals session.
 	</li>
-        
-<li> 
-<a href="ApacheConUs04.html">ApacheCon US 2004</a> had
-              a tutorial, three sessions, and a Derby code contest.
-        </li>
      
 </ul>
-<p>
-     Links to all presentations are summarized in the table below.
-     </p>
-<table class="ForrestTable" cellspacing="1" cellpadding="4"> 
-     
-<tr>
-       
-<td colspan="1" rowspan="1"> Derby BoF
-            [<a href="../binaries/DerbyBOF-OSCON-2005.pdf">PDF</a>]
-       </td>
-       <td colspan="1" rowspan="1"> OSCON 2005 </td>
-     
-</tr>
-     
-<tr>
-       
-<td colspan="1" rowspan="1"> Internals of Derby
-            [<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>]
-            [<a href="../binaries/ApacheDerbyInternals_1_1.pdf">PDF</a>]
-       </td>
-       <td colspan="1" rowspan="1"> Colorado Software Summit 2004 </td>
-     
-</tr>
-     
-<tr>
-       
-<td colspan="1" rowspan="1"> Introducing Apache Derby 
-	[<a href="../binaries/djd_derby_intro.pdf">PDF</a>]</td>
-       <td colspan="1" rowspan="1"> ApacheCon US 2004        </td>
-     
-</tr>
-     
-<tr>
-       
-<td colspan="1" rowspan="1"> Perform with Apache Derby
-	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>]</td>
-       <td colspan="1" rowspan="1"> ApacheCon US 2004        </td>
-     
-</tr>
-     
-<tr>
-       
-<td colspan="1" rowspan="1"> Securing Data with Apache Derby
-	[<a href="../binaries/djd_derby_security.pdf">PDF</a>]</td>
-       <td colspan="1" rowspan="1"> ApacheCon US 2004        </td>
-     
-</tr>
-
-     
-</table>
 </div>
 
 
-<a name="N1019D"></a><a name="Instruction"></a>
+<a name="N1013E"></a><a name="Instruction"></a>
 <h2 class="boxed">Instruction</h2>
 <div class="section">
 <p>
@@ -437,7 +386,7 @@
 </div>
 
 
-<a name="N101B2"></a><a name="Articles+and+Books"></a>
+<a name="N10153"></a><a name="Articles+and+Books"></a>
 <h2 class="boxed">Articles and Books</h2>
 <div class="section">
 <p>
@@ -448,7 +397,7 @@
 </div>
 
 
-<a name="N101C0"></a><a name="How+to+Contribute+Papers"></a>
+<a name="N10161"></a><a name="How+to+Contribute+Papers"></a>
 <h2 class="boxed">How to Contribute Papers</h2>
 <div class="section">
 <p>
@@ -540,7 +489,7 @@
 
 
 <p>
-<em>Last Updated: November 23, 2005</em>
+<em>Last Updated: December 20, 2005</em>
 </p>
 
 </div>

Modified: db/derby/site/trunk/build/site/papers/logformats.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/logformats.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/logformats.html (original)
+++ db/derby/site/trunk/build/site/papers/logformats.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/optimizer.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/optimizer.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/optimizer.html (original)
+++ db/derby/site/trunk/build/site/papers/optimizer.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/pageformats.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/pageformats.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/pageformats.html (original)
+++ db/derby/site/trunk/build/site/papers/pageformats.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/recovery.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/recovery.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/recovery.html (original)
+++ db/derby/site/trunk/build/site/papers/recovery.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Modified: db/derby/site/trunk/build/site/papers/versionupgrade.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/versionupgrade.html?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/versionupgrade.html (original)
+++ db/derby/site/trunk/build/site/papers/versionupgrade.html Tue Dec 20 08:53:43 2005
@@ -156,10 +156,10 @@
 <div onclick="SwitchMenu('menu_1.4', '../skin/')" id="menu_1.4Title" class="menutitle">Presentations</div>
 <div id="menu_1.4" class="menuitemgroup">
 <div class="menuitem">
-<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+<a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>
 <div class="menuitem">
-<a href="../papers/ApacheConUs04.html">ApacheCon US '04</a>
+<a href="../papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
 </div>
 <div class="menuitem">
 <a href="../papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>

Copied: db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheCon.xml (from r357855,
db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml)
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheCon.xml?p2=db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheCon.xml&p1=db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml&r1=357855&r2=358035&rev=358035&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheConUs04.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/ApacheCon.xml Tue Dec 20 08:53:43
2005
@@ -23,7 +23,8 @@
 </p>
 
 <ul>
-  <li>Building Highly Available Applications with Geronimo and Derby</li>
+  <li>Building Highly Available Applications with Geronimo and Derby
+      [<a href="http://sequoia.continuent.org/Resources">Download</a>]</li>
   <li>Performance Analysis of Apache Derby </li>
   <li>Apache Derby Security [<a href="../binaries/jta-WE15.pdf">PDF</a>]</li>
 </ul>
@@ -173,7 +174,7 @@
 </section>
 
 <p>
-<em>Last updated: December 19, 2005</em>
+<em>Last updated: December 20, 2005</em>
 </p>
 
 </body>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml Tue Dec 20 08:53:43
2005
@@ -99,52 +99,16 @@
 <section>
 <title>Presentations</title>
      <ul>
+        <li> <a href="ApacheCon.html">ApacheCon</a> Derby sessions.
+        </li>
 	<li><a href="MiscPresentations.html">OSCON 2005</a>
              had a Derby BoF and a Derby Tutorial.
 	</li>
         <li> <a href="MiscPresentations.html">Colorado Software Summit 2004</a>

              had a Derby internals session.
 	</li>
-        <li> <a href="ApacheConUs04.html">ApacheCon US 2004</a> had
-              a tutorial, three sessions, and a Derby code contest.
-        </li>
      </ul>
 
-     <p>
-     Links to all presentations are summarized in the table below.
-     </p>
-
-     <table> 
-     <tr>
-       <td> Derby BoF
-            [<a href="../binaries/DerbyBOF-OSCON-2005.pdf">PDF</a>]
-       </td>
-       <td> OSCON 2005 </td>
-     </tr>
-     <tr>
-       <td> Internals of Derby
-            [<a href="../binaries/ApacheDerbyInternals_1_1.sxi">Open Office</a>]
-            [<a href="../binaries/ApacheDerbyInternals_1_1.pdf">PDF</a>]
-       </td>
-       <td> Colorado Software Summit 2004 </td>
-     </tr>
-     <tr>
-       <td> Introducing Apache Derby 
-	[<a href="../binaries/djd_derby_intro.pdf">PDF</a>]</td>
-       <td> ApacheCon US 2004        </td>
-     </tr>
-     <tr>
-       <td> Perform with Apache Derby
-	[<a href="../binaries/reuben_derby_perf.pdf">PDF</a>]</td>
-       <td> ApacheCon US 2004        </td>
-     </tr>
-     <tr>
-       <td> Securing Data with Apache Derby
-	[<a href="../binaries/djd_derby_security.pdf">PDF</a>]</td>
-       <td> ApacheCon US 2004        </td>
-     </tr>
-
-     </table> 
 </section>
 
 <section>
@@ -261,6 +225,6 @@
 
 </section>
 
-<p><em>Last Updated: November 23, 2005</em></p>
+<p><em>Last Updated: December 20, 2005</em></p>
 </body>
 </document>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/site.xml?rev=358035&r1=358034&r2=358035&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Tue Dec 20 08:53:43 2005
@@ -59,8 +59,8 @@
   </net_client>
 
   <present label="Presentations" href="papers/" tab="papers">
+      <apacheCon label="ApacheCon"  href="ApacheCon.html"/>
       <oscon05   label="OSCON 2005"        href="MiscPresentations.html#OSCON+2005"/>
-      <apacheCon label="ApacheCon US '04"  href="ApacheConUs04.html"/>
       <colorado  label="Colorado 2004"     href="MiscPresentations.html#Colorado+Software+Summit+2004"/>
   </present>
 



Mime
View raw message