db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: rev 57585 - in incubator/derby/site/trunk: build/site build/site/manuals build/site/manuals/getstart src/documentation/content/xdocs src/documentation/content/xdocs/manuals src/documentation/content/xdocs/manuals/getstart
Date Sat, 13 Nov 2004 19:28:47 GMT
Author: jta
Date: Sat Nov 13 11:28:46 2004
New Revision: 57585

Added:
   incubator/derby/site/trunk/build/site/manuals/COPYRIGHT.html
   incubator/derby/site/trunk/build/site/manuals/LICENSE.html
   incubator/derby/site/trunk/build/site/manuals/NOTICE.html
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/COPYRIGHT.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/LICENSE.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/NOTICE.xml
Modified:
   incubator/derby/site/trunk/build/site/BUILDING.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr02.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr03.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr04.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr05.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr06.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr08.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr11.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr16.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr21.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr22.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr23.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr24.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr25.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr26.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr27.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr28.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr29.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr30.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr31.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr32.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr33.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr34.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr35.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr36.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr39.html
   incubator/derby/site/trunk/build/site/manuals/getstart/gspr40.html
   incubator/derby/site/trunk/src/documentation/content/xdocs/BUILDING.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr02.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr03.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr04.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr05.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr06.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr08.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr11.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr16.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr21.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr22.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr23.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr24.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr25.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr26.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr27.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr28.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr29.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr30.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr31.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr32.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr33.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr34.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr35.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr36.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr39.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr40.ihtml
Log:
Updated BUILDING.xml with the most recent BUILDING.txt.
Added NOTICE, COPYRIGHT, and LICENSE files to the manuals subdirectory.
Updated file headers and title page to ASF copyright and Apache Licence notice in manuals/getstart.


Modified: incubator/derby/site/trunk/build/site/BUILDING.html
==============================================================================
--- incubator/derby/site/trunk/build/site/BUILDING.html	(original)
+++ incubator/derby/site/trunk/build/site/BUILDING.html	Sat Nov 13 11:28:46 2004
@@ -215,14 +215,13 @@
 
 
 <p>
-The instructions in this file were last updated August 12, 2004.
+The instructions in this file were last updated November 12, 2004.
 Always check the <span class="codefrag">BUILDING.txt</span> file in the root directory of
 the Derby source code for the most current information.
 </p>
 
 
 <pre class="code">
-
                      Building Derby
 ================================================================
 
@@ -241,8 +240,9 @@
 2.2.4 Download extensions for Java Development Kit release 1.3.x
 2.2.5 Download Java Compiler Compiler (JavaCC) version 3.1
 2.2.6 Download jakarta-servlet API 4 (Servlet 2.4)
