Modified: db/derby/site/trunk/build/site/skin/screen.css
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/skin/screen.css?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/skin/screen.css (original)
+++ db/derby/site/trunk/build/site/skin/screen.css Fri Aug 12 15:57:34 2005
@@ -1,5 +1,6 @@
 /*
-* Copyright 2002-2004 The Apache Software Foundation
+* Copyright 2002-2004 The Apache Software Foundation or its licensors,
+* as applicable.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -330,6 +331,21 @@
 #menu #credit {
     text-align: center;
 }
+#menu #credit2 {
+    text-align: center;
+    padding: 3px 3px 3px 3px;
+    background-color: #ffffff;
+}
+#menu .searchbox {
+    text-align: center;
+}
+#menu .searchbox form {
+    padding: 3px 3px;
+    margin: 0;
+}
+#menu .searchbox input {
+    font-size: 100%;
+}
 
 #content {
     padding: 20px 20px 20px 180px;
@@ -403,6 +419,20 @@
   padding: 0;
 }
 
+#motd-area {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    width: 35%;
+    background-color: #f0f0ff;
+    border-top: solid 1px #4C6C8F;
+    border-bottom: solid 1px #4C6C8F;
+    margin-bottom: 15px;
+    margin-left: 15px;
+    margin-right: 10%;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
+
 #minitoc-area {
     border-top: solid 1px #4C6C8F;
     border-bottom: solid 1px #4C6C8F;
@@ -416,6 +446,7 @@
     list-style-image: url('images/current.gif');
     font-weight: normal;
 }
+
 li p {
     margin: 0;
     padding: 0;
@@ -509,4 +540,11 @@
     display: block;
     height: 16px;
     width: 16px;
-}
\ No newline at end of file
+}
+
+p.instruction {
+  display: list-item;
+  list-style-image: url('../images/instruction_arrow.png');
+  list-style-position: outside;
+  margin-left: 2em;
+} 
\ No newline at end of file

Modified: db/derby/site/trunk/build/site/skin/skinconf.xsl
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/skin/skinconf.xsl?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/skin/skinconf.xsl (original)
+++ db/derby/site/trunk/build/site/skin/skinconf.xsl Fri Aug 12 15:57:34 2005
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

Modified: db/derby/site/trunk/build/tmp/brokenlinks.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/brokenlinks.xml?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/build/tmp/brokenlinks.xml (original)
+++ db/derby/site/trunk/build/tmp/brokenlinks.xml Fri Aug 12 15:57:34 2005
@@ -1,2 +1,36 @@
-<broken-links>
-</broken-links>
+<broken-links>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-src.zip" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-src.zip">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-src.tar.gz" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-src.tar.gz">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: DOTS_Derby.xml" uri="DOTS_Derby.html">
+    <referrer uri="integrate/index.html"/>
+    <referrer uri="papers/index.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-bin.zip" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-bin.zip">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-bin.tar.gz" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-bin.tar.gz">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/dist/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-lib.tar.gz.asc" uri="releases/[preferred]/dist/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-lib.tar.gz.asc">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/derby_ui_plugin_1.1.0.zip" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/derby_ui_plugin_1.1.0.zip">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/derby_core_plugin_10.1.1.zip" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/derby_core_plugin_10.1.1.zip">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[location]" uri="releases/[location]">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-lib.zip" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-lib.zip">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+  <link message="No pipeline matched request: releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-lib.tar.gz" uri="releases/[preferred]/db/derby/db-derby-10.1.1.0/db-derby-10.1.1.0-lib.tar.gz">
+    <referrer uri="releases/release-10.1.1.0.html"/>
+  </link>
+</broken-links>

Added: db/derby/site/trunk/build/tmp/build-info.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/build-info.xml?rev=232402&view=auto
==============================================================================
--- db/derby/site/trunk/build/tmp/build-info.xml (added)
+++ db/derby/site/trunk/build/tmp/build-info.xml Fri Aug 12 15:57:34 2005
@@ -0,0 +1,5 @@
+<info>
+  <project-skin>pelt</project-skin>
+  <forrest-version>0.7</forrest-version>
+</info>
+    
\ No newline at end of file

Added: db/derby/site/trunk/build/tmp/cocoon-work/cache-dir/cocoon-ehcache-1.data
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/cocoon-work/cache-dir/cocoon-ehcache-1.data?rev=232402&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/build/tmp/cocoon-work/cache-dir/cocoon-ehcache-1.data
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/derby/site/trunk/build/tmp/cocoon-work/cache-dir/cocoon-ehcache-1.index
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/cocoon-work/cache-dir/cocoon-ehcache-1.index?rev=232402&view=auto
==============================================================================
Binary file - no diff available.

Propchange: db/derby/site/trunk/build/tmp/cocoon-work/cache-dir/cocoon-ehcache-1.index
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: db/derby/site/trunk/build/tmp/input.xmap
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/input.xmap?rev=232402&view=auto
==============================================================================
--- db/derby/site/trunk/build/tmp/input.xmap (added)
+++ db/derby/site/trunk/build/tmp/input.xmap Fri Aug 12 15:57:34 2005
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+
+  <!-- ============================================================ -->
+  <!-- Plugin Sitemap                                               -->
+  <!--                                                              -->
+  <!-- This sitemap includes all enabled plugins in the generation  -->
+  <!-- process. It is mounted from the main Forrest sitemap after   -->
+  <!-- any project specific sitemap but before the default Forrest  -->
+  <!-- matchers. This enables plugins to override or extend default -->
+  <!-- Forrest behaviour whilst individual projects can override    -->
+  <!-- or extend the plugins behaviour.                             -->
+  <!-- ============================================================ -->
+  
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:pipelines>
+    <map:pipeline internal-only="false">
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>

Added: db/derby/site/trunk/build/tmp/internal.xmap
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/internal.xmap?rev=232402&view=auto
==============================================================================
--- db/derby/site/trunk/build/tmp/internal.xmap (added)
+++ db/derby/site/trunk/build/tmp/internal.xmap Fri Aug 12 15:57:34 2005
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+
+  <!-- ============================================================ -->
+  <!-- Plugin Sitemap                                               -->
+  <!--                                                              -->
+  <!-- This sitemap includes all enabled plugins in the generation  -->
+  <!-- process. It is mounted from the main Forrest sitemap after   -->
+  <!-- any project specific sitemap but before the default Forrest  -->
+  <!-- matchers. This enables plugins to override or extend default -->
+  <!-- Forrest behaviour whilst individual projects can override    -->
+  <!-- or extend the plugins behaviour.                             -->
+  <!-- ============================================================ -->
+  
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:pipelines>
+    <map:pipeline internal-only="false">
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>

Added: db/derby/site/trunk/build/tmp/output.xmap
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/output.xmap?rev=232402&view=auto
==============================================================================
--- db/derby/site/trunk/build/tmp/output.xmap (added)
+++ db/derby/site/trunk/build/tmp/output.xmap Fri Aug 12 15:57:34 2005
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+<!-- ============================================================ -->
+<!-- Plugin Sitemap                                               -->
+<!--                                                              -->
+<!-- This sitemap includes all enabled plugins in the generation  -->
+<!-- process. It is mounted from the main Forrest sitemap after   -->
+<!-- any project specific sitemap but before the default Forrest  -->
+<!-- matchers. This enables plugins to override or extend default -->
+<!-- Forrest behaviour whilst individual projects can override    -->
+<!-- or extend the plugins behaviour.                             -->
+<!-- ============================================================ -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:pipelines>
+    <map:pipeline>
+    <map:select type="exists">
+<map:when test="{forrest:plugins}/org.apache.forrest.plugin.output.pdf/output.xmap">
+<map:mount uri-prefix="" src="{forrest:plugins}/org.apache.forrest.plugin.output.pdf/output.xmap" check-reload="yes" pass-through="true"/>
+</map:when>
+</map:select>
+</map:pipeline>
+  </map:pipelines>
+</map:sitemap>

Added: db/derby/site/trunk/build/tmp/projfilters.properties
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/projfilters.properties?rev=232402&view=auto
==============================================================================
--- db/derby/site/trunk/build/tmp/projfilters.properties (added)
+++ db/derby/site/trunk/build/tmp/projfilters.properties Fri Aug 12 15:57:34 2005
@@ -0,0 +1,39 @@
+#Ant properties
+#Fri Aug 12 15:34:14 PDT 2005
+project.sitemap=src/documentation/sitemap.xmap
+project.war=C\:\\derby-site\\build\\my-project.war
+project.name=my-project
+project.brokenlinkfile=C\:\\derby-site\\build\\tmp\\brokenlinks.xml
+project.stylesheets-dir=src/documentation/resources/stylesheets
+project.webapp=C\:\\derby-site\\build\\webapp
+project.skinconf=src/documentation/skinconf.xml
+project.debuglevel=ERROR
+project.skin=pelt
+project.configfile=C\:\\forrest\\main\\webapp/WEB-INF/cli.xconf
+project.images-dir=src/documentation/resources/images
+project.conf-dir=src/documentation/conf
+project.temp-dir=C\:\\derby-site/build/tmp
+project.translations-dir=src/documentation/translations
+project.menu-scheme=tab_attributes
+project.lib-dir=src/documentation/lib
+project.build-dir=C\:\\derby-site/build
+project.classes-dir=src/documentation/classes
+project.resources-dir=src/documentation/resources
+project.grammars-dir=src/documentation/resources/grammars
+project.start-uri=linkmap.html
+project.sitemap-dir=src/documentation
+project.logger=debug
+project.cocoon-work-dir=C\:\\derby-site\\build\\tmp\\cocoon-work
+project.schema-dir=src/documentation/resources/schema
+project.status=status.xml
+project.xdocs-dir=src/documentation/content/xdocs
+project.required.plugins=org.apache.forrest.plugin.output.pdf
+project.bugtracking-url=http\://issues.apache.org/bugzilla/show_bug.cgi?id\=
+project.skins-dir=src/documentation/skins
+project.i18n=false
+project.catalog=src/documentation/resources/schema/catalog.xcat
+project.site-dir=C\:\\derby-site\\build\\site
+project.raw-content-dir=src/documentation/content
+project.content-dir=src/documentation
+project.logkitfile=C\:\\forrest\\main\\webapp/WEB-INF/logkit.xconf
+project.home=C\:\\derby-site

Added: db/derby/site/trunk/build/tmp/resources.xmap
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/tmp/resources.xmap?rev=232402&view=auto
==============================================================================
--- db/derby/site/trunk/build/tmp/resources.xmap (added)
+++ db/derby/site/trunk/build/tmp/resources.xmap Fri Aug 12 15:57:34 2005
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+
+  <!-- ============================================================ -->
+  <!-- Plugin Sitemap                                               -->
+  <!--                                                              -->
+  <!-- This sitemap includes all enabled plugins in the generation  -->
+  <!-- process. It is mounted from the main Forrest sitemap after   -->
+  <!-- any project specific sitemap but before the default Forrest  -->
+  <!-- matchers. This enables plugins to override or extend default -->
+  <!-- Forrest behaviour whilst individual projects can override    -->
+  <!-- or extend the plugins behaviour.                             -->
+  <!-- ============================================================ -->
+  
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:pipelines>
+    <map:pipeline internal-only="false">
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>

Modified: db/derby/site/trunk/forrest.properties
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/forrest.properties?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/forrest.properties (original)
+++ db/derby/site/trunk/forrest.properties Fri Aug 12 15:57:34 2005
@@ -1,4 +1,5 @@
-# Copyright 2002-2004 The Apache Software Foundation
+# Copyright 2002-2005 The Apache Software Foundation or its licensors,
+# as applicable.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,21 +15,23 @@
 
 ##############
 # Properties used by forrest.build.xml for building the website
-# These are the defaults, un-comment them if you need to change them.
+# These are the defaults, un-comment them only if you need to change them.
 ##############
 
 # Prints out a summary of Forrest settings for this project
-#forrest.echo=true 
+#forrest.echo=true
 
 # Project name (used to name .war file)
 #project.name=my-project
 
 # Specifies name of Forrest skin to use
-#project.skin=tigris
+# See list at http://forrest.apache.org/docs/skins.html
 #project.skin=pelt
 
+# Descriptors for plugins and skins
 # comma separated list, file:// is supported
 #forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
+#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
 
 ##############
 # behavioural properties
@@ -87,18 +90,40 @@
 
 # The URL to start crawling from
 #project.start-uri=linkmap.html
+
 # Set logging level for messages printed to the console
 # (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
 #project.debuglevel=ERROR
+
 # Max memory to allocate to Java
 #forrest.maxmemory=64m
+
 # Any other arguments to pass to the JVM. For example, to run on an X-less
 # server, set to -Djava.awt.headless=true
 #forrest.jvmargs=
+
 # The bugtracking URL - the issue number will be appended
 #project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 #project.bugtracking-url=http://issues.apache.org/jira/browse/
+
 # The issues list as rss
 #project.issues-rss-url=
-#I18n Property only works for the "forrest run" target.
+
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
 #project.i18n=true
+
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# You can request a specific version by appending "-VERSION" to the end of
+# the plugin name. If you exclude a version number the latest released version
+# will be used, however, be aware that this may be a development version. In
+# a production environment it is recomended that you specify a known working 
+# version.
+# Run "forrest available-plugins" for a list of plug-ins currently available
+project.required.plugins=org.apache.forrest.plugin.output.pdf
+
+# Proxy configuration
+# proxy.host=
+# proxy.port=

Propchange: db/derby/site/trunk/forrest.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml Fri Aug 12 15:57:34 2005
@@ -67,14 +67,6 @@
        (Apr 28, 2005 / SVN 165169)
        [<a href="binaries/derby_core_plugin_10.0.2.165169.zip">zip</a>]
    </li>
-   <li> Derby 10.0.2.1 (Nov 2, 2004 / SVN 56458)
-        [<a href="binaries/incubating-derby-snapshot-56458.zip">zip</a>,
-         <a href="binaries/incubating-derby-snapshot-56458.tar.gz">tar.gz</a>]
-   </li>
-   <li> Derby 10.0.2.0 (Sep 13, 2004 / SVN 46005)
-        [<a href="binaries/derby_snapshot_svnversion_46005.ZIP">zip</a>,
-         <a href="binaries/derby_snapshot_svnversion_46005.tar.gz">tar.gz</a>]
-   </li>
    </ul>
  </li>
 </ul>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/integrate/misc.xml Fri Aug 12 15:57:34 2005
@@ -97,7 +97,7 @@
    <td>
    DOTS is the Database Opensource Test Suite.
    <a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-dev/200409.mbox/%3c41494EBD.4080208@Yngvi.Org%3e">Sunitha Kambhampati</a> provided a writeup on
-   <a href="../DOTS_Derby.html"><em>Running DOTS with Derby</em></a>
+   <a href="../DOTS_Derby.htm"><em>Running DOTS with Derby</em></a>
 and
 <a href="http://mail-archives.eu.apache.org/mod_mbox/db-derby-dev/200503.mbox/%3c423752CB.50805@yngvi.org%3e">Ramandeep Kaur</a>
 provided a writeup on

Copied: db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyClientSpec.html (from r231126, db/derby/site/trunk/src/documentation/content/papers/DerbyClientSpec.html)
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyClientSpec.html?p2=db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyClientSpec.html&p1=db/derby/site/trunk/src/documentation/content/papers/DerbyClientSpec.html&r1=231126&r2=232402&rev=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/papers/DerbyClientSpec.html (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/DerbyClientSpec.html Fri Aug 12 15:57:34 2005
@@ -29,7 +29,7 @@
 
 <META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
 <BODY>
-<H2 align=center>Derby Network Client</H2>
+<H1 align=center>Derby Network Client</H1>
 <HR>
 
 <P>
@@ -38,7 +38,7 @@
 <HR>
 
 <P>
-<H3><A name=toc>Contents<A></H3>
+<H2><A name=toc>Contents<A></H2>
 
 <ul>
    <li><a href="#overview">Overview</a></li>
@@ -63,7 +63,7 @@
 </ul>
 <HR>
 
-<H3><A name=overview>Overview</A></H3>
+<H2><A name=overview>Overview</A></H2>
 <P>The Derby network client provides network connectivity to the Derby Network 
 Server. It is distributed as an additional jar file, derbyclient.jar, with an 
 entirely independent code base from the embedded driver. </P>
@@ -76,7 +76,7 @@
 
 <HR>
 
-<H3><A name=function>Functionality</A></H3>
+<H2><A name=function>Functionality</A></H2>
 </P>
 <P>All functionality for the Derby network client is packaged in the 
 derbyclient.jar file which will be added to the Derby distribution. The client 
@@ -95,7 +95,7 @@
 of using each characteristic mentioned here. </P>
 <HR>
 
-<H3><A name=jdbc>JDBC Driver and DataSource names</A></H3>
+<H2><A name=jdbc>JDBC Driver and DataSource names</A></H2>
 <P>The Derby network client classes and JDBC interfaces they implement are 
 listed below. </P>
 <TABLE>
@@ -135,7 +135,7 @@
 </SPAN></P>
 <HR>
 
-<H3><A name=ways_connect>Ways to Connect using the Derby Client Driver</A></H3>
+<H2><A name=ways_connect>Ways to Connect using the Derby Client Driver</A></H2>
 <H4>Client CLASSPATH</H4>
 <P>Prior to using the Derby network client, the derbyclient.jar file needs to be 
 added to the classpath on the client. On Windows, to add the derbyclient.jar 
@@ -189,7 +189,7 @@
 </PRE>
 <HR>
 
-<H3><A name=data_source_props>Data Source properties</A></H3>
+<H2><A name=data_source_props>Data Source properties</A></H2>
 <P>The following data source properties are available on the ClientDataSource, 
 ClientConnectionPoolDataSource and the ClientXADataSource classes. 
 <BLOCKQUOTE>
@@ -332,7 +332,7 @@
   communicate it to the server. </P></BLOCKQUOTE>
 <HR>
 
-<H3><A name=tracing>Tracing</A></H3>
+<H2><A name=tracing>Tracing</A></H2>
 <P>The Derby network client provides a tracing facility to collect JDBC trace 
 information and view protocol flows. Listed below are various ways to obtain 
 trace output. However, the easiest way to turn on tracing is to use the 
@@ -729,7 +729,7 @@
   flows, specify this value for traceLevel: <BR><code>~TRACE_PROTOCOL_FLOWS</code> </LI></UL>
 <HR>
 
-<H3><A name=security>Security</A></H3>
+<H2><A name=security>Security</A></H2>
 <P>Derby network client allows you to select a security mechanism by specifying 
 a value for the securityMechanism property. You can set this property in one of 
 the following ways: </P>
@@ -773,7 +773,7 @@
 </BLOCKQUOTE>
 <HR>
 
-<H3><A name=packaging>Packaging, Distribution and Versioning</A></H3>
+<H2><A name=packaging>Packaging, Distribution and Versioning</A></H2>
 <P>The Derby network client will assume the version of the Derby release in 
 which it is offered (currently thought to be 10.1). </P>
 <P>A new jar file, derbyclient.jar, needs to be added to the distribution, which 
@@ -782,8 +782,8 @@
 files and scripts will need to be changed to use the Derby network client. </P>
 <HR>
 
-<H3><A name=compareEmbed>Comparision and/or differences with the Derby Embedded 
-Driver</A></H3>
+<H2><A name=compareEmbed>Comparision and/or differences with the Derby Embedded 
+Driver</A></H2>
 <P>The following known differences exist between the embedded driver and the 
 network client driver. Many of these are already documented as Network Server 
 differences at <A 
@@ -808,7 +808,7 @@
   Cryptography Extension) 1.2.1 or later. (DERBY-65) </LI></UL>
 <HR>
 
-<H3><A name=effects>Effects to existing documentation</A></H3>
+<H2><A name=effects>Effects to existing documentation</A></H2>
 <P>The following Derby Manuals should be updated to include the new client 
 driver. The Server Guide, Tools and Getting Started guides at least will be 
 affected. Currently they document using the network server with the IBM DB2 
@@ -880,7 +880,7 @@
   as described above. </P></BLOCKQUOTE>
 <HR>
 
-<H3><A name=misc>Miscellaneous</A></H3>
+<H2><A name=misc>Miscellaneous</A></H2>
 <H4>Tools</H4>
 <P>ij will recognize the new URL and load the driver automatically. dblook will 
 accept the client URL. sysinfo has been changed to locate the new jar file. </P>

Copied: db/derby/site/trunk/src/documentation/content/xdocs/papers/Intersect-design.html (from r231126, db/derby/site/trunk/src/documentation/content/papers/Intersect-design.html)
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/Intersect-design.html?p2=db/derby/site/trunk/src/documentation/content/xdocs/papers/Intersect-design.html&p1=db/derby/site/trunk/src/documentation/content/papers/Intersect-design.html&r1=231126&r2=232402&rev=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/papers/Intersect-design.html (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/Intersect-design.html Fri Aug 12 15:57:34 2005
@@ -2,12 +2,15 @@
 <HTML>
 <HEAD><TITLE>Intersect & Except Design</TITLE></HEAD>
 <META content="text/html; charset=iso-8859-1" http-equiv=Content-Type>
-<CENTER>
-<H1>Intersect & Except Design</H1>
+
+Intersect & Except Design
+Jack Klebanoff<br>
+Feb. 22 2005<br>
+
+<H1>Introduction</H1>
+<p>Intersect & Except Design<br>
 Jack Klebanoff<br>
 Feb. 22 2005<br>
-</CENTER>
-<H2>Introduction</H2>
 <p>
 This paper describes the implementation of the INTERSECT and EXCEPT operators. This paper assumes
 basic familiarity with SQL and the language (compiler) portion of Derby.
@@ -31,7 +34,7 @@
 <li>extensions to QueryTreeNode, which handle <a href="#Compilation">binding, optimization, and code generation</a>, and
 <li><a href="#Parser">the parser</a>.
 </ol>
-<H2><a name="Execution">Execution</a></H2>
+<H1><a name="Execution">Execution</a></H1>
 The INTERSECT and EXCEPT operations are executed in a similar fashion, by class SetOpResultSet. The two inputs are sorted
 separately. The sort key consists of all the columns. Then SetOpResultSet scans the two inputs
 simultaneously. The INTERSECT operation outputs approximately any row from its left input that is
@@ -43,7 +46,7 @@
 If the left and right inputs have N and M rows respectively the sorts take time O(N*log(N) +
 M*log(M)). The final scan takes time O(N + M). So the time for the whole operation is O(N*log(N) +
 M*log(M)).
-<H3>Alternative Execution Plans</H3>
+<H2>Alternative Execution Plans</H2>
 <p>
 Other implementations are possible.
 <ol>
@@ -72,7 +75,7 @@
 We could
 have provided several implementations and let the optimizer choose the best, but this does not seem
 worthwhile for operations that are seldom used.
-<H2><a name="Compilation">Binding, Optimization, and Code Generation</a></H2>
+<H1><a name="Compilation">Binding, Optimization, and Code Generation</a></H1>
 The IntersectOrExceptNode class handles compilation of both INTERSECT and EXCEPT operations, because
 they are implemented similarly. We do very little in the way of optimization because we have only
 implemented one execution plan; the optimizer has nothing to choose from.
@@ -97,7 +100,7 @@
 the optimization process.
 <p>
 Code generation is straighforward. It generates code that invokes the ResultSetFactory.getSetOpResultSet method.
-<H2><a name="Parser">Parser</a></H2>
+<H1><a name="Parser">Parser</a></H1>
 The parser, in java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj, implements the EXCEPT,
 INTERSECT, and UNION operators in the queryExpression method.
 <p>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml Fri Aug 12 15:57:34 2005
@@ -25,6 +25,16 @@
 <title>Web Site Change Notes</title>
 
 <section>
+<title>12-Aug-2005: Web site upgraded to Forrest 0.7</title>
+<p>The web site was recently upgraded to build with the latest
+release of Forrest, Forrest 0.7.</p>
+
+<p>If you receive OutOfMemoryErrors while trying to build the
+site, try increasing the amount of memory available to forrest
+by setting the ANT_OPTS environment variable to -mx512M.</p>
+</section>
+
+<section>
 <title>31-Jul-2005: Web site moved from Incubator to Apache DB</title>
 <p>
 Derby graduated from the Incubator to the Apache DB project,
@@ -291,14 +301,14 @@
    </td>
 </tr>
 <tr>
-   <td> <code>src/documentation/content/papers</code></td>
+   <td> <code>src/documentation/content/xdocs/papers</code></td>
    <td> Source HTML files you don't want Forrest to touch.</td>
    <td> Forrest copies these files without modifying them to 
          build/site/papers.
    </td>
 </tr>
 <tr>
-    <td> <code>src/documentation/content/binaries</code></td>
+    <td> <code>src/documentation/content/xdocs/binaries</code></td>
     <td> Binary files, such as *.tar.gz and *.ZIP. </td>
     <td> Forrest copies these files without modifying them to 
          build/site/binaries.

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=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Fri Aug 12 15:57:34 2005
@@ -69,7 +69,7 @@
       <misc      label="Summary"      href="misc.html"/>
       <cjdbc-pdf label="C-JDBC (PDF)" href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf"/>
       <cjdbc-oo  label="C-JDBC (SXW)" href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw"/>
-      <dots      label="DOTS Derby"   href="../DOTS_Derby.html"/>
+      <dots      label="DOTS Derby"   href="../DOTS_Derby.htm"/>
       <dots      label="DOTS System"  href="../binaries/UsingDotsDerbySystemTest.pdf"/>
       <emma      label="EMMA"         href="../binaries/DerbyCodeCoverageUsingEmma.pdf"/>
       <jpetstore label="iBATIS JPetStore" href="JPetStoreDerby.html" />

Modified: db/derby/site/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/skinconf.xml?rev=232402&r1=232401&r2=232402&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/skinconf.xml (original)
+++ db/derby/site/trunk/src/documentation/skinconf.xml Fri Aug 12 15:57:34 2005
@@ -1,352 +1,439 @@
-<?xml version="1.0"?>
-<!--
-  Copyright 2002-2004 The Apache Software Foundation
-
-  Licensed 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.
--->
-
-<!--
-Skin configuration file. This file contains details of your project,
-which will be used to configure the chosen Forrest skin.
--->
-
-<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.6-3//EN" "http://forrest.apache.org/dtd/skinconfig-v06-3.dtd">
-<skinconfig>
-  <!-- To enable lucene search add provider="lucene" (default is google).
-    Add box-location="alt" to move the search box to an alternate location
-    (if the skin supports it) and box-location="all" to show it in all
-    available locations on the page.  Remove the <search> element to show
-    no search box. @domain will enable sitesearch for the specific domain with google.
-    In other words google will search the @domain for the query string.
-  -->
-  <search name="Derby" domain="apache.org" provider="google"/>
-
-  <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
-  <disable-print-link>true</disable-print-link>  
-  <!-- Disable the PDF link? -->
-  <disable-pdf-link>true</disable-pdf-link>
-  <!-- Disable the POD link? -->
-  <disable-pod-link>true</disable-pod-link>
-  <!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. -->
-  <disable-txt-link>true</disable-txt-link>
-  <!-- Disable the xml source link? -->
-  <!-- The xml source link makes it possible to access the xml rendition
-    of the source frim the html page, and to have it generated statically.
-    This can be used to enable other sites and services to reuse the
-    xml format for their uses. Keep this disabled if you don't want other
-    sites to easily reuse your pages.-->
-  <disable-xml-link>true</disable-xml-link>
-
-  <!-- Disable navigation icons on all external links? -->
-  <disable-external-link-image>false</disable-external-link-image>
-
-  <!-- Disable w3c compliance links? 
-    Use e.g. align="center" to move the compliance links logos to 
-    an alternate location default is left.
-    (if the skin supports it) -->
-  <disable-compliance-links>false</disable-compliance-links>
-
-  <!-- Render mailto: links unrecognisable by spam harvesters? -->
-  <obfuscate-mail-links>false</obfuscate-mail-links>
-  <obfuscate-mail-value>.at.</obfuscate-mail-value>
-
-  <!-- Disable the javascript facility to change the font size -->
-  <disable-font-script>false</disable-font-script>
-
-  <!-- mandatory project logo
-       default skin: renders it at the top -->
-  <project-name>Derby</project-name>
-  <project-description>Derby is a zero admin java RDBMS.</project-description>
-  <project-url>http://db.apache.org/derby/</project-url>
-  <project-logo>images/derby-logo.jpg</project-logo>
-
-  <!-- optional group logo
-       default skin: renders it at the top-left corner -->
-  <group-name></group-name>
-  <group-description></group-description>
-  <group-url>http://db.apache.org</group-url>
-  <group-logo>images/db-logo-white.png</group-logo>
-  <!-- Alternative static image:
-  <group-logo>images/group-logo.gif</group-logo> -->
-
-  <!-- optional host logo (e.g. sourceforge logo)
-       default skin: renders it at the bottom-left corner -->
-  <host-url></host-url>
-  <host-logo></host-logo>
-
-  <!-- relative url of a favicon file, normally favicon.ico -->
-  <favicon-url></favicon-url>
-
-  <!-- The following are used to construct a copyright statement -->
-  <year>2004-2005</year>
-  <vendor>Apache Software Foundation</vendor>
-  <!-- The optional copyright-link URL will be used as a link in the
-    copyright statement
-  <copyright-link>http://www.apache.org/licenses/</copyright-link>
-  -->
-
-  <!-- Some skins use this to form a 'breadcrumb trail' of links.
-    Use location="alt" to move the trail to an alternate location
-    (if the skin supports it).
-	  Omit the location attribute to display the trail in the default location.
-	  Use location="none" to not display the trail (if the skin supports it).
-    For some skins just set the attributes to blank.
-  -->
-  <trail>
-    <link1 name="apache" href="http://www.apache.org/"/>
-    <link2 name="db" href="http://db.apache.org/"/>
-    <link3 name="" href=""/>
-  </trail>
-
-  <!-- Configure the TOC, i.e. the Table of Contents.
-  @max-depth
-   how many "section" levels need to be included in the
-   generated Table of Contents (TOC). 
-  @min-sections
-   Minimum required to create a TOC.
-  @location ("page","menu","page,menu", "none")
-   Where to show the TOC.
-  -->
-  <toc max-depth="2" min-sections="1" location="page"/>
-
-  <!-- Heading types can be clean|underlined|boxed  -->
-  <headings type="boxed"/>
-  
-  <!-- The optional feedback element will be used to construct a
-    feedback link in the footer with the page pathname appended:
-    <a href="@href">{@to}</a>
-    -->
-  <feedback to="derby-dev@db.apache.org"
-    href="mailto:derby-dev@db.apache.org?subject=Feedback&#160;" >
-    Send feedback about the website to:
-  </feedback>
-  <!--
-    extra-css - here you can define custom css-elements that are 
-    a. overriding the fallback elements or 
-    b. adding the css definition from new elements that you may have 
-       used in your documentation.
-    -->
-  <extra-css>
-    <!--Example of b. 
-        To define the css definition of a new element that you may have used
-        in the class attribute of a <p> node. 
-        e.g. <p class="quote"/>
-    -->
-    p.quote {
-      margin-left: 2em;
-      padding: .5em;
-      background-color: #f0f0f0;
-      font-family: monospace;
-    }
-  </extra-css>
-
-  <colors>
-  <!-- These values are used for the generated CSS files. -->
-
-  <!-- Krysalis -->
-<!--
-    <color name="header"    value="#FFFFFF"/>
-
-    <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="tab-unselected" value="#F7F7F7"  link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-selected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-unselected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
-
-    <color name="heading" value="#a5b6c6"/>
-    <color name="subheading" value="#CFDCED"/>
-        
-    <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="toolbox" value="#a5b6c6"/>
-    <color name="border" value="#a5b6c6"/>
-        
-    <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/>    
-    <color name="dialog" value="#F7F7F7"/>
-            
-    <color name="body"    value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
-    
-    <color name="table" value="#a5b6c6"/>    
-    <color name="table-cell" value="#ffffff"/>    
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#a5b6c6"/>
-        
-    <color name="footer" value="#a5b6c6"/>
--->
-  
-  <!-- Forrest -->
-<!--
-    <color name="header"    value="#294563"/>
-
-    <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-
-    <color name="heading" value="#294563"/>
-    <color name="subheading" value="#4a6d8c"/>
-        
-    <color name="navstrip" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="toolbox" value="#4a6d8c"/>
-    <color name="border" value="#294563"/>
-    
-    <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>    
-    <color name="dialog" value="#4a6d8c"/>
-            
-    <color name="body" value="#ffffff"  link="#0F3660" vlink="#009999" hlink="#000066"/>
-    
-    <color name="table" value="#7099C5"/>    
-    <color name="table-cell" value="#f0f0ff"/>    
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#CFDCED"/>
-        
-    <color name="footer" value="#cedfef"/>
--->
-
-  <!-- Collabnet --> 
-<!--
-    <color name="header"    value="#003366"/>
-
-    <color name="tab-selected" value="#dddddd" link="#555555" vlink="#555555" hlink="#555555"/>
-    <color name="tab-unselected" value="#999999" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-    <color name="subtab-selected" value="#cccccc" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-unselected" value="#cccccc" link="#555555" vlink="#555555" hlink="#555555"/>
-
-    <color name="heading" value="#003366"/>
-    <color name="subheading" value="#888888"/>
-    
-    <color name="navstrip" value="#dddddd" font="#555555"/>
-    <color name="toolbox" value="#dddddd" font="#555555"/>
-    <color name="border" value="#999999"/>
-    
-    <color name="menu" value="#ffffff"/>    
-    <color name="dialog" value="#eeeeee"/>
-            
-    <color name="body"      value="#ffffff"/>
-    
-    <color name="table" value="#ccc"/>    
-    <color name="table-cell" value="#ffffff"/>   
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#003366"/>
-        
-    <color name="footer" value="#ffffff"/>
--->
- <!-- Lenya using pelt-->
-<!--
-    <color name="header" value="#ffffff"/>
-
-    <color name="tab-selected" value="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-    <color name="tab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
-
-    <color name="heading" value="#E5E4D9"/>
-    <color name="subheading" value="#000000"/>
-    <color name="published" value="#4C6C8F" font="#FFFFFF"/>
-    <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
-    <color name="navstrip" value="#E5E4D9" font="#000000"/>
-
-    <color name="toolbox" value="#CFDCED" font="#000000"/>
-
-    <color name="border" value="#999999"/>
-    <color name="menu" value="#4C6C8F" font="#ffffff" link="#ffffff" vlink="#ffffff" hlink="#ffffff" current="#FFCC33" />    
-    <color name="menuheading" value="#cfdced" font="#000000" />
-    <color name="searchbox" value="#E5E4D9" font="#000000"/>
-    
-    <color name="dialog" value="#CFDCED"/>
-    <color name="body" value="#ffffff" />            
-    
-    <color name="table" value="#ccc"/>    
-    <color name="table-cell" value="#ffffff"/>   
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#003366"/>
-        
-    <color name="footer" value="#E5E4D9"/>
--->
-  </colors>
- 
-  <!-- Settings specific to PDF output. -->
-  <pdf>
-    <!-- 
-       Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
-       folio, legal, ledger, letter, quarto, tabloid (default letter).
-       Supported page orientations are portrait, landscape (default
-       portrait).
-       Supported text alignments are left, right, justify (default left).
-    -->
-    <page size="letter" orientation="portrait" text-align="left"/>
-
-    <!--
-       Margins can be specified for top, bottom, inner, and outer
-       edges. If double-sided="false", the inner edge is always left
-       and the outer is always right. If double-sided="true", the
-       inner edge will be left on odd pages, right on even pages,
-       the outer edge vice versa.
-       Specified below are the default settings.
-    -->
-    <margins double-sided="false">
-      <top>1in</top>
-      <bottom>1in</bottom>
-      <inner>1.25in</inner>
-      <outer>1in</outer>
-    </margins>
-
-    <!--
-      Print the URL text next to all links going outside the file
-    -->
-    <show-external-urls>false</show-external-urls>
-
-    <!--
-      Disable the copyright footer on each page of the PDF.
-      A footer is composed for each page. By default, a "credit" with role=pdf
-      will be used, as explained below. Otherwise a copyright statement
-      will be generated. This latter can be disabled.
-    -->
-    <disable-copyright-footer>false</disable-copyright-footer>
-  </pdf>
-
-  <!-- Credits are typically rendered as a set of small clickable
-    images in the page footer.
-    Use box-location="alt" to move the credit to an alternate location
-    (if the skin supports it). 
-  -->
-  <credits>
-    <credit>
-      <name>Built with Apache Forrest</name>
-      <url>http://forrest.apache.org/</url>
-      <image>images/built-with-forrest-button.png</image>
-      <width>88</width>
-      <height>31</height>
-    </credit>
-    <!-- A credit with @role="pdf" will be used to compose a footer
-     for each page in the PDF, using either "name" or "url" or both.
-    -->
-    <!--
-    <credit role="pdf">
-      <name>Built with Apache Forrest</name>
-      <url>http://forrest.apache.org/</url>
-    </credit>
-    -->
-  </credits>
-
-</skinconfig>
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed 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.
+-->
+
+<!--
+Skin configuration file. This file contains details of your project,
+which will be used to configure the chosen Forrest skin.
+-->
+
+<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd">
+<skinconfig>
+  <!-- To enable lucene search add provider="lucene" (default is google).
+    Add box-location="alt" to move the search box to an alternate location
+    (if the skin supports it) and box-location="all" to show it in all
+    available locations on the page.  Remove the <search> element to show
+    no search box. @domain will enable sitesearch for the specific domain with google.
+    In other words google will search the @domain for the query string.
+  -->
+  <search name="Derby" domain="apache.org" provider="google"/>
+
+  <!-- Disable the print link? If enabled, invalid HTML 4.0.1 -->
+  <disable-print-link>true</disable-print-link>  
+  <!-- Disable the PDF link? -->
+  <disable-pdf-link>true</disable-pdf-link>
+  <!-- Disable the POD link? -->
+  <disable-pod-link>true</disable-pod-link>
+  <!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. -->
+  <disable-txt-link>true</disable-txt-link>
+  <!-- Disable the xml source link? -->
+  <!-- The xml source link makes it possible to access the xml rendition
+    of the source frim the html page, and to have it generated statically.
+    This can be used to enable other sites and services to reuse the
+    xml format for their uses. Keep this disabled if you don't want other
+    sites to easily reuse your pages.-->
+  <disable-xml-link>true</disable-xml-link>
+
+  <!-- Disable navigation icons on all external links? -->
+  <disable-external-link-image>false</disable-external-link-image>
+
+  <!-- Disable w3c compliance links? 
+    Use e.g. align="center" to move the compliance links logos to 
+    an alternate location default is left.
+    (if the skin supports it) -->
+  <disable-compliance-links>false</disable-compliance-links>
+
+  <!-- Render mailto: links unrecognisable by spam harvesters? -->
+  <obfuscate-mail-links>false</obfuscate-mail-links>
+  <obfuscate-mail-value>.at.</obfuscate-mail-value>
+
+  <!-- Disable the javascript facility to change the font size -->
+  <disable-font-script>false</disable-font-script>
+
+  <!-- mandatory project logo
+       default skin: renders it at the top -->
+  <project-name>Derby</project-name>
+  <project-description>Derby is a zero admin Java RDBMS.</project-description>
+  <project-url>http://db.apache.org/derby/</project-url>
+  <project-logo>images/derby-logo.jpg</project-logo>
+
+  <!-- optional group logo
+       default skin: renders it at the top-left corner -->
+  <group-name></group-name>
+  <group-description></group-description>
+  <group-url>http://db.apache.org</group-url>
+  <group-logo>images/db-logo-white.png</group-logo>
+  <!-- Alternative static image:
+  <group-logo>images/group-logo.gif</group-logo> -->
+
+  <!-- optional host logo (e.g. sourceforge logo)
+       default skin: renders it at the bottom-left corner -->
+  <host-url></host-url>
+  <host-logo></host-logo>
+
+  <!-- relative url of a favicon file, normally favicon.ico -->
+  <favicon-url></favicon-url>
+
+  <!-- The following are used to construct a copyright statement -->
+  <year>2004-2005</year>
+  <vendor>Apache Software Foundation</vendor>
+  <!-- The optional copyright-link URL will be used as a link in the
+    copyright statement
+  <copyright-link>http://www.apache.org/licenses/</copyright-link>
+  -->
+
+  <!-- Some skins use this to form a 'breadcrumb trail' of links.
+    Use location="alt" to move the trail to an alternate location
+    (if the skin supports it).
+    Omit the location attribute to display the trail in the default location.
+    Use location="none" to not display the trail (if the skin supports it).
+    For some skins just set the attributes to blank.
+    
+    NOTE: If a breadcrumb entry points at a local file the href must
+    be complete, that is it must point to the file itself, not to a 
+    directory.
+  -->
+  <trail>
+    <link1 name="apache" href="http://www.apache.org/"/>
+    <link2 name="db" href="http://db.apache.org/"/>
+    <link3 name="" href=""/>
+  </trail>
+
+  <!-- Configure the TOC, i.e. the Table of Contents.
+  @max-depth
+   how many "section" levels need to be included in the
+   generated Table of Contents (TOC). 
+  @min-sections
+   Minimum required to create a TOC.
+  @location ("page","menu","page,menu", "none")
+   Where to show the TOC.
+  -->
+  <toc max-depth="2" min-sections="1" location="page"/>
+
+  <!-- Heading types can be clean|underlined|boxed  -->
+  <headings type="boxed"/>
+  
+  <!-- The optional feedback element will be used to construct a
+    feedback link in the footer with the page pathname appended:
+    <a href="@href">{@to}</a>
+    -->
+  <feedback to="derby-dev@db.apache.org"
+    href="mailto:derby-dev@db.apache.org?subject=Feedback&#160;" >
+    Send feedback about the website to:
+  </feedback>
+
+  <!-- Optional message of the day (MOTD).
+    Note: This is only implemented in the pelt skin.
+    If the optional <motd> element is used, then messages will be appended
+    depending on the URI string pattern.
+    motd-option : Specifies a pattern to match and provides small text content.
+    motd-title : This text will be added in brackets after the <html><title>
+    motd-page : This text will be added in a panel on the face of the page,
+    with the "motd-page-url" being the hyperlink "More".
+    Values for the "location" attribute are:
+      page : on the face of the page, e.g. in the spare space of the toc
+      alt : at the bottom of the left-hand navigation panel
+      both : both
+    -->
+<!--
+  <motd>
+    <motd-option pattern="docs_0_80">
+      <motd-title>v0.8-dev</motd-title>
+      <motd-page location="both">
+        This is documentation for development version v0.8
+      </motd-page>
+      <motd-page-url>/versions/index.html</motd-page-url>
+    </motd-option>
+    <motd-option pattern="docs_0_70">
+      <motd-title>v0.7</motd-title>
+      <motd-page location="both">
+        This is documentation for current version v0.7
+      </motd-page>
+      <motd-page-url>/versions/index.html</motd-page-url>
+    </motd-option>
+  </motd>
+-->
+
+  <!--
+    extra-css - here you can define custom css-elements that are 
+    A) overriding the fallback elements or 
+    B) adding the css definition from new elements that you may have 
+       used in your documentation.
+    -->
+  <extra-css>
+    <!--Example of reason B:
+        To define the css definition of a new element that you may have used
+        in the class attribute of a <p> node. 
+        e.g. <p class="quote"/>
+    -->
+    p.quote {
+      margin-left: 2em;
+      padding: .5em;
+      background-color: #f0f0f0;
+      font-family: monospace;
+    }
+    <!--Example:
+        To override the colours of links only in the footer.
+    -->
+    #footer a { color: #0F3660; }
+    #footer a:visited { color: #009999; }
+  </extra-css>
+
+  <colors>
+  <!-- These values are used for the generated CSS files.
+    They essentially "override" the default colors defined in the chosen skin.
+    There are four duplicate "groups" of colors below, denoted by comments:
+      Color group: Forrest, Krysalis, Collabnet, and Lenya using Pelt.
+    They are provided for example only. To customize the colors of any skin,
+    uncomment one of these groups of color elements and change the values
+    of the particular color elements that you wish to change.
+    Note that by default, all color groups are commented-out which means that
+    the default colors provided by the skin are being used.
+  -->
+
+  <!-- Color group: Forrest: example colors similar to forrest.apache.org
+    Some of the element names are obscure, so comments are added to show how
+    the "pelt" skin uses them, other skins might use these elements in a different way.
+    Tip: temporarily change the value of an element to red (#ff0000) and see the effect.
+     pelt: breadtrail: the strip at the top of the page and the second strip under the tabs
+     pelt: header: top strip containing project and group logos
+     pelt: heading|subheading: section headings within the content
+     pelt: navstrip: the strip under the tabs which contains the published date
+     pelt: menu: the left-hand navigation panel
+     pelt: toolbox: the selected menu item
+     pelt: searchbox: the background of the searchbox
+     pelt: border: line border around selected menu item
+     pelt: body: any remaining parts, e.g. the bottom of the page
+     pelt: footer: the second from bottom strip containing credit logos and published date
+     pelt: feedback: the optional bottom strip containing feedback link
+  -->
+<!--
+    <color name="breadtrail" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="header" value="#294563"/>
+    <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="heading" value="#294563"/>
+    <color name="subheading" value="#4a6d8c"/>
+    <color name="published" value="#4C6C8F" font="#FFFFFF"/>
+    <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+    <color name="navstrip" value="#4a6d8c" font="#ffffff" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>    
+    <color name="toolbox" value="#4a6d8c"/>
+    <color name="border" value="#294563"/>
+    <color name="dialog" value="#4a6d8c"/>
+    <color name="searchbox" value="#4a6d8c" font="#000000"/>
+    <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+    <color name="table" value="#7099C5"/>    
+    <color name="table-cell" value="#f0f0ff"/>    
+    <color name="highlight" value="#ffff00"/>
+    <color name="fixme" value="#cc6600"/>
+    <color name="note" value="#006699"/>
+    <color name="warning" value="#990000"/>
+    <color name="code" value="#CFDCED"/>
+    <color name="footer" value="#cedfef"/>
+-->
+
+  <!-- Color group: Krysalis -->
+<!--
+    <color name="header"    value="#FFFFFF"/>
+
+    <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="tab-unselected" value="#F7F7F7"  link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="subtab-selected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="subtab-unselected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
+
+    <color name="heading" value="#a5b6c6"/>
+    <color name="subheading" value="#CFDCED"/>
+        
+    <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="toolbox" value="#a5b6c6"/>
+    <color name="border" value="#a5b6c6"/>
+        
+    <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/>    
+    <color name="dialog" value="#F7F7F7"/>
+            
+    <color name="body"    value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+    
+    <color name="table" value="#a5b6c6"/>    
+    <color name="table-cell" value="#ffffff"/>    
+    <color name="highlight" value="#ffff00"/>
+    <color name="fixme" value="#cc6600"/>
+    <color name="note" value="#006699"/>
+    <color name="warning" value="#990000"/>
+    <color name="code" value="#a5b6c6"/>
+        
+    <color name="footer" value="#a5b6c6"/>
+-->
+
+  <!-- Color group: Collabnet --> 
+<!--
+    <color name="header"    value="#003366"/>
+
+    <color name="tab-selected" value="#dddddd" link="#555555" vlink="#555555" hlink="#555555"/>
+    <color name="tab-unselected" value="#999999" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
+    <color name="subtab-selected" value="#cccccc" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="subtab-unselected" value="#cccccc" link="#555555" vlink="#555555" hlink="#555555"/>
+
+    <color name="heading" value="#003366"/>
+    <color name="subheading" value="#888888"/>
+    
+    <color name="navstrip" value="#dddddd" font="#555555"/>
+    <color name="toolbox" value="#dddddd" font="#555555"/>
+    <color name="border" value="#999999"/>
+    
+    <color name="menu" value="#ffffff"/>    
+    <color name="dialog" value="#eeeeee"/>
+            
+    <color name="body"      value="#ffffff"/>
+    
+    <color name="table" value="#ccc"/>    
+    <color name="table-cell" value="#ffffff"/>   
+    <color name="highlight" value="#ffff00"/>
+    <color name="fixme" value="#cc6600"/>
+    <color name="note" value="#006699"/>
+    <color name="warning" value="#990000"/>
+    <color name="code" value="#003366"/>
+        
+    <color name="footer" value="#ffffff"/>
+-->
+ <!-- Color group: Lenya using pelt-->
+<!--
+
+    <color name="header" value="#ffffff"/>
+
+    <color name="tab-selected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="tab-unselected" value="#F5F4E9" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+
+    <color name="heading" value="#E5E4D9"/>
+    <color name="subheading" value="#000000"/>
+    <color name="published" value="#000000"/>
+    <color name="navstrip" value="#E5E4D9" font="#000000"/>
+    <color name="toolbox" value="#CFDCED" font="#000000"/>
+    <color name="border" value="#999999"/>
+
+    <color name="menu" value="#E5E4D9" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="dialog" value="#CFDCED"/>
+    <color name="body" value="#ffffff" />
+
+    <color name="table" value="#ccc"/>
+    <color name="table-cell" value="#ffffff"/>
+    <color name="highlight" value="#ffff00"/>
+    <color name="fixme" value="#cc6600"/>
+    <color name="note" value="#006699"/>
+    <color name="warning" value="#990000"/>
+    <color name="code" value="#003366"/>
+
+    <color name="footer" value="#E5E4D9"/>
+-->
+  </colors>
+ 
+  <!-- Settings specific to PDF output. -->
+  <pdf>
+    <!-- 
+       Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
+       folio, legal, ledger, letter, quarto, tabloid (default letter).
+       Supported page orientations are portrait, landscape (default
+       portrait).
+       Supported text alignments are left, right, justify (default left).
+    -->
+    <page size="letter" orientation="portrait" text-align="left"/>
+
+    <!-- 
+       Pattern of the page numbering in the footer - Default is "Page x".
+       first occurrence of '1' digit represents the current page number,
+       second occurrence of '1' digit represents the total page number,
+       anything else is considered as the static part of the numbering pattern.
+       Examples : x is the current page number, y the total page number.
+       <page-numbering-format>none</page-numbering-format> Do not displays the page numbering
+       <page-numbering-format>1</page-numbering-format> Displays "x"
+       <page-numbering-format>p1.</page-numbering-format> Displays "px."
+       <page-numbering-format>Page 1/1</page-numbering-format> Displays "Page x/y"
+       <page-numbering-format>(1-1)</page-numbering-format> Displays "(x-y)"
+    -->
+    <page-numbering-format>Page 1</page-numbering-format>
+
+    <!--
+       Margins can be specified for top, bottom, inner, and outer
+       edges. If double-sided="false", the inner edge is always left
+       and the outer is always right. If double-sided="true", the
+       inner edge will be left on odd pages, right on even pages,
+       the outer edge vice versa.
+       Specified below are the default settings.
+    -->
+    <margins double-sided="false">
+      <top>1in</top>
+      <bottom>1in</bottom>
+      <inner>1.25in</inner>
+      <outer>1in</outer>
+    </margins>
+
+    <!--
+      Print the URL text next to all links going outside the file
+    -->
+    <show-external-urls>false</show-external-urls>
+
+    <!--
+      Disable the copyright footer on each page of the PDF.
+      A footer is composed for each page. By default, a "credit" with role=pdf
+      will be used, as explained below. Otherwise a copyright statement
+      will be generated. This latter can be disabled.
+    -->
+    <disable-copyright-footer>false</disable-copyright-footer>
+  </pdf>
+
+  <!-- 
+    Credits are typically rendered as a set of small clickable
+    images in the page footer.
+    
+    Use box-location="alt" to move the credits to an alternate location
+    (if the skin supports it).
+
+    For example, pelt skin:
+    - box-location="alt" will place the logo at the end of the
+      left-hand coloured menu panel.
+    - box-location="alt2" will place them underneath that panel
+      in the left-hand whitespace.
+    - Otherwise they are placed next to the compatibility icons
+      at the bottom of the screen.
+
+    Comment out the whole <credit>-element if you want no credits in the
+    web pages  
+   -->
+  <credits>
+    <credit box-location="alt">
+      <name>Built with Apache Forrest</name>
+      <url>http://forrest.apache.org/</url>
+      <image>images/built-with-forrest-button.png</image>
+      <width>88</width>
+      <height>31</height>
+    </credit>
+    <!-- A credit with @role="pdf" will be used to compose a footer
+     for each page in the PDF, using either "name" or "url" or both.
+    -->
+    <!--
+    <credit role="pdf">
+      <name>Built with Apache Forrest</name>
+      <url>http://forrest.apache.org/</url>
+    </credit>
+    -->
+  </credits>
+
+</skinconfig>