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 da...@apache.org on 2011/09/02 21:04:00 UTC

svn commit: r1164672 [8/8] - in /db/derby/site/trunk: build/site/ build/site/blogs/ build/site/blogs/images/ build/site/dev/ build/site/integrate/ build/site/integrate/plugin_help/ build/site/manuals/ build/site/papers/ build/site/papers/DerbyTut/ buil...

Modified: db/derby/site/trunk/build/site/releases/release-10.6.2.1.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/releases/release-10.6.2.1.html?rev=1164672&r1=1164671&r2=1164672&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/releases/release-10.6.2.1.html (original)
+++ db/derby/site/trunk/build/site/releases/release-10.6.2.1.html Fri Sep  2 19:03:57 2011
@@ -65,7 +65,7 @@
 <a class="unselected" href="../manuals/index.html">Documentation</a>
 </li>
 <li>
-<a class="unselected" href="../integrate/index.html">Resources</a>
+<a class="unselected" href="../blogs/index.html">Resources</a>
 </li>
 </ul>
 <!--+
@@ -175,9 +175,60 @@ document.write("Last Published: " + docu
 <a href="../manuals/docscheck.html">Release Checklist</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Other Products</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Blogs and Articles About Derby</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
+<a href="../blogs/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#blogs">Blogs</a>
+</div>
+<div onclick="SwitchMenu('menu_1.6.3', '../skin/')" id="menu_1.6.3Title" class="menutitle">Articles</div>
+<div id="menu_1.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.6.3.1', '../skin/')" id="menu_1.6.3.1Title" class="menutitle">Tutorials, Tips and Tuning</div>
+<div id="menu_1.6.3.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="../blogs/index.html#getstarted">Getting Started</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#features">Features, Hints and Tips</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#security">Security</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#performance">Performance and Tuning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6.3.2', '../skin/')" id="menu_1.6.3.2Title" class="menutitle">Tools and Migration</div>
+<div id="menu_1.6.3.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../blogs/index.html#tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#migration">Migration</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6.3.3', '../skin/')" id="menu_1.6.3.3Title" class="menutitle">Applications</div>
+<div id="menu_1.6.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../blogs/index.html#client">Client</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#middletier">Middle Tier</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#persistence">Persistence</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#scalability">Scalability and Failover</a>
+</div>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Integration With Other Products</div>
+<div id="menu_1.7" class="menuitemgroup">
+<div class="menuitem">
 <a href="../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
@@ -187,8 +238,8 @@ document.write("Last Published: " + docu
 <a href="../integrate/index.html#products">Product Writeups</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.8" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/derby_plugin.html">10 Core</a>
 </div>
@@ -204,16 +255,16 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6', '../skin/')" id="menu_1.7.6Title" class="menutitle">10 Core and 1.1 UI Documentation</div>
-<div id="menu_1.7.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6', '../skin/')" id="menu_1.8.6Title" class="menutitle">10 Core and 1.1 UI Documentation</div>
+<div id="menu_1.8.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6.3', '../skin/')" id="menu_1.7.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.7.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.3', '../skin/')" id="menu_1.8.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.8.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -224,8 +275,8 @@ document.write("Last Published: " + docu
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6.4', '../skin/')" id="menu_1.7.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.7.6.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.4', '../skin/')" id="menu_1.8.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.8.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -239,8 +290,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6.6', '../skin/')" id="menu_1.7.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.7.6.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.6', '../skin/')" id="menu_1.8.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.8.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -262,15 +313,15 @@ document.write("Last Published: " + docu
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Papers</div>
-<div id="menu_1.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9', '../skin/')" id="menu_1.9Title" class="menutitle">Papers and Presentations</div>
+<div id="menu_1.9" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Overview</a>
 </div>
-<div onclick="SwitchMenu('menu_1.8.2', '../skin/')" id="menu_1.8.2Title" class="menutitle">Derby Engine</div>
-<div id="menu_1.8.2" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.8.2.1', '../skin/')" id="menu_1.8.2.1Title" class="menutitle">Javadoc</div>
-<div id="menu_1.8.2.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.2', '../skin/')" id="menu_1.9.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.9.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.2.1', '../skin/')" id="menu_1.9.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.9.2.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
 </div>
@@ -318,14 +369,14 @@ document.write("Last Published: " + docu
 <a href="../papers/versionupgrade.html">Versioning</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.3', '../skin/')" id="menu_1.8.3Title" class="menutitle">Derby Network Client</div>
-<div id="menu_1.8.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3', '../skin/')" id="menu_1.9.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.9.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/DerbyClientSpec.html">Functional Spec</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.4', '../skin/')" id="menu_1.8.4Title" class="menutitle">Derby Tutorial</div>
-<div id="menu_1.8.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4', '../skin/')" id="menu_1.9.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.9.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/DerbyTut/index.html">Overview</a>
 </div>
@@ -342,8 +393,8 @@ document.write("Last Published: " + docu
 <a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.5', '../skin/')" id="menu_1.8.5Title" class="menutitle">Presentations</div>
-<div id="menu_1.8.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.5', '../skin/')" id="menu_1.9.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.9.5" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>

Modified: db/derby/site/trunk/build/site/releases/release-10.7.1.1.html
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/build/site/releases/release-10.7.1.1.html?rev=1164672&r1=1164671&r2=1164672&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/releases/release-10.7.1.1.html (original)
+++ db/derby/site/trunk/build/site/releases/release-10.7.1.1.html Fri Sep  2 19:03:57 2011
@@ -65,7 +65,7 @@
 <a class="unselected" href="../manuals/index.html">Documentation</a>
 </li>
 <li>
-<a class="unselected" href="../integrate/index.html">Resources</a>
+<a class="unselected" href="../blogs/index.html">Resources</a>
 </li>
 </ul>
 <!--+
@@ -175,9 +175,60 @@ document.write("Last Published: " + docu
 <a href="../manuals/docscheck.html">Release Checklist</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Other Products</div>
+<div onclick="SwitchMenu('menu_1.6', '../skin/')" id="menu_1.6Title" class="menutitle">Blogs and Articles About Derby</div>
 <div id="menu_1.6" class="menuitemgroup">
 <div class="menuitem">
+<a href="../blogs/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#blogs">Blogs</a>
+</div>
+<div onclick="SwitchMenu('menu_1.6.3', '../skin/')" id="menu_1.6.3Title" class="menutitle">Articles</div>
+<div id="menu_1.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.6.3.1', '../skin/')" id="menu_1.6.3.1Title" class="menutitle">Tutorials, Tips and Tuning</div>
+<div id="menu_1.6.3.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="../blogs/index.html#getstarted">Getting Started</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#features">Features, Hints and Tips</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#security">Security</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#performance">Performance and Tuning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6.3.2', '../skin/')" id="menu_1.6.3.2Title" class="menutitle">Tools and Migration</div>
+<div id="menu_1.6.3.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="../blogs/index.html#tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#migration">Migration</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6.3.3', '../skin/')" id="menu_1.6.3.3Title" class="menutitle">Applications</div>
+<div id="menu_1.6.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="../blogs/index.html#client">Client</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#middletier">Middle Tier</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#persistence">Persistence</a>
+</div>
+<div class="menuitem">
+<a href="../blogs/index.html#scalability">Scalability and Failover</a>
+</div>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Integration With Other Products</div>
+<div id="menu_1.7" class="menuitemgroup">
+<div class="menuitem">
 <a href="../integrate/index.html">Overview</a>
 </div>
 <div class="menuitem">
@@ -187,8 +238,8 @@ document.write("Last Published: " + docu
 <a href="../integrate/index.html#products">Product Writeups</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.7', '../skin/')" id="menu_1.7Title" class="menutitle">Eclipse Plug-ins</div>
-<div id="menu_1.7" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.8" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/derby_plugin.html">10 Core</a>
 </div>
@@ -204,16 +255,16 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="../integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6', '../skin/')" id="menu_1.7.6Title" class="menutitle">10 Core and 1.1 UI Documentation</div>
-<div id="menu_1.7.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6', '../skin/')" id="menu_1.8.6Title" class="menutitle">10 Core and 1.1 UI Documentation</div>
+<div id="menu_1.8.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/start_toc.html">Getting Started</a>
 </div>
 <div class="menuitem">
 <a href="../integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6.3', '../skin/')" id="menu_1.7.6.3Title" class="menutitle">Derby Nature</div>
-<div id="menu_1.7.6.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.3', '../skin/')" id="menu_1.8.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.8.6.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/nature_toc.html">Adding or Removing</a>
 </div>
@@ -224,8 +275,8 @@ document.write("Last Published: " + docu
 <a href="../integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6.4', '../skin/')" id="menu_1.7.6.4Title" class="menutitle">Network Server</div>
-<div id="menu_1.7.6.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.4', '../skin/')" id="menu_1.8.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.8.6.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/server_toc.html">Starting and Stopping</a>
 </div>
@@ -239,8 +290,8 @@ document.write("Last Published: " + docu
 <div class="menuitem">
 <a href="../integrate/plugin_help/properties.html">Derby Properties</a>
 </div>
-<div onclick="SwitchMenu('menu_1.7.6.6', '../skin/')" id="menu_1.7.6.6Title" class="menutitle">ij</div>
-<div id="menu_1.7.6.6" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.8.6.6', '../skin/')" id="menu_1.8.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.8.6.6" class="menuitemgroup">
 <div class="menuitem">
 <a href="../integrate/plugin_help/ij_toc.html">Using ij</a>
 </div>
@@ -262,15 +313,15 @@ document.write("Last Published: " + docu
 </div>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8', '../skin/')" id="menu_1.8Title" class="menutitle">Papers</div>
-<div id="menu_1.8" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9', '../skin/')" id="menu_1.9Title" class="menutitle">Papers and Presentations</div>
+<div id="menu_1.9" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/index.html">Overview</a>
 </div>
-<div onclick="SwitchMenu('menu_1.8.2', '../skin/')" id="menu_1.8.2Title" class="menutitle">Derby Engine</div>
-<div id="menu_1.8.2" class="menuitemgroup">
-<div onclick="SwitchMenu('menu_1.8.2.1', '../skin/')" id="menu_1.8.2.1Title" class="menutitle">Javadoc</div>
-<div id="menu_1.8.2.1" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.2', '../skin/')" id="menu_1.9.2Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.9.2" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.2.1', '../skin/')" id="menu_1.9.2.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.9.2.1" class="menuitemgroup">
 <div class="menuitem">
 <a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
 </div>
@@ -318,14 +369,14 @@ document.write("Last Published: " + docu
 <a href="../papers/versionupgrade.html">Versioning</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.3', '../skin/')" id="menu_1.8.3Title" class="menutitle">Derby Network Client</div>
-<div id="menu_1.8.3" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.3', '../skin/')" id="menu_1.9.3Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.9.3" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/DerbyClientSpec.html">Functional Spec</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.4', '../skin/')" id="menu_1.8.4Title" class="menutitle">Derby Tutorial</div>
-<div id="menu_1.8.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.4', '../skin/')" id="menu_1.9.4Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.9.4" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/DerbyTut/index.html">Overview</a>
 </div>
@@ -342,8 +393,8 @@ document.write("Last Published: " + docu
 <a href="../papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
 </div>
 </div>
-<div onclick="SwitchMenu('menu_1.8.5', '../skin/')" id="menu_1.8.5Title" class="menutitle">Presentations</div>
-<div id="menu_1.8.5" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.9.5', '../skin/')" id="menu_1.9.5Title" class="menutitle">Presentations</div>
+<div id="menu_1.9.5" class="menuitemgroup">
 <div class="menuitem">
 <a href="../papers/ApacheCon.html">ApacheCon</a>
 </div>

Modified: db/derby/site/trunk/src/documentation/conf/cli.xconf
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/conf/cli.xconf?rev=1164672&r1=1164671&r2=1164672&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/conf/cli.xconf (original)
+++ db/derby/site/trunk/src/documentation/conf/cli.xconf Fri Sep  2 19:03:57 2011
@@ -310,7 +310,6 @@
      <uri type="append" src="releases/release-10.3.3.0.html"/>
      <uri type="append" src="releases/release-10.4.2.0.html"/>
      <uri type="append" src="releases/release-10.5.1.1.html"/>
-     <uri type="append" src="releases/release-10.5.2.0.html"/>
      <uri type="append" src="releases/release-10.5.3.0.html"/>
      <uri type="append" src="releases/release-10.6.1.0.html"/>
      <uri type="append" src="releases/release-10.6.2.1.html"/>

Added: db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml?rev=1164672&view=auto
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml (added)
+++ db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml Fri Sep  2 19:03:57 2011
@@ -0,0 +1,529 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document> 
+  <header> 
+    <title>Blogs and articles about Derby</title> 
+  </header> 
+  <body> 
+
+    <p>
+      Here we collect blogs and articles about Derby. Please also check the
+      <a href="http://wiki.apache.org/db-derby/">Derby Wiki</a> for smaller write-ups.
+    </p>
+
+      <p>
+	There are many older Derby articles at IBM developer works that may be of interest <a href="http://www.ibm.com/developerworks/views/opensource/libraryview.jsp?sort_by=&amp;show_abstract=true&amp;show_all=&amp;search_flag=&amp;contentarea_by=All+Zones&amp;search_by=Derby&amp;product_by=All++Products&amp;topic_by=All++Topics&amp;industry_by=All++Industries&amp;type_by=All++Types&amp;ibm-search=Search">here</a>
+      </p>
+
+    <p>
+      Note: Some articles use the term "Java DB". 
+      <a href="http://www.oracle.com/technetwork/java/javadb/overview/index.html">
+	Java DB</a> is essentially the
+	same as Derby: it is the bits distributed by Oracle as part of the
+	Java Development Kit (JDK) based on the Derby bits.
+    </p>
+
+    <p>
+      Note: Some articles use the term "Cloudscape". Cloudscape is the product name used
+      by IBM before Derby was open sourced.
+    </p>
+    
+    <p>
+      There is also the now somewhat dated book "Apache Derby - Off to the Races"<a href="http://www.amazon.com/dp/0131855255?tag=carehartorg-20&amp;camp=14573&amp;creative=327641&amp;linkCode=as1&amp;creativeASIN=0131855255&amp;adid=1T05ZJ1NNSHZP8T0J9YX&amp;"><img src="images/off.jpg" alt="Book frontispiece" width="70"/></a><br/>
+    </p>
+
+    <!-- ============================================================== -->
+    <section id="blogs">
+      <title>Blogs</title>
+      <p>
+	<a href="http://blogs.oracle.com/kah">Knut Hatlen's blog</a>This often contains news about the latest releases with examples of the new features.
+      </p>
+      <p>
+	<a href="http://www.java.net/blogs/lancea">Lance Andersen's blog</a> Java EE and JDBC related issues.
+      </p>
+    </section>
+
+    <!-- ============================================================== -->
+    
+    <section id="articles">
+      <title>Articles grouped by topic, newest listed first</title>
+
+      <!-- ____________________________________________________________ -->
+      <section id="tuts">
+	<title>Tutorials, Tips and Tuning</title>
+
+	<!-- .......................................................... -->
+	<section id="getstarted">
+	  <title>Getting Started</title>
+	  <p>
+	    (See also <a href="../papers/DerbyTut/index.html">the Derby Tutorial</a>).
+	  </p>
+
+	  <p>
+	    <a href="http://www.stuartellis.eu/articles/derby-javadb/">Getting Started with Apache Derby (Java DB)</a> <em>(by Stuart Ellis</em>) - including how to use Derby with JRuby on Rails
+	  </p>
+
+	  <p>
+	    <a href="http://www.vsj.co.uk/databases/display.asp?id=466">
+	      Flying out of the gate with Derby</a> <em>(by Sing Li)</em> <br/> Derby is a 100%
+	      Java open source relational database, and you can't afford to
+	      ignore it. Learn why in this article.
+	  </p>
+
+	  <p>
+	    <a href="http://www.vogella.de/articles/ApacheDerby/article.html">Apache Derby Database - Tutorial</a>
+	    <em>(by Lars Vogel</em>)
+
+	    This articles explains how to install the Apache Derby database,
+	    how to start the Derby server, how to connect via Java to Derby
+	    and how to use the Derby command line tool to issue SQL
+	    statements. The installation of Apache Derby as Windows Service is
+	    also explained.
+	  </p>
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta1/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta2/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 1</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta3/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 2</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta4/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 3</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta5/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 4</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta6/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 5</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta7/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 6</a><br/> 
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-trifecta8/index.html">Developing with Apache Derby -- Hitting the Trifecta: Introduction to Apache Derby - Part 7</a><br/>
+	    "Jump in and try it -- and appreciate the simplicity"
+	  </p>
+
+	  <p>
+	    <a href="http://www.informit.com/articles/article.aspx?p=730287">
+	    Getting Started with Derby</a>
+	    <em>(by <a href="http://www.informit.com/authors/bio.aspx?a=ff0e7b03-51ce-4983-9e3f-68485b1e8ceb">Stephen
+	    B. Morris)</a></em> <br/> This thorough introduction to Derby addresses
+	    installation, environment set up, building and executing an
+	    application with Derby embedded.
+	  </p>
+
+	  <p>
+	    <a href="http://www.informit.com/articles/article.aspx?p=1016103">
+	    Using Derby as a Network Database Server Engine</a>
+	    <em>(by <a href="http://www.informit.com/authors/bio.aspx?a=ff0e7b03-51ce-4983-9e3f-68485b1e8ceb">
+	    Stephen	B. Morris</a></em> <br /> Need a network database server that can
+	    handle multiple remote clients? There's no longer a need to
+	    spend megabucks. Stephen Morris explains how Derby can serve the
+	    needs of many remote clients via an open-source RDBMS.
+	  </p>
+
+	  <p>
+	    <a href="http://www.informit.com/articles/article.aspx?p=1019130">
+	      Further Steps with Derby: Defining and Accessing Your Data</a>
+	      (by <a href="http://www.informit.com/authors/bio.aspx?a=ff0e7b03-51ce-4983-9e3f-68485b1e8ceb">Stephen
+	      B. Morris</a>) <br /> Do you need a simple database as part of an
+	      application upgrade? Derby is easy to use and program and
+	      combines high performance with a modest footprint. Stephen
+	      Morris tells you why database development is no longer the sole
+	      preserve of DBAs or data center IT people.
+	  </p>
+
+	  <p>
+	    <a href="http://www.theregister.co.uk/2006/11/08/java_database_derby/">
+	      Java databasing with Derby - Java's own open source database</a><em>(by Pan Pantziarka/the Register )</em>
+	  </p>
+
+	</section>
+
+	<!-- .......................................................... -->
+	<section id="features">
+	  <title>Features, Hints and Tips</title>
+
+	  <p>
+	    <a href="http://blogs.oracle.com/kah/entry/derby_10_8_is_out">Derby 10.8 is out</a> A feature summary (by <em>Knut Hatlen)</em><br/>
+	    <a href="http://blogs.oracle.com/kah/entry/what_s_new_in_derby">What's new in Derby 10.7?</a> (by <em>Knut Hatlen)</em><br/>
+	    <a href="http://blogs.oracle.com/kah/entry/derby_10_6_2_is">Derby 10.6.2 is out</a> (by <em>Knut Hatlen)</em><br/>
+	    <a href="http://java.sun.com/developer/technicalArticles/Database/javadb_10_5/index.html">
+	    Introducing Java DB 10.5.1.1</a> <em>(by Rick Hillegas)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://www.oracle.com/technetwork/java/javadb/tablefunctionswhitepaper-156705.html">Java DB Table Functions</a> (<a href="http://www.oracle.com/technetwork/java/javadb/sampletablefunctions-159249.zip">Download Code and White Paper</a>) <em>(by Rick Hillegas)</em>
+	    
+	    This white paper explores table functions, a feature introduced in
+	    Derby release 10.4.1.3.<br/>
+	    Rich and expressive, SQL is the world's most popular database
+	    query language. Table functions let you take SQL outside its
+	    traditional home in the RDBMS, setting SQL loose on data in the
+	    wild.
+	  </p>
+
+	  <p>
+	    <a href="http://javaevangelist.blogspot.com/2007/01/ldap-authentication-with-apache-derby.html">
+	      LDAP Authentication with Apache Derby (Java DB)</a>
+	      (by <a href="http://www.blogger.com/profile/00461192445071361043">John Yeary</a>) <br/>
+	      A short, simple tutorial on how to use Apache Derby and LDAP.
+	  </p>
+
+
+	</section>
+
+
+	<!-- .......................................................... -->
+	<section id="security">
+	  <title>Security</title>
+
+	  <p>
+	    <a href="http://www.ittoday.info/Articles/Apache_Derby_Database_Protection.htm">Protect Your Apache Derby Database from Superuser Attacks</a> <em>(by Marios Karagiannopoulos)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://www.oracle.com/technetwork/java/javadb/securitywhitepaper10-159253.pdf">
+	      Java DB Security</a>
+	      <em>(by Rick Hillegas)</em>
+
+	      Derby provides several ways to protect the correctness and
+	      privacy of your data as well as forestall accidental or
+	      malicious misuse of the database software itself. This white
+	      paper explains how to improve the database security of
+	      applications and machines which use Derby.
+	  </p>
+
+
+	  <p>
+	    <a href="http://today.java.net/pub/a/2007/03/20/javadb-end-to-end-security.html">
+	      Java DB End-to-End Security</a>
+	      (by <a href="http://today.java.net/pub/au/432">Masoud Kalali</a>) <br/>
+	      Derby, as an open source and pure-Java
+	      relational database, provides several features that make it
+	      suitable for embedded and network server modes, including
+	      Derby mechanisms to make it secure on several levels. If
+	      you are going to build an application using Derby and
+	      security is important, then this article is for you.
+	  </p>
+
+	</section>
+
+	<!-- .......................................................... -->
+	<section id="performance">
+	  <title>Performance and Tuning</title>
+
+	  <p>
+	    <a href="http://www.onjava.com/pub/a/onjava/2007/01/31/tuning-derby.html?page=1">
+	      Tuning Derby</a>
+	      (by <a href="http://www.oreillynet.com/pub/au/1763">Dejan
+	      Bosanac</a>, Software developer, technology consultant and
+	      author, ONJava.net) <br/>
+	    
+	      There is a big difference in the behavior of a database when
+	      it is populated with a small amount of test inputs and when
+	      it holds a large amount of data. Usually, you would not
+	      address these database performance issues early in the
+	      development process, but when the time comes, you should
+	      take some action to ensure that the application is working
+	      correctly with large amounts of data.
+	  </p>
+
+	</section>
+      </section>
+
+      <!-- ____________________________________________________________ -->
+      <section id="toolsetc">
+	<title>Tools and Migration</title>
+	
+	<!-- .......................................................... -->
+	<section id="tools">
+	  <title>Tools</title>
+
+	  <p>
+	    <a href="http://www.myeclipseide.com/documentation/quickstarts/derby/">MyEclipse Derby Database Server Tutorial</a>
+	    
+	  </p>
+
+
+	  <p>
+	    <a href="http://netbeans.org/kb/docs/ide/java-db.html">
+	      Working with the Java DB (Derby) Database [in NetBeans]</a> <em>(by the Netbeans team)</em>
+
+	      This document demonstrates how to quickly set up a connection to
+	      Oracle's Java DB (which is based on the Apache Derby database) in
+	      NetBeans. Once a connection is made, you can easily begin working
+	      with the database in the NetBeans IDE, allowing you to create
+	      tables, populate them with data, run SQL queries, and more.
+	  </p>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/integrate/SQuirreL_Derby.html">
+	      Using SQuirreL SQL Client with Derby</a> <br/>
+
+	      SQuirreL SQL Client is a useful tool for browsing and
+	      manipulating SQL databases via JDBC. This paper discusses
+	      setting up SQuirreL to access Derby databases via the Derby
+	      Embedded Driver and Client Drivers with the 10.1 version of
+	      Derby.
+	  </p>
+	  
+	  <p>
+	    <a href="http://blogs.sun.com/david/entry/defining_java_studio_creator_2">
+	      Using Java DB with Java Studio Creator and Tomcat</a>
+	      (by <a href="http://blogs.sun.com/david/category/About">David
+	      Botterill</a>, Java Tools (Java Studio Creator and NetBeans)
+	      Evangelist, Sun Microsystems) <br/>
+
+	      In this blog David Botterill helps you set up the Travel sample
+	      database of Java Studio Creator 2 on Tomcat using Derby.
+	  </p>
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-ij/index.html">Back to basics: Scripting Apache Derby's ij tool</a>
+	  </p>
+
+	</section>
+	
+	<!-- .......................................................... -->
+	<section id="migration">
+	  <title>Migration</title>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/integrate/db_ddlutils.html">
+	      Using DdlUtils to Migrate Databases to Derby</a> <br/>
+
+	      <a href="http://db.apache.org/ddlutils/databases/derby.html">DdlUtils</a>, an
+	      Apache DB subproject, provides utilities for creating and
+	      working with Database Definition (DDL) files and for
+	      exporting and importing data in XML format. Among other
+	      uses, DdlUtils makes it easier to migrate from one database
+	      vendor to another. This paper provides a simple example for
+	      using DdlUtils to migrate a database to Derby using
+	      the <a href="http://db.apache.org/ddlutils/ant/">DdlUtils
+	      Ant tasks</a>.
+	  </p>
+	</section>
+      </section>
+
+      <!-- ____________________________________________________________ -->
+      <section id="apps">
+	<title>Applications</title>
+
+	<!-- .......................................................... -->
+	<section id="client">
+	  <title>Client</title>
+
+	  <p>
+	    <a href="http://www.informit.com/articles/article.aspx?p=1019131">
+	      Further Steps with Derby: Derby Embedded in a Browser</a>
+
+	      (by <a href="http://www.informit.com/authors/bio.aspx?a=ff0e7b03-51ce-4983-9e3f-68485b1e8ceb">
+	      Stephen B. Morris</a>)
+	  </p>
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-offline-ajax/index.html">Offline Ajax with Apache Derby</a> <em>(by Michael Galpin)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://today.java.net/pub/a/today/2007/01/16/synchronizing-web-client-database.html">
+	    Synchronizing a Web Client Database: LocalCalendar and Google Calendar</a> <em>(by David van Couvering)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/library/os-ad-gwt1/">Build an Ajax application using Google Web Toolkit, Apache Derby, and Eclipse</a> <em>(by Noel Rappin)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/opensource/tutorials/os-ad-ajax/index.html">Real-world Apache Derby: Who needs Ajax, anyway?</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/tutorials/os-ad-datastore1/index.html">Real-world Apache Derby, Part 1: Apache Derby and OpenOffice.org Calc</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/tutorials/os-ad-viper/index.html">Real-world Apache Derby, Part 3: Portable document storage</a>
+	  </p>
+
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/db2/library/techarticle/dm-0607cline/">
+	      Cloudscape and Ajax - An example</a> <br/> 
+
+	      This article explains all the steps and requirements to create
+	      an embedded database and Web server application. The source code
+	      and a ready to run application provided as a zip file are
+	      available for download.
+	  </p>
+
+	  <p>
+	    <a href="http://java.sun.com/developer/technicalArticles/J2SE/Desktop/javadb/">
+	      Using Java DB in Desktop Applications</a> (by John O'Connor, Java
+	      Technology evangelist, engineer, and writer at Sun
+	      Microsystems) <br/>
+
+	      Learn how to deploy Derby, based on the Apache Derby database,
+	      within desktop Java applications. The article uses the Address
+	      Book demo to show you how to work with Derby as an embedded
+	      database.
+	  </p>
+	  
+	</section>
+
+	<!-- .......................................................... -->
+	<section id="middletier">
+	  <title>Middle Tier</title>
+
+	  <p>
+	    <a href="http://www.carehart.org/resourcelists/derby_for_CFers/">Getting Started with the Apache Derby Open Source Database in CF8 (Cold Fusion)</a> <em>(by ColdFusion troubleshooter Charlie Arehart)</em>
+	  </p>
+
+
+	  <p>
+	     <a href="http://www.bennadel.com/blog/2225-An-Experiment-In-Using-An-Embedded-Apache-Derby-Database-To-Power-ColdFusion-Query-Of-Queries.htm">An Experiment In Using An Embedded Apache Derby Database To Power ColdFusion Query-Of-Queries</a> <em>(by Ben Nadel)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://www.carehart.org/blog/client/index.cfm/2009/3/2/using_derby_video">"Using Apache Derby" (with Cold Fusion)</a>, watch my <a href="http://tv.adobe.com/watch/max-2008-develop/apache-derby-the-open-source-db-embedded-in-coldfusion-8">Max presentation</a>
+	  </p>
+
+	  <p>
+	    <a href="https://wiki.base22.com/display/btg/Working+with+the+embedded+Derby+database+for+WebSphere+Portal">Working with the embedded Derby database for WebSphere Portal</a> <em>(by Cody Burleson)</em>
+	  </p>
+
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-mgobj/">Using Apache Derby databases, Part 1: Managed objects in a converged provider environment</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/library/os-ad-mgobj2/index.html">Using Apache Derby databases, Part 2: Manage IT services beyond mere deployment</a><br/> <em>(by Stephen Morris)</em>
+	    Automating IT management with IBM AIDE and Derby
+	  </p>
+	    
+	  <p>
+	    <a href="http://www.ibm.com/developerworks/opensource/tutorials/os-ad-ws1/index.html">Apache Derby resources from the Web services perspective, Part 1: Derby data as WS-Resources</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/tutorials/os-ad-ws2/index.html">Apache Derby resources from the Web services perspective, Part 2: Producing and consuming WS-Notifications with Derby</a><br/>
+	    <a href="http://www.ibm.com/developerworks/opensource/tutorials/os-ad-ws3/index.html">Apache Derby resources from the Web services perspective, Part 3: Manage Apache Derby using Web Services Distributed Management</a><br/>
+	  </p>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/integrate/JPetStoreWebSphere.html">
+	      Using Apache Derby with iBATIS JPetStore 4 on the WebSphere
+	      Server</a> <br/>
+
+	      This document demonstrates setting up the JPetStore 4.0
+	      application to run on a J2EE Application Server using an
+	      embedded Apache Derby database as the persistence layer. Apache
+	      Derby is a small footprint, open source, relational database
+	      engine written in Java. It is ideally suited for use with J2EE
+	      and Web applications where reliability, portability, ease of use
+	      and low maintenance is important.
+	  </p>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/integrate/DerbyTomcat5512JPetStor.html">
+	      Embedding Apache Derby in Tomcat and creating an iBATIS JPetStore
+	      Demo</a> <br/> 
+
+	      Shows the steps required to embed Derby in a Tomcat version
+	      5.5.12 Server and then deploy a copy of the iBATIS JPetStore
+	      application that utilizes a Derby database.
+	  </p>
+
+	  <p>
+	    <a href="http://nagpals.com/posts/installing-apache-derby-database-on-coldfusionmx-7-0-2/">
+	      Installing Apache Derby Database on ColdFusionMX 7.0.2</a> <br/>
+
+	      Instructions for installing and configuring Derby for use on
+	      ColdFusionMX. Conclusion: &quot;All in all, it was very easy to
+	      get Apache Derby to work with ColdFusionMX. ... I'm quite sure
+	      I'll be using much more of Derby in the projects I work
+	      on.&quot;
+	  </p>
+
+	  <p>
+	    <a href="http://blogs.oracle.com/jason/entry/embedding_javadb_as_an_in">
+	      Implementing Java DB as an Embedded Cache to Support Service</a>
+	      (by <a href="mailto:Jason.Baragry@Sun.COM">Jason Baragry</a>,
+	      Sun Client Solutions Engineer in Oslo, Norway) <br/>
+
+	      Describes how Derby can be used as an embedded database to act
+	      as a cache for services deployed in the Sun Java System
+	      Application Server.
+	  </p>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/binaries/DerbyAndRedHatAppServer.pdf">
+	      Apache Derby and Red Hat Application Server: JonAS Integration</a>
+	      (by Ramandeep Kaur) <br/>
+
+	      This document provides details on how to configure and run
+	      Apache Derby with Red Hat Application Server.
+	  </p>
+	</section>
+
+	<!-- .......................................................... -->
+	<section id="persistence">
+	  <title>Persistence</title>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/integrate/JPOX_Derby.html">
+	      Using JPOX JDO with Derby</a> <br/>
+
+	      Provides a concrete example of using JPOX JDO to persist and
+	      retrieve data to and from Apache Derby. Java Data Objects (JDO)
+	      is a specification for persisting Java objects.
+	  </p>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/integrate/db_torque.html">
+	      Running the Torque Tutorial on Derby</a> <br/>
+
+	      This page summarizes the changes required to run the Torque 3.2
+	      tutorial on Derby 10.1 using the Derby embedded JDBC driver.
+	  </p>
+
+	  <p>
+	    <a href="http://wiki.apache.org/db-derby/HibernateHelp">HibernateHelp</a><br/>
+
+	    This wiki page documents various peoples' experience using
+	    Hibernate with Derby.
+	  </p>
+
+	</section>
+
+	<!-- .......................................................... -->
+	<section id="scalability">
+	  <title>Scalability and Failover</title>
+
+	  <p>
+	    <a href="http://blogs.sun.com/JagadishPrasath/entry/using_sequoia_with_glassfish">Sequoia Database Clustering Middleware with GlassFish and Java DB (Apache Derby)</a>
+	    (by <a href="http://blogs.sun.com/JagadishPrasath/category/Sun">Jagadish
+	    Ramu</a>, Glassful engineer) <br/> 
+
+	    This demo and tutorial show how GlassFish and Sequoia can be used
+	    together to provide clustering capability with Apache
+	    Derby. Sequoia is an open source database clustering middleware
+	    that allows any Java application to transparently access a cluster
+	    of databases through
+	    <a href="http://java.sun.com/javase/technologies/database/">JDBC</a>.
+	  </p>
+
+	  <p>
+	    <a href="http://db.apache.org/derby/binaries/HOWTO_CJDBC_Derby_v0.2.pdf">
+	      HOWTO use C-JDBC with Apache Derby</a> (by Emmanuel Cecche) <br/>
+
+	      How to use Derby with C-JDBC,an open source database cluster
+	      middleware that allows any Java application to transparently
+	      access a cluster of databases through JDBC.
+	  </p>
+
+	</section>
+
+      </section>
+
+
+    </section>
+    
+    <p><em>Last Updated: August 20, 2011</em></p>
+  </body>
+</document>

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/blogs/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/site/trunk/src/documentation/content/xdocs/images/off.jpg
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/images/off.jpg?rev=1164672&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/images/off.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/images/off.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Modified: db/derby/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/site.xml?rev=1164672&r1=1164671&r2=1164672&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Fri Sep  2 19:03:57 2011
@@ -60,7 +60,34 @@
     <docscheck label="Release Checklist" href="docscheck.html"></docscheck>
   </manuals>
 
-  <integrate label="Other Products" href="integrate/" tab="resources">
+
+  <blogss label="Blogs and Articles About Derby" href="blogs/" tab="resources">
+    <index label="Overview" href="index.html"></index>
+    <blogs label="Blogs" href="index.html#blogs"></blogs>
+
+    <arts label="Articles" href="index.html">
+      <tutorials label="Tutorials, Tips and Tuning" href="">
+	<getstarted label="Getting Started" href="#getstarted"></getstarted>
+	<features label="Features, Hints and Tips" href="#features"></features>
+	<security label="Security" href="#security"></security>
+	<performance label="Performance and Tuning" href="#performance"></performance>
+      </tutorials>
+
+      <toolsmigration label="Tools and Migration" href="">
+	<tools label="Tools" href="#tools"></tools>
+	<migration label="Migration" href="#migration"></migration>
+      </toolsmigration>
+
+      <applications label="Applications" href="">
+	<client label="Client" href="#client"></client>
+	<middletier label="Middle Tier" href="#middletier"></middletier>
+	<persistence label="Persistence" href="#persistence"></persistence>
+	<scalability label="Scalability and Failover" href="#scalability"></scalability>
+      </applications>
+    </arts>
+
+  </blogss>
+  <integrate label="Integration With Other Products" href="integrate/" tab="resources">
       <index label="Overview" href="index.html"></index>
       <uses label="What works with Derby?" href="index.html#uses"></uses>
       <products label="Product Writeups" href="index.html#products"></products>
@@ -75,6 +102,8 @@
   </integrate>
 
 
+
+
   <eclipse label="Eclipse Plug-ins" href="integrate/" tab="resources">
          <eclipse_old label="10 Core" href="derby_plugin.html"></eclipse_old>
          <eclipse_spec label="1.0 UI Functional Spec" href="func_spec_plugins.html"></eclipse_spec>
@@ -109,7 +138,7 @@
          </eclipse_help>
   </eclipse>
 
-  <papers label="Papers" href="papers/" tab="resources">
+  <papers label="Papers and Presentations" href="papers/" tab="resources">
      <index label="Overview" href="index.html"></index>
      <fortune href="fortune_tut.html"></fortune>
 

Modified: db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml?rev=1164672&r1=1164671&r2=1164672&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml Fri Sep  2 19:03:57 2011
@@ -35,5 +35,5 @@
   <tab id="download"  label="Download"      dir="" indexfile="derby_downloads.html"/>
   <tab id="community" label="Community"     dir="" indexfile="derby_comm.html"/>
   <tab id="docs"      label="Documentation" dir="manuals" indexfile="index.html"/>
-  <tab id="resources" label="Resources"     dir="integrate" indexfile="index.html"/>
+  <tab id="resources" label="Resources"     dir="blogs" indexfile="index.html"/>
 </tabs>