-2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
-2.2.8 Download Jikes 1.14 (Optional)
+2.2.7 Download Jakarta-ORO 2.0.8
+2.2.8 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.9 Download Jikes 1.14 (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -280,7 +280,7 @@
 (1) The directories are referred in unix convention.
     For Windows, / should be replaced with \.
 
-(2) All examples or commands are given in unix convention.
+(2) All examples or commands are given in unix conventions.
     For Windows, modify the examples or commands as per
     windows conventions.
  
@@ -359,7 +359,7 @@
     The reference implementation is available at:
        http://java.sun.com/j2se
 
-(2) Install the JDK 1.4.x according to the instructions included 
+(2) Install JDK 1.4.x according to the instructions included 
     with the release in any directory. 
 
 (3) The directory where you have installed JDK 1.4.x will be 
@@ -376,7 +376,7 @@
     The reference implementation is available at:
        http://java.sun.com/j2se
 
-(2) Install the JDK 1.3.x according to the instructions included 
+(2) Install JDK 1.3.x according to the instructions included 
     with the release in any directory. 
 
 (3) The directory where you have installed JDK 1.3.x will be 
@@ -457,7 +457,23 @@
 
 
 
-2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.7 Download Jakarta-ORO 2.0.8
+
+The Derby tests require the Jakarta-ORO classes for text processing.
+Jakarta-ORO 2.0.8 can be downloaded from:
+
+http://www.signal42.com/mirrors/apache/jakarta/oro/source/jakarta-oro-2.0.8.zip
+or
+http://www.signal42.com/mirrors/apache/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz
+
+The downloaded file contains documentation and other files. After downloading
+the zip or tar file, unzip or untar the file and copy only the 
+jakarta-oro-2.0.8.jar file to the directory
+   ${derby.source}/tools/java
+
+
+
+2.2.8 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
 
 This is an optional section.
 The reason is that osgi.jar is required to only build the 
@@ -478,10 +494,11 @@
 
 
 
-Note: After following the steps in section 2.2.4-2.2.7 of this
+Note: After following the steps in sections 2.2.4-2.2.8 of this
 document, you should have the following:
 
 ${derby.source}/tools/java/javacc.jar
+${derby.source}/tools/java/jakarta-oro-2.0.8.jar
 ${derby.source}/tools/java/jce1_2_2.jar 
 ${derby.source}/tools/java/jdbc2_0-stdext.jar
 ${derby.source}/tools/java/jta-1_0_1B-classes.zip 
@@ -490,7 +507,7 @@
 
 
 
-2.2.8 Download and Install Jikes 1.14 (Optional)
+2.2.9 Download and Install Jikes 1.14 (Optional)
 
 This is an optional section.
 
@@ -525,7 +542,8 @@
     directory ${ant.dir}/bin in its list. This makes the "ant" 
     command line script available, which will be used to 
     actually perform the build. Also, if you opted to install
-    jikes, add ${jikes.dir} to the PATH as well. For example:
+    jikes in section 2.2.8 of this document, add ${jikes.dir} 
+    to the PATH as well. For example:
 
      setenv PATH ${ant.dir}/bin:${jikes.dir}:$PATH -- On unix(csh)
      export PATH=${ant.dir}/bin:${jikes.dir}:$PATH -- On unix(ksh)
@@ -540,13 +558,13 @@
 
 
 
-3.2   Create property files
+3.2   Create property file
 
 You will need to create a property file to specify
 your environment and some of your options. Do the following
-to specify your environment:
+to specify your environment and options:
 
-(1) Find out user home directory. You can find your 
+(1) Find out user home directory on your system. You can find  
     user home directory by doing echo on variable %HOME% 
     on windows and $home or $HOME on unix.
 
@@ -557,7 +575,8 @@
     - j14lib
 
       This is a required variable which defines the location of
-      jdk 1.4.x. Define the variable as following:
+      JDK 1.4.x. Define the variable as following:
+
           j14lib=${jdk14.dir}/jre/lib
       
       where ${jdk14.dir} is the directory name where you have 
@@ -566,7 +585,8 @@
     - j13lib
 
       This is a required variable which defines the location of
-      jdk 1.4.x. Define the variable as following:
+      JDK 1.4.x. Define the variable as following:
+
           j13lib=${jdk13.dir}/jre/lib
 
       where ${jdk13.dir} is the directory name where you have 
@@ -574,14 +594,13 @@
       
     - build.compiler
 
-      This variable defines if standard java compiler or jikes is used  
-      for derby build. The default value of this variable is set to use 
-      standard java compiler for derby build. If you opted to install 
-      jikes in section 2.2.8 of this document, you can give your option
-      to use jikes for derby build by overwriting default value of this
-      variable by setting it as following: 
-    
-      Define the variable as following:
+      This variable defines if standard java compiler or jikes is 
+      used for build. The default value of this variable is set to 
+      use standard java compiler for build. If you opted to install
+      jikes in section 2.2.8 of this document, you can give your 
+      option to use jikes for build by overwriting default value of 
+      this variable by setting it as following: 
+   
           build.compiler=jikes
 
     - proceed
@@ -596,18 +615,18 @@
 
     - sane
 
-      This variable makes build run with extra asserts and includes
-      debugging information in the class files (when set to true)
-      or makes build run without extra asserts, excludes debugging 
-      information from the class files, and makes product run faster
-      as it generates smaller class files (when set to false). The 
-      default value of this variable is true. You can overwrite 
-      default value by setting it to false by defining the variable 
-      as following: 
+      By default this variable is set to true and builds
+      extra asserts and debugging information in the class
+      files. When set to false no extra asserts or debugging 
+      information is included in the class files, making Derby
+      run faster as it generates smaller class files.
+      You can overwrite default value by setting it to false by
+      defining the variable as following: 
 
           sane=false
- 
 
+      Typically applications embedding Derby would use jar files 
+      built with sane=false.
 
 3.3   Run Derby build
 
@@ -622,6 +641,11 @@
     in your classpath, you will have full functionality
     of engine, tools, and network server. 
 
+    In addition, if you would like to build the Derby test
+    framework and related files, run the following command:
+
+    &gt;ant testing
+
 (3) Run the following command to build all jars:
     
     &gt;ant buildjars
@@ -630,12 +654,17 @@
     - derby.jar (database engine), 
     - derbytools.jar (utilities: sysinfo, dblook, ij) 
     - derbynet.jar (network server).
+    - derbyLocale_*.jar (9 jar files with locale support).
+    If the tests were built, the following jar file will also be built:
+    - derbyTesting.jar (the test framework and related files)
 
     You can run the ant command to build an individual jar
     file as following:
     - command "ant derbyjar" to build derby.jar
     - command "ant derbytoolsjar" to build derbytools.jar
     - command "ant derbynetjar" to build derbynet.jar
+    - command "ant derbylocalejars" to build the derby locale jar files.
+    - command "ant derbytestingjar" to build derbyTesting.jar
 
 Notes: 
 (1) The estimated total time for build completion is ~5-10 minutes.
@@ -672,8 +701,26 @@
     For builds with sane=false
     &gt;java -cp ${derby.source}/jars/insane/derby.jar:${derby.source}/jars/insane/derbytools.jar org.apache.derby.tools.sysinfo
 
-    The above commands should report the sysinfo and 
-    provide example output. 
+    The above commands should report the system info and output 
+    should look like the following:
+
+    ------------------ Java Information ------------------
+    Java Version:    1.4.1_07
+    Java Vendor:     Sun Microsystems Inc.
+    Java home:       C:\Program Files\Java\j2re1.4.1_07
+    Java classpath:  c:\derby\classes
+    OS name:         Windows 2000
+    OS architecture: x86
+    OS version:      5.0
+    Java user name:  derbyuser
+    Java user home:  C:\Documents and Settings\Administrator
+    Java user dir:   C:\derby
+    --------- Derby Information --------
+    [C:\derby\classes] 10.0.2.0 - (1)
+    ------------------------------------------------------
+    ----------------- Locale Information -----------------
+    ------------------------------------------------------
+
 
 (4) Execute the following command:
     
@@ -697,6 +744,9 @@
     database with no errors.
 
 
+(6) Derby also includes a suite of tests for more comprehensive verification.
+    Information on how to run these tests can be found in the source tree,
+    in the file ${derby.source}/java/testing/org/apache/derbyTesting/readme.htm
 
 ---------------------------------------------------------------
 4     Derby build miscellaneous information
@@ -711,7 +761,14 @@
 Some of the main targets that can be called as
 "ant targetname" are as the  following:
 
-  source: to build source code. This is default target.
+  all: builds the source code, demos, and tests.
+
+  buildsource: to build source code. This is default target.
+
+  demo: builds the simple demos in java/demo
+
+  testing: builds the tests in java/testing. For additional information on
+           testing, please see java/testing/org/apache/derbyTesting/readme.htm
 
   javadoc: to create javadoc for all source code.
 
@@ -787,7 +844,7 @@
 being: reference, internal API, public API, implementation. 
 At the end of the build, the properties files containing the 
 message files are copied into the output directory and the 
-version information properties files are generated.  </pre>
+version information properties files are generated.</pre>
 
 
 <div class="attribution"></div>

Added: incubator/derby/site/trunk/build/site/manuals/COPYRIGHT.html
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/build/site/manuals/COPYRIGHT.html	Sat Nov 13 11:28:46 2004
@@ -0,0 +1,1055 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Apache Derby: COPYRIGHT</title>
+<link type="text/css" href="../skin/page.css" rel="stylesheet">
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<!--================= start Navigation Path ==================-->
+<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Navigation Path ==================-->
+<!--================= start Banner ==================-->
+<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<!--================= start Group Logo ==================-->
+<td bgcolor="#294563"><a href="http://incubator.apache.org"><img border="0" class="logoImage" alt="" src="../resources/images/apache-incubator.png" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Group Logo ==================-->
+<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://incubator.apache.org/derby/"><img border="0" class="logoImage" alt="Derby" src="../images/derby-logo.jpg" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Project Logo ==================-->
+<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563">
+<form target="_blank" action="http://www.google.com/search" method="get">
+<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
+<tr>
+<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="incubator.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit">
+<br>
+<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
+                      the Derby site
+                      
+                      
+                    </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td>
+</tr>
+</table>
+</form>
+</td>
+<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" bgcolor="#294563" colspan="2">
+<!--================= start Tabs ==================-->
+<div class="tab">
+<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../manuals/index.html">Manuals</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../papers/index.html">Papers</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+<!--================= end Tabs ==================-->
+</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Banner ==================-->
+<!--================= start Menu, NavBar, Content ==================-->
+<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top">
+<table summary="menu" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<!--================= start left top NavBar ==================-->
+<td rowspan="3" valign="top">
+<table summary="blue line" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif">&nbsp;</font></td>
+</tr>
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td>
+<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F">
+<!--================= start Menu items ==================-->
+<div class="menu">
+<ul>
+<li>
+<font color="#CFDCED">Manuals</font>
+<ul>
+     
+<li>
+<a href="../manuals/index.html">About</a>
+</li>
+     
+<li>
+<a href="../manuals/NOTICE.html">NOTICE</a>
+</li>
+     
+<li>
+<span class="sel"><font color="#ffcc00">COPYRIGHT</font></span>
+</li>
+     
+<li>
+<a href="../manuals/LICENSE.html">LICENSE</a>
+</li>
+     
+<li>
+<font color="#CFDCED">Getting Started</font>
+<ul>
+         
+<li>
+<a href="../manuals/getstart/gspr02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/getstart/gspr40.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+     
+<li>
+<font color="#CFDCED">Reference Manual</font>
+<ul>
+         
+<li>
+<a href="../manuals/reference/sqlj02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/reference/sqlj275.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+
+     
+<li>
+<font color="#CFDCED">Developer's Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/develop/develop02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/develop/develop157.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+     
+<li>
+<font color="#CFDCED">Tuning Derby</font>
+<ul>
+         
+<li>
+<a href="../manuals/tuning/perf02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/tuning/perf121.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+
+     
+<li>
+<font color="#CFDCED">Server &amp; Admin Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/admin/hubprnt02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/admin/hubprnt65.html" title="Index">Index</a>
+</li>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+        
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+    
+</ul>
+</li>
+
+    
+<li>
+<font color="#CFDCED">Tools &amp; Utility Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/tools/tools02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/tools/tools113.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+    
+</ul>
+</li>
+  
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Apache Derby: COPYRIGHT</h1>
+</td>
+</tr>
+</table>
+
+
+<pre class="code">
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.</pre>
+
+
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;Apache Software Foundation All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

Added: incubator/derby/site/trunk/build/site/manuals/LICENSE.html
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/build/site/manuals/LICENSE.html	Sat Nov 13 11:28:46 2004
@@ -0,0 +1,1251 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Apache Derby: LICENSE</title>
+<link type="text/css" href="../skin/page.css" rel="stylesheet">
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<!--================= start Navigation Path ==================-->
+<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Navigation Path ==================-->
+<!--================= start Banner ==================-->
+<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<!--================= start Group Logo ==================-->
+<td bgcolor="#294563"><a href="http://incubator.apache.org"><img border="0" class="logoImage" alt="" src="../resources/images/apache-incubator.png" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Group Logo ==================-->
+<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://incubator.apache.org/derby/"><img border="0" class="logoImage" alt="Derby" src="../images/derby-logo.jpg" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Project Logo ==================-->
+<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563">
+<form target="_blank" action="http://www.google.com/search" method="get">
+<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
+<tr>
+<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="incubator.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit">
+<br>
+<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
+                      the Derby site
+                      
+                      
+                    </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td>
+</tr>
+</table>
+</form>
+</td>
+<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" bgcolor="#294563" colspan="2">
+<!--================= start Tabs ==================-->
+<div class="tab">
+<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../manuals/index.html">Manuals</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../papers/index.html">Papers</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+<!--================= end Tabs ==================-->
+</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Banner ==================-->
+<!--================= start Menu, NavBar, Content ==================-->
+<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top">
+<table summary="menu" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<!--================= start left top NavBar ==================-->
+<td rowspan="3" valign="top">
+<table summary="blue line" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif">&nbsp;</font></td>
+</tr>
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td>
+<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F">
+<!--================= start Menu items ==================-->
+<div class="menu">
+<ul>
+<li>
+<font color="#CFDCED">Manuals</font>
+<ul>
+     
+<li>
+<a href="../manuals/index.html">About</a>
+</li>
+     
+<li>
+<a href="../manuals/NOTICE.html">NOTICE</a>
+</li>
+     
+<li>
+<a href="../manuals/COPYRIGHT.html">COPYRIGHT</a>
+</li>
+     
+<li>
+<span class="sel"><font color="#ffcc00">LICENSE</font></span>
+</li>
+     
+<li>
+<font color="#CFDCED">Getting Started</font>
+<ul>
+         
+<li>
+<a href="../manuals/getstart/gspr02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/getstart/gspr40.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+     
+<li>
+<font color="#CFDCED">Reference Manual</font>
+<ul>
+         
+<li>
+<a href="../manuals/reference/sqlj02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/reference/sqlj275.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+
+     
+<li>
+<font color="#CFDCED">Developer's Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/develop/develop02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/develop/develop157.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+     
+<li>
+<font color="#CFDCED">Tuning Derby</font>
+<ul>
+         
+<li>
+<a href="../manuals/tuning/perf02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/tuning/perf121.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+
+     
+<li>
+<font color="#CFDCED">Server &amp; Admin Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/admin/hubprnt02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/admin/hubprnt65.html" title="Index">Index</a>
+</li>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+        
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+    
+</ul>
+</li>
+
+    
+<li>
+<font color="#CFDCED">Tools &amp; Utility Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/tools/tools02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/tools/tools113.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+    
+</ul>
+</li>
+  
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Apache Derby: LICENSE</h1>
+</td>
+</tr>
+</table>
+
+
+<pre class="code">
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.</pre>
+
+
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;Apache Software Foundation All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

Added: incubator/derby/site/trunk/build/site/manuals/NOTICE.html
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/build/site/manuals/NOTICE.html	Sat Nov 13 11:28:46 2004
@@ -0,0 +1,1063 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Apache Derby: NOTICE</title>
+<link type="text/css" href="../skin/page.css" rel="stylesheet">
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<!--================= start Navigation Path ==================-->
+<table summary="navigation path" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td nowrap="nowrap" valign="middle" bgcolor="#CFDCED" height="20"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><!--===== breadcrumb trail (javascript-generated) ====--><font size="2" face="Arial, Helvetica, Sans-serif"><script src="../skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script></font></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" height="2"><img height="2" width="2" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Navigation Path ==================-->
+<!--================= start Banner ==================-->
+<table summary="header with logos" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<!--================= start Group Logo ==================-->
+<td bgcolor="#294563"><a href="http://incubator.apache.org"><img border="0" class="logoImage" alt="" src="../resources/images/apache-incubator.png" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Group Logo ==================-->
+<!--================= start Project Logo ==================--><td width="100%" align="center" bgcolor="#294563"><a href="http://incubator.apache.org/derby/"><img border="0" class="logoImage" alt="Derby" src="../images/derby-logo.jpg" title="Derby is a zero admin java based embedded database."></a></td>
+<!--================= end Project Logo ==================-->
+<!--================= start Search ==================--><td valign="top" rowspan="2" bgcolor="#294563">
+<form target="_blank" action="http://www.google.com/search" method="get">
+<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
+<tr>
+<td colspan="3"><img height="10" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap"><input value="incubator.apache.org" name="sitesearch" type="hidden"><input size="15" name="q" id="query" type="text"><img height="1" width="5" alt="" src="../skin/images/spacer.gif" class="spacer"><input name="Search" value="Search" type="submit">
+<br>
+<font face="Arial, Helvetica, Sans-serif" size="2" color="white">
+                      the Derby site
+                      
+                      
+                    </font></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td><img alt="" border="0" height="10" width="9" src="../skin/images/search-left.gif"></td><td><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td><img alt="" border="0" height="10" width="9" src="../skin/images/search-right.gif"></td>
+</tr>
+</table>
+</form>
+</td>
+<!--================= start Search ==================--><td bgcolor="#294563"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" bgcolor="#294563" colspan="2">
+<!--================= start Tabs ==================-->
+<div class="tab">
+<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../index.html">Home</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b><a class="base-selected" href="../manuals/index.html">Manuals</a></b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="../skin/images/tabSel-right.gif"></td>
+</tr>
+</table>
+</td><td width="6"><img alt="" height="8" width="6" src="../skin/images/spacer.gif"></td><td valign="bottom">
+<table summary="non selected tab" style="height: 1.6em" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a class="base-not-selected" href="../papers/index.html">Papers</a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="../skin/images/tab-right.gif"></td>
+</tr>
+<tr>
+<td colspan="3" height="1"></td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</div>
+<!--================= end Tabs ==================-->
+</td><td bgcolor="#294563"><img alt="" width="1" height="1" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#4C6C8F" colspan="4"><img width="1" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+<!--================= end Banner ==================-->
+<!--================= start Menu, NavBar, Content ==================-->
+<table summary="page content" bgcolor="#ffffff" width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td valign="top">
+<table summary="menu" border="0" cellspacing="0" cellpadding="0">
+<tr>
+<!--================= start left top NavBar ==================-->
+<td rowspan="3" valign="top">
+<table summary="blue line" border="0" cellpadding="0" cellspacing="0">
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td bgcolor="#CFDCED"><font color="#4C6C8F" size="4" face="Arial, Helvetica, Sans-serif">&nbsp;</font></td>
+</tr>
+<tr>
+<td bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td>
+<!--================= end left top NavBar ==================--><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td nowrap="nowrap" valign="top" bgcolor="#4C6C8F">
+<!--================= start Menu items ==================-->
+<div class="menu">
+<ul>
+<li>
+<font color="#CFDCED">Manuals</font>
+<ul>
+     
+<li>
+<a href="../manuals/index.html">About</a>
+</li>
+     
+<li>
+<span class="sel"><font color="#ffcc00">NOTICE</font></span>
+</li>
+     
+<li>
+<a href="../manuals/COPYRIGHT.html">COPYRIGHT</a>
+</li>
+     
+<li>
+<a href="../manuals/LICENSE.html">LICENSE</a>
+</li>
+     
+<li>
+<font color="#CFDCED">Getting Started</font>
+<ul>
+         
+<li>
+<a href="../manuals/getstart/gspr02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/getstart/gspr40.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+     
+<li>
+<font color="#CFDCED">Reference Manual</font>
+<ul>
+         
+<li>
+<a href="../manuals/reference/sqlj02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/reference/sqlj275.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+
+     
+<li>
+<font color="#CFDCED">Developer's Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/develop/develop02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/develop/develop157.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+     
+<li>
+<font color="#CFDCED">Tuning Derby</font>
+<ul>
+         
+<li>
+<a href="../manuals/tuning/perf02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/tuning/perf121.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+     
+</ul>
+</li>
+
+     
+<li>
+<font color="#CFDCED">Server &amp; Admin Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/admin/hubprnt02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/admin/hubprnt65.html" title="Index">Index</a>
+</li>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+        
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+    
+</ul>
+</li>
+
+    
+<li>
+<font color="#CFDCED">Tools &amp; Utility Guide</font>
+<ul>
+         
+<li>
+<a href="../manuals/tools/tools02.html" title="Table of Contents">Table of Contents</a>
+</li>
+         
+<li>
+<a href="../manuals/tools/tools113.html" title="Index">Index</a>
+</li>
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+         
+    
+</ul>
+</li>
+  
+</ul>
+</li>
+</ul>
+</div>
+<!--================= end Menu items ==================-->
+</td><td valign="bottom" bgcolor="#4C6C8F"><img width="10" height="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td valign="bottom" align="left" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-left.gif"></td><td bgcolor="#4C6C8F"><img height="10" width="10" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td valign="bottom" align="right" colspan="2" rowspan="2" bgcolor="#4C6C8F"><img height="10" width="10" border="0" alt="" src="../skin/images/menu-right.gif"></td>
+</tr>
+<tr>
+<td height="1" bgcolor="#294563"><img width="1" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+</table>
+</td><td valign="top" width="100%">
+<table summary="content" width="100%" border="0" cellpadding="0" cellspacing="0">
+<!--================= start middle NavBar ==================-->
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td align="left" width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="left" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td align="right" width="50%" bgcolor="#CFDCED"><font color="#4C6C8F" size="3" face="Arial, Helvetica, Sans-serif">
+                &nbsp;
+                
+                </font><img width="10" height="8" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td width="10" bgcolor="#CFDCED"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<tr>
+<td colspan="4" bgcolor="#294563"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end middle NavBar ==================-->
+<!--================= start Content==================-->
+<tr>
+<td align="left" width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td><td colspan="2" align="left" width="100%">
+<div class="content">
+<table class="title" summary="">
+<tr>
+<td valign="middle">
+<h1>Apache Derby: NOTICE</h1>
+</td>
+</tr>
+</table>
+
+
+<pre class="code">
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Derby distribution.       ==
+=========================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Derby were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA".</pre>
+
+
+<div class="attribution"></div>
+</div>
+</td><td width="10"><img width="10" height="1" alt="" src="../skin/images/spacer.gif" class="spacer"></td>
+</tr>
+<!--================= end Content==================-->
+</table>
+</td>
+</tr>
+</table>
+<!--================= end Menu, NavBar, Content ==================-->
+<!--================= start Footer ==================-->
+<table summary="footer" cellspacing="0" cellpadding="0" width="100%" border="0">
+<tr>
+<td colspan="2" height="1" bgcolor="#4C6C8F"><img height="1" width="1" alt="" src="../skin/images/spacer.gif" class="spacer"><a href="../skin/images/label.gif"></a><a href="../skin/images/page.gif"></a><a href="../skin/images/chapter.gif"></a><a href="../skin/images/chapter_open.gif"></a><a href="../skin/images/current.gif"></a><a href="/favicon.ico"></a></td>
+</tr>
+<tr>
+<td colspan="2" bgcolor="#CFDCED" class="copyright" align="center"><font size="2" face="Arial, Helvetica, Sans-Serif">Copyright &copy;
+          2004&nbsp;Apache Software Foundation All rights reserved.<script type="text/javascript" language="JavaScript"><!--
+              document.write(" - "+"Last Published: " + document.lastModified);
+            //  --></script></font></td>
+</tr>
+<tr>
+<td colspan="2" align="left" bgcolor="#CFDCED" class="logos"></td>
+</tr>
+</table>
+<!--================= end Footer ==================-->
+</body>
+</html>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr.html	Sat Nov 13 11:28:46 2004
@@ -1008,16 +1008,27 @@
 <a href="#Getting+Started+with+Derby">Getting Started with Derby</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Getting+Started+with+Derby"></a>
+<a name="N10036"></a><a name="Getting+Started+with+Derby"></a>
 <h3>Getting Started with Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <br>
 <p>
 <strong>First Edition (August 2004)</strong>
 </p>
-<p>
-<strong>(C) Copyright International Business Machines Corporation 1997, 2004. All rights reserved.</strong>
-<br>U.S. Government Users Restricted Rights -- Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.</p>
+<pre>Copyright 1997, 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.
+</pre>
 <hr>
 <a href="gspr02.html">Next Page</a>
 <br>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr02.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr02.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr02.html	Sat Nov 13 11:28:46 2004
@@ -1011,13 +1011,13 @@
 <a href="#Contents">Contents</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Getting+Started+with+Derby"></a>
+<a name="N10036"></a><a name="Getting+Started+with+Derby"></a>
 <h3>Getting Started with Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <br>
 <hr>
 </div>
-<a name="N10040"></a><a name="Contents"></a>
+<a name="N1003C"></a><a name="Contents"></a>
 <h3>Contents</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr03.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr03.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr03.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Introducing+Derby">Introducing Derby</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Introducing+Derby"></a>
+<a name="N10036"></a><a name="Introducing+Derby"></a>
 <h3>Introducing Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Welcome to Derby! Derby is a Java- and SQL-based relational database management system (RDBMS). This chapter describes the Derby products.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr04.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr04.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr04.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Deployment+options">Deployment options</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Deployment+options"></a>
+<a name="N10036"></a><a name="Deployment+options"></a>
 <h3>Deployment options</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Derby can be deployed in a number of different ways:</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr05.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr05.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr05.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#System+requirements">System requirements</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="System+requirements"></a>
+<a name="N10036"></a><a name="System+requirements"></a>
 <h3>System requirements</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Derby is a database engine written completely in Java; it will run in any certified Java Virtual Machine (JVM).</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr06.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr06.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr06.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Installing+and+working+with+Derby">Installing and working with Derby</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Installing+and+working+with+Derby"></a>
+<a name="N10036"></a><a name="Installing+and+working+with+Derby"></a>
 <h3>Installing and working with Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr08.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr08.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr08.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Installing+Derby">Installing Derby</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Installing+Derby"></a>
+<a name="N10036"></a><a name="Installing+Derby"></a>
 <h3>Installing Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>These instructions assume you downloaded the zip or tar archive from the Derby web site.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr11.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr11.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr11.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Setting+up+your+Java+environment">Setting up your Java environment</a>
 </li>
 </ul>
-<a name="N10043"></a><a name="Setting+up+your+Java+environment"></a>
+<a name="N1003F"></a><a name="Setting+up+your+Java+environment"></a>
 <h3>Setting up your Java environment</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr16.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr16.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr16.html	Sat Nov 13 11:28:46 2004
@@ -1011,7 +1011,7 @@
 <a href="#Set+the+class+path">Set the class pathSet the class path</a>
 </li>
 </ul>
-<a name="N10043"></a><a name="Set+the+DERBY_INSTALL+environment+variable"></a>
+<a name="N1003F"></a><a name="Set+the+DERBY_INSTALL+environment+variable"></a>
 <h3>Set the DERBY_INSTALL environment variable</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The Derby documentation often refers to the base directory where the software was installed. Create an environment variable called DERBY_INSTALL and set its value to the path of the Derby base directory. For example, if you installed the product in c:\Derby_10, set DERBY_INSTALL to c:\Derby_10\apache-derby-10.0:</p>
@@ -1020,7 +1020,7 @@
 
 </pre>
 </div>
-<a name="N1004D"></a><a name="Set+the+class+path"></a>
+<a name="N10049"></a><a name="Set+the+class+path"></a>
 <h3>Set the class pathSet the class path</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The JVM (compiler or interpreter) needs to know the path (operating system instructions about location) of every class file needed by your application. The class path is a list of the class libraries needed by the JVM and other Java applications in order to run your program.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr21.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr21.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr21.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Quick+start+for+experienced+JDBC+users">Quick start for experienced JDBC users</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Quick+start+for+experienced+JDBC+users"></a>
+<a name="N10036"></a><a name="Quick+start+for+experienced+JDBC+users"></a>
 <h3>Quick start for experienced JDBC users</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>This chapter is for experienced JDBC programmers who already know the basics about how to set class path, how to run a Java program, and how to use a JDBC driver.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr22.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr22.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr22.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Environment+quick+start">Environment quick start</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Environment+quick+start"></a>
+<a name="N10036"></a><a name="Environment+quick+start"></a>
 <h3>Environment quick start</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Before you configure your system for running Derby, it is useful to understand something about the different environments in which Derby can run, because these environments affect the class path, driver name, and database connection URL. See the Derby Developer's Guide for more information on Derby environments.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr23.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr23.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr23.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Embedded+environment">Embedded environment</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Embedded+environment"></a>
+<a name="N10036"></a><a name="Embedded+environment"></a>
 <h3>Embedded environment</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>When an application starts up an instance of Derby within its JVM, the application is said to run in an <em>embedded environment</em>. In this environment, only a single application can access a database at one time, and no network access occurs. Loading the embedded driver starts Derby.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr24.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr24.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr24.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Client%2Fserver+environment">Client/server environment</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Client%2Fserver+environment"></a>
+<a name="N10036"></a><a name="Client%2Fserver+environment"></a>
 <h3>Client/server environment</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>When multiple applications connect to Derby over the network, they are running in a client/server environment. Derby runs embedded in a server framework that allows multiple network connections. (The framework itself starts up an instance of Derby and is running in an embedded environment. However, the client applications are not in the embedded environment. See the Derby Server and Administration Guide for more information on how to run Derby on a server.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr25.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr25.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr25.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Libraries+and+class+path">Libraries and class path</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Libraries+and+class+path"></a>
+<a name="N10036"></a><a name="Libraries+and+class+path"></a>
 <h3>Libraries and class path</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>See <a href="gspr34.html#HDRSII-GSLIBS-19524">Appendix A, Derby Libraries and Scripts: Complete Reference</a> for complete reference.</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr26.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr26.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr26.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Driver">Driver</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Driver"></a>
+<a name="N10036"></a><a name="Driver"></a>
 <h3>Driver</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr27.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr27.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr27.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Database+connection+URL">Database connection URL</a>
 </li>
 </ul>
-<a name="N10043"></a><a name="Database+connection+URL"></a>
+<a name="N1003F"></a><a name="Database+connection+URL"></a>
 <h3>Database connection URL</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>For the Derby-provided driver listed above, here is the format for the database connection URL for connecting to an existing database:</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr28.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr28.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr28.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#The+Derby+documents">The Derby documents</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="The+Derby+documents"></a>
+<a name="N10036"></a><a name="The+Derby+documents"></a>
 <h3>The Derby documents</h3>
 <div style="margin-left: 0 ; border: 2px">
 <hr>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr29.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr29.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr29.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#The+library">The library</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="The+library"></a>
+<a name="N10036"></a><a name="The+library"></a>
 <h3>The library</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr30.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr30.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr30.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Documentation+conventions">Documentation conventions</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Documentation+conventions"></a>
+<a name="N10036"></a><a name="Documentation+conventions"></a>
 <h3>Documentation conventions</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr31.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr31.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr31.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Terminology">Terminology</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Terminology"></a>
+<a name="N10036"></a><a name="Terminology"></a>
 <h3>Terminology</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The Derby documentation uses some specialized vocabulary. Here are some definitions that will help you understand Derby:</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr32.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr32.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr32.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Syntax">Syntax</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Syntax"></a>
+<a name="N10036"></a><a name="Syntax"></a>
 <h3>Syntax</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>SQL syntax is presented in modified BNF notation. The meta-symbols of BNF are:<br>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr33.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr33.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr33.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Typography">Typography</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Typography"></a>
+<a name="N10036"></a><a name="Typography"></a>
 <h3>Typography</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>This documentation uses some typographical conventions to highlight elements of the SQL language, operating system commands, and the Java programming language.<br>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr34.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr34.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr34.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Appendix+A.+Derby+Libraries%3A+Complete+Reference">Appendix A. Derby Libraries: Complete Reference</a>
 </li>
 </ul>
-<a name="N10043"></a><a name="Appendix+A.+Derby+Libraries%3A+Complete+Reference"></a>
+<a name="N1003F"></a><a name="Appendix+A.+Derby+Libraries%3A+Complete+Reference"></a>
 <h3>Appendix A. Derby Libraries: Complete Reference</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr35.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr35.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr35.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Libraries+Provided+by+Derby">Libraries Provided by Derby</a>
 </li>
 </ul>
-<a name="N10043"></a><a name="Libraries+Provided+by+Derby"></a>
+<a name="N1003F"></a><a name="Libraries+Provided+by+Derby"></a>
 <h3>Libraries Provided by Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <br>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr36.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr36.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr36.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Libraries+Not+Provided+by+Derby">Libraries Not Provided by Derby</a>
 </li>
 </ul>
-<a name="N10043"></a><a name="Libraries+Not+Provided+by+Derby"></a>
+<a name="N1003F"></a><a name="Libraries+Not+Provided+by+Derby"></a>
 <h3>Libraries Not Provided by Derby</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The Derby Network Server requires a JDBC client that talks DRDA. The IBM DB2 JDBC Universal driver is available for download from <a href="http://www.ibm.com/developerworks/cloudscape">IBM developerWorks</a> and includes the two jar files listed in the table below:</p>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr39.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr39.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr39.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Trademarks">Trademarks</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Trademarks"></a>
+<a name="N10036"></a><a name="Trademarks"></a>
 <h3>Trademarks</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The following terms are trademarks of International Business Machines Corporation in the United States, other countries, or both, and have been used in at least one of the documents in the DB2 UDB documentation library.<br>

Modified: incubator/derby/site/trunk/build/site/manuals/getstart/gspr40.html
==============================================================================
--- incubator/derby/site/trunk/build/site/manuals/getstart/gspr40.html	(original)
+++ incubator/derby/site/trunk/build/site/manuals/getstart/gspr40.html	Sat Nov 13 11:28:46 2004
@@ -1008,7 +1008,7 @@
 <a href="#Index">Index</a>
 </li>
 </ul>
-<a name="N1003A"></a><a name="Index"></a>
+<a name="N10036"></a><a name="Index"></a>
 <h3>Index</h3>
 <div style="margin-left: 0 ; border: 2px">
 <strong>C</strong>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/BUILDING.xml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/BUILDING.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/BUILDING.xml	Sat Nov 13 11:28:46 2004
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://apache.org/forrest/dtd/document-v12.dtd">
-
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
  <header>
   <title>Apache Derby: Building Derby</title>
@@ -9,13 +8,12 @@
 <body>
 
 <p>
-The instructions in this file were last updated August 12, 2004.
+The instructions in this file were last updated November 12, 2004.
 Always check the <code>BUILDING.txt</code> file in the root directory of
 the Derby source code for the most current information.
 </p>
 
 <source><![CDATA[
-
                      Building Derby
 ================================================================
 
@@ -34,8 +32,9 @@
 2.2.4 Download extensions for Java Development Kit release 1.3.x
 2.2.5 Download Java Compiler Compiler (JavaCC) version 3.1
 2.2.6 Download jakarta-servlet API 4 (Servlet 2.4)
-2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
-2.2.8 Download Jikes 1.14 (Optional)
+2.2.7 Download Jakarta-ORO 2.0.8
+2.2.8 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.9 Download Jikes 1.14 (Optional)
 
 3     Build instructions
 3.1   Set required environmental variables
@@ -73,7 +72,7 @@
 (1) The directories are referred in unix convention.
     For Windows, / should be replaced with \.
 
-(2) All examples or commands are given in unix convention.
+(2) All examples or commands are given in unix conventions.
     For Windows, modify the examples or commands as per
     windows conventions.
  
@@ -152,7 +151,7 @@
     The reference implementation is available at:
        http://java.sun.com/j2se
 
-(2) Install the JDK 1.4.x according to the instructions included 
+(2) Install JDK 1.4.x according to the instructions included 
     with the release in any directory. 
 
 (3) The directory where you have installed JDK 1.4.x will be 
@@ -169,7 +168,7 @@
     The reference implementation is available at:
        http://java.sun.com/j2se
 
-(2) Install the JDK 1.3.x according to the instructions included 
+(2) Install JDK 1.3.x according to the instructions included 
     with the release in any directory. 
 
 (3) The directory where you have installed JDK 1.3.x will be 
@@ -250,7 +249,23 @@
 
 
 
-2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
+2.2.7 Download Jakarta-ORO 2.0.8
+
+The Derby tests require the Jakarta-ORO classes for text processing.
+Jakarta-ORO 2.0.8 can be downloaded from:
+
+http://www.signal42.com/mirrors/apache/jakarta/oro/source/jakarta-oro-2.0.8.zip
+or
+http://www.signal42.com/mirrors/apache/jakarta/oro/source/jakarta-oro-2.0.8.tar.gz
+
+The downloaded file contains documentation and other files. After downloading
+the zip or tar file, unzip or untar the file and copy only the 
+jakarta-oro-2.0.8.jar file to the directory
+   ${derby.source}/tools/java
+
+
+
+2.2.8 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
 
 This is an optional section.
 The reason is that osgi.jar is required to only build the 
@@ -271,10 +286,11 @@
 
 
 
-Note: After following the steps in section 2.2.4-2.2.7 of this
+Note: After following the steps in sections 2.2.4-2.2.8 of this
 document, you should have the following:
 
 ${derby.source}/tools/java/javacc.jar
+${derby.source}/tools/java/jakarta-oro-2.0.8.jar
 ${derby.source}/tools/java/jce1_2_2.jar 
 ${derby.source}/tools/java/jdbc2_0-stdext.jar
 ${derby.source}/tools/java/jta-1_0_1B-classes.zip 
@@ -283,7 +299,7 @@
 
 
 
-2.2.8 Download and Install Jikes 1.14 (Optional)
+2.2.9 Download and Install Jikes 1.14 (Optional)
 
 This is an optional section.
 
@@ -318,7 +334,8 @@
     directory ${ant.dir}/bin in its list. This makes the "ant" 
     command line script available, which will be used to 
     actually perform the build. Also, if you opted to install
-    jikes, add ${jikes.dir} to the PATH as well. For example:
+    jikes in section 2.2.8 of this document, add ${jikes.dir} 
+    to the PATH as well. For example:
 
      setenv PATH ${ant.dir}/bin:${jikes.dir}:$PATH -- On unix(csh)
      export PATH=${ant.dir}/bin:${jikes.dir}:$PATH -- On unix(ksh)
@@ -333,13 +350,13 @@
 
 
 
-3.2   Create property files
+3.2   Create property file
 
 You will need to create a property file to specify
 your environment and some of your options. Do the following
-to specify your environment:
+to specify your environment and options:
 
-(1) Find out user home directory. You can find your 
+(1) Find out user home directory on your system. You can find  
     user home directory by doing echo on variable %HOME% 
     on windows and $home or $HOME on unix.
 
@@ -350,7 +367,8 @@
     - j14lib
 
       This is a required variable which defines the location of
-      jdk 1.4.x. Define the variable as following:
+      JDK 1.4.x. Define the variable as following:
+
           j14lib=${jdk14.dir}/jre/lib
       
       where ${jdk14.dir} is the directory name where you have 
@@ -359,7 +377,8 @@
     - j13lib
 
       This is a required variable which defines the location of
-      jdk 1.4.x. Define the variable as following:
+      JDK 1.4.x. Define the variable as following:
+
           j13lib=${jdk13.dir}/jre/lib
 
       where ${jdk13.dir} is the directory name where you have 
@@ -367,14 +386,13 @@
       
     - build.compiler
 
-      This variable defines if standard java compiler or jikes is used  
-      for derby build. The default value of this variable is set to use 
-      standard java compiler for derby build. If you opted to install 
-      jikes in section 2.2.8 of this document, you can give your option
-      to use jikes for derby build by overwriting default value of this
-      variable by setting it as following: 
-    
-      Define the variable as following:
+      This variable defines if standard java compiler or jikes is 
+      used for build. The default value of this variable is set to 
+      use standard java compiler for build. If you opted to install
+      jikes in section 2.2.8 of this document, you can give your 
+      option to use jikes for build by overwriting default value of 
+      this variable by setting it as following: 
+   
           build.compiler=jikes
 
     - proceed
@@ -389,18 +407,18 @@
 
     - sane
 
-      This variable makes build run with extra asserts and includes
-      debugging information in the class files (when set to true)
-      or makes build run without extra asserts, excludes debugging 
-      information from the class files, and makes product run faster
-      as it generates smaller class files (when set to false). The 
-      default value of this variable is true. You can overwrite 
-      default value by setting it to false by defining the variable 
-      as following: 
+      By default this variable is set to true and builds
+      extra asserts and debugging information in the class
+      files. When set to false no extra asserts or debugging 
+      information is included in the class files, making Derby
+      run faster as it generates smaller class files.
+      You can overwrite default value by setting it to false by
+      defining the variable as following: 
 
           sane=false
- 
 
+      Typically applications embedding Derby would use jar files 
+      built with sane=false.
 
 3.3   Run Derby build
 
@@ -415,6 +433,11 @@
     in your classpath, you will have full functionality
     of engine, tools, and network server. 
 
+    In addition, if you would like to build the Derby test
+    framework and related files, run the following command:
+
+    >ant testing
+
 (3) Run the following command to build all jars:
     
     >ant buildjars
@@ -423,12 +446,17 @@
     - derby.jar (database engine), 
     - derbytools.jar (utilities: sysinfo, dblook, ij) 
     - derbynet.jar (network server).
+    - derbyLocale_*.jar (9 jar files with locale support).
+    If the tests were built, the following jar file will also be built:
+    - derbyTesting.jar (the test framework and related files)
 
     You can run the ant command to build an individual jar
     file as following:
     - command "ant derbyjar" to build derby.jar
     - command "ant derbytoolsjar" to build derbytools.jar
     - command "ant derbynetjar" to build derbynet.jar
+    - command "ant derbylocalejars" to build the derby locale jar files.
+    - command "ant derbytestingjar" to build derbyTesting.jar
 
 Notes: 
 (1) The estimated total time for build completion is ~5-10 minutes.
@@ -465,8 +493,26 @@
     For builds with sane=false
     >java -cp ${derby.source}/jars/insane/derby.jar:${derby.source}/jars/insane/derbytools.jar org.apache.derby.tools.sysinfo
 
-    The above commands should report the sysinfo and 
-    provide example output. 
+    The above commands should report the system info and output 
+    should look like the following:
+
+    ------------------ Java Information ------------------
+    Java Version:    1.4.1_07
+    Java Vendor:     Sun Microsystems Inc.
+    Java home:       C:\Program Files\Java\j2re1.4.1_07
+    Java classpath:  c:\derby\classes
+    OS name:         Windows 2000
+    OS architecture: x86
+    OS version:      5.0
+    Java user name:  derbyuser
+    Java user home:  C:\Documents and Settings\Administrator
+    Java user dir:   C:\derby
+    --------- Derby Information --------
+    [C:\derby\classes] 10.0.2.0 - (1)
+    ------------------------------------------------------
+    ----------------- Locale Information -----------------
+    ------------------------------------------------------
+
 
 (4) Execute the following command:
     
@@ -490,6 +536,9 @@
     database with no errors.
 
 
+(6) Derby also includes a suite of tests for more comprehensive verification.
+    Information on how to run these tests can be found in the source tree,
+    in the file ${derby.source}/java/testing/org/apache/derbyTesting/readme.htm
 
 ---------------------------------------------------------------
 4     Derby build miscellaneous information
@@ -504,7 +553,14 @@
 Some of the main targets that can be called as
 "ant targetname" are as the  following:
 
-  source: to build source code. This is default target.
+  all: builds the source code, demos, and tests.
+
+  buildsource: to build source code. This is default target.
+
+  demo: builds the simple demos in java/demo
+
+  testing: builds the tests in java/testing. For additional information on
+           testing, please see java/testing/org/apache/derbyTesting/readme.htm
 
   javadoc: to create javadoc for all source code.
 
@@ -580,7 +636,7 @@
 being: reference, internal API, public API, implementation. 
 At the end of the build, the properties files containing the 
 message files are copied into the output directory and the 
-version information properties files are generated.  ]]></source>
+version information properties files are generated.]]></source>
 
 </body>
 </document>

Added: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/COPYRIGHT.xml
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/COPYRIGHT.xml	Sat Nov 13 11:28:46 2004
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+<header>
+  <title>Apache Derby: COPYRIGHT</title>
+</header>
+
+
+<body>
+
+<source><![CDATA[
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.]]></source>
+
+</body>
+</document>

Added: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/LICENSE.xml
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/LICENSE.xml	Sat Nov 13 11:28:46 2004
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+<header>
+  <title>Apache Derby: LICENSE</title>
+</header>
+
+<body>
+
+<source><![CDATA[
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.]]></source>
+
+</body>
+</document>

Added: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/NOTICE.xml
==============================================================================
--- (empty file)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/NOTICE.xml	Sat Nov 13 11:28:46 2004
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+<header>
+  <title>Apache Derby: NOTICE</title>
+</header>
+
+<body>
+
+<source><![CDATA[
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Derby distribution.       ==
+=========================================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Derby were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA".]]></source>
+
+</body>
+</document>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">
@@ -19,7 +29,21 @@
 <H1>Getting Started with Derby</H1>
 <BR>
 <P><B>First Edition (August 2004)</B>
-<P><B>(C) Copyright International Business Machines Corporation 1997, 2004. All rights reserved.</B> <BR>U.S. Government Users Restricted Rights -- Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+<pre>
+Copyright 1997, 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.
+</pre>
 <P>
 <P><HR>[ <A HREF="gspr02.html">Next Page</A><br><A HREF="gspr02.html#ToC">Table of Contents</A><br><A HREF="gspr40.html#HDRINDEX_START">Index</A> ] 
 <A NAME="Bot_Of_Page"></A>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr02.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr02.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr02.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr03.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr03.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr03.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr04.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr04.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr04.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr05.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr05.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr05.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr06.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr06.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr06.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr08.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr08.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr08.ihtml	Sat Nov 13 11:28:46 2004
@@ -3,11 +3,21 @@
 <TITLE>Installing Derby</TITLE>
 <!-- Begin Header Records  ========================================== -->
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr11.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr11.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr11.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META NAME="KEYWORDS" CONTENT="setting, PATH">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr16.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr16.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr16.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META NAME="KEYWORDS" CONTENT="DERBY_INSTALL environment variable, setting, Class path">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr21.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr21.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr21.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr22.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr22.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr22.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr23.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr23.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr23.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr24.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr24.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr24.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr25.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr25.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr25.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr26.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr26.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr26.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr27.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr27.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr27.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META NAME="KEYWORDS" CONTENT="Protocol, supported protocols within, Database connection URL">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr28.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr28.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr28.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr29.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr29.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr29.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr30.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr30.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr30.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr31.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr31.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr31.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr32.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr32.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr32.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr33.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr33.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr33.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr34.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr34.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr34.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META NAME="KEYWORDS" CONTENT="Libraries, Class path">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr35.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr35.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr35.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META NAME="KEYWORDS" CONTENT="derby.jar, Derby engine library, derbytools.jar, Derby library for basic tools such as ij and sysinfo, Sample application libraries, Sample database libraries">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr36.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr36.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr36.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META NAME="KEYWORDS" CONTENT="needed for Derby extensions, Libraries">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr39.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr39.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr39.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr40.ihtml
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr40.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/manuals/getstart/gspr40.ihtml	Sat Nov 13 11:28:46 2004
@@ -4,11 +4,21 @@
 <!-- Begin Header Records  ========================================== -->
 
 
-<!-- (C) Copyright IBM Corporation 1997, 2004                              -->
-<!-- All rights reserved. Licensed Materials Property of IBM          -->
-<!-- US Government Users Restricted Rights -                          -->
-<!-- Use, duplication or disclosure restricted by                     -->
-<!-- GSA ADP Schedule Contract with IBM Corp.                         -->
+<!--  
+Copyright 1997, 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.
+--> 
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META HTTP-EQUIV="updated" CONTENT="Wed, 14 Jul 2004 10:49:01">
 <META HTTP-EQUIV="review" CONTENT="Thu, 14 Jul 2005 10:49:01">

Mime
View raw